From bffcecc5c4b5cdf483410336db2c870dff11994d Mon Sep 17 00:00:00 2001 From: emily Date: Sun, 17 Nov 2024 23:31:31 +0100 Subject: [PATCH 1/5] users: add lucy --- config/common/default.nix | 2 +- .../common/{users/default.nix => users.nix} | 2 +- config/hosts/crime/configuration.nix | 1 + config/hosts/seras/configuration.nix | 11 +-- config/{common => }/users/emily/default.nix | 0 config/users/lucy/default.nix | 78 +++++++++++++++++++ config/users/nil/default.nix | 49 ++++++++++++ 7 files changed, 131 insertions(+), 12 deletions(-) rename config/common/{users/default.nix => users.nix} (62%) rename config/{common => }/users/emily/default.nix (100%) create mode 100644 config/users/lucy/default.nix create mode 100644 config/users/nil/default.nix diff --git a/config/common/default.nix b/config/common/default.nix index 0168cab..591951b 100644 --- a/config/common/default.nix +++ b/config/common/default.nix @@ -5,7 +5,7 @@ in { ./kernel.nix ./networking.nix ./openssh.nix - ./users + ./users.nix ../../modules inputs.lix-module.nixosModules.default ]; diff --git a/config/common/users/default.nix b/config/common/users.nix similarity index 62% rename from config/common/users/default.nix rename to config/common/users.nix index 34d379b..60ce336 100644 --- a/config/common/users/default.nix +++ b/config/common/users.nix @@ -1,5 +1,5 @@ { ... }: { imports = [ - ./emily + ../users/emily ]; } diff --git a/config/hosts/crime/configuration.nix b/config/hosts/crime/configuration.nix index edbaa22..5ab41bc 100644 --- a/config/hosts/crime/configuration.nix +++ b/config/hosts/crime/configuration.nix @@ -1,6 +1,7 @@ { ... }: { imports = [ ../../common + ../../users/lucy ../../profiles/headless.nix ../../profiles/kartoffel.nix ../../profiles/lxc.nix diff --git a/config/hosts/seras/configuration.nix b/config/hosts/seras/configuration.nix index 7dd5ee9..97a1b67 100644 --- a/config/hosts/seras/configuration.nix +++ b/config/hosts/seras/configuration.nix @@ -1,6 +1,7 @@ { pkgs, ... }: { imports = [ ../../common + ../../users/nil ../../profiles/builder.nix ../../profiles/headless.nix ../../profiles/kartoffel.nix @@ -18,16 +19,6 @@ ]; }; - users.users.nil = { - isNormalUser = true; - shell = pkgs.fish; - ignoreShellProgramCheck = true; - extraGroups = [ "wheel" ]; - openssh.authorizedKeys.keys = [ - "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAICczPHRwY9MAwDGlcB0QgMOJjcpLJhVU3covrW9RBS62AAAABHNzaDo=" - ]; - }; - services.postgresql.settings = { max_connections = 200; shared_buffers = "24GB"; diff --git a/config/common/users/emily/default.nix b/config/users/emily/default.nix similarity index 100% rename from config/common/users/emily/default.nix rename to config/users/emily/default.nix diff --git a/config/users/lucy/default.nix b/config/users/lucy/default.nix new file mode 100644 index 0000000..5035c4d --- /dev/null +++ b/config/users/lucy/default.nix @@ -0,0 +1,78 @@ +{ inputs, pkgs, ... }: { + imports = [ + inputs.home-manager.nixosModules.home-manager + ]; + + users.users.lucy = { + isNormalUser = true; + shell = pkgs.fish; + ignoreShellProgramCheck = true; + extraGroups = [ "wheel" ]; + openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIId7XvwEHtC9KdGg4Bn+XE+yyBp7/dRToJX9T56mM7ln kosaki@kosaki" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAZH8HwE1OxVAArRpc3+c7foYJ/WYjp4BqUyuab9yQyl emilia@emilia" + ]; + }; + + home-manager.useGlobalPkgs = true; + home-manager.users.lucy = { + home.stateVersion = "24.11"; + + home.packages = with pkgs; [ + whois + htop + restic + fend + ]; + fonts.fontconfig.enable = true; + + programs.bat.enable = true; + programs.gpg.enable = true; + programs.ripgrep.enable = true; + + programs.tmux = { + enable = true; + prefix = "M-w"; + clock24 = true; + extraConfig = '' + # unbind keys + unbind-key C-b + + # new prefix + bind-key M-w send-prefix + + # selection via vim keys + bind-key -r h select-pane -L + bind-key -r j select-pane -D + bind-key -r k select-pane -U + bind-key -r l select-pane -R + + # resize aswell + bind-key -r C-h resize-pane -L 5 + bind-key -r C-j resize-pane -D 5 + bind-key -r C-k resize-pane -U 5 + bind-key -r C-l resize-pane -R 5 + + bind-key g split-window + bind-key v split-window -h + ''; + }; + + programs.eza = { + enable = true; + icons = "auto"; + git = true; + extraOptions = [ + "--color-scale=all" + "--color-scale-mode=gradient" + "--group-directories-first" + ]; + }; + programs.fish = { + enable = true; + interactiveShellInit = '' + set -U fish_greeting + ''; + }; + }; +} diff --git a/config/users/nil/default.nix b/config/users/nil/default.nix new file mode 100644 index 0000000..9aac787 --- /dev/null +++ b/config/users/nil/default.nix @@ -0,0 +1,49 @@ +{ inputs, pkgs, ... }: { + imports = [ + inputs.home-manager.nixosModules.home-manager + ]; + + users.users.nil = { + isNormalUser = true; + shell = pkgs.fish; + ignoreShellProgramCheck = true; + extraGroups = [ "wheel" ]; + openssh.authorizedKeys.keys = [ + "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAICczPHRwY9MAwDGlcB0QgMOJjcpLJhVU3covrW9RBS62AAAABHNzaDo=" + ]; + }; + + home-manager.useGlobalPkgs = true; + home-manager.users.nil = { + home.stateVersion = "24.11"; + + home.packages = with pkgs; [ + whois + htop + restic + fend + ]; + fonts.fontconfig.enable = true; + + programs.bat.enable = true; + programs.gpg.enable = true; + programs.ripgrep.enable = true; + + programs.eza = { + enable = true; + icons = "auto"; + git = true; + extraOptions = [ + "--color-scale=all" + "--color-scale-mode=gradient" + "--group-directories-first" + ]; + }; + programs.fish = { + enable = true; + interactiveShellInit = '' + set -U fish_greeting + ''; + }; + }; +} From ef051f9598e35b4263a899d9c506d481f6e56989 Mon Sep 17 00:00:00 2001 From: emily Date: Mon, 18 Nov 2024 14:15:55 +0100 Subject: [PATCH 2/5] build-worker-oci: update, add vikas keys --- pkgs/build-worker-oci/default.nix | 3 +++ pkgs/build-worker-oci/source.nix | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/build-worker-oci/default.nix b/pkgs/build-worker-oci/default.nix index 4701811..958a6ae 100644 --- a/pkgs/build-worker-oci/default.nix +++ b/pkgs/build-worker-oci/default.nix @@ -51,6 +51,9 @@ dockerTools.buildLayeredImage { ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOpyVefbZLkNVNzdSIlO6x6JohHE1snoHiUB3Qdvl5I2 aprl@idk ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDVNo871p97NTefP52KYiwuch+FaVScxvcFd9fg0yykySTq7Y5JsxrJQgTnox/oDa0O87OyHD/GHQljAXkqiHpDkExbiGjDmGXJSKReKH061F4FqBnDIwYRzUu9Cxjl4MNqsU0RqLaz4+F42c/L7GROQwjEPUb8JHThRiI5FJnDvvB+oBLBxeyQA4v3O4i8DaDQayTr/XB+aSlhNwKrb6cjjL93AHT1uE53yY5jn4kZX+RiPQhH7rvt9N6E4Yr3CG6nUgRCUS0L66d9yfrq0XAbAVk9F+viV7Nk9qy4MWHtXZ4h0qUlzrGALPgGsCGiLGd4NvEgeCcV4nvxdmevxTSdKlJP75xlmlLVXGyhqCZkTsxm/png2UvDl+p0pLyrgNaNoXPdE0Jbv7C28WX36Nast1QFSMUhexzuOx8OgaOioeXVfK98AouqWb58iPBCvgreUIH/gJhZcnlB/Foo1KSO+fJNH8hAsLH7w0mnKyHhJjkrjjwUqsnpepB3SOLfZTE= aprl@meow ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQD0v3tUBNEUxfoOQBFb+N2DUBQDay0iFggUWa9Nd+BtFLOKkz+RRto3eBF0ZiJZVUxv/hLb8m2s45hcMw8agwuPrXMe5085T1fzkvPdKAPZdsT/cCmBi1OsoLjAKBFIdM4lcV0A2cca8hip+/ZPpjFPUWx73/672gAPHU7co7fP8+8CSf9dx+WIeLx3yaYHYZ/th3dB5auX3VjOazS8MojsAorwTUeBoPamHQ5dFeNafhFUL/hhtGkUI1cNHUn3bJd2V7AKTW3UglK7hVgMJPrzVS31OlpcJEf6S5XgKTWdOSwubn1bs5Lt6YYRDU24NV6CGrwKgCJSRxzNMLwpnFKiSXpO8FzkqWHYWyju141hQcFF31aZIV+7YcwEt5ZukLjFOpVtpbSXvJYigOUzGi34P3/OAGshDXjTQjvM8GIir49gx3b2Nwhg0z4UHBkAKZvDDFPHDMJoclvnhITojaAojfC9zmMCO5ZaEsk8yv7c/lWQumzRpfldWF4mwHvhD5kTADbhRdO7WTdX7AaiAYINooToeWKjFe2wn3rFubPUppptqtP03mmvs7vhhgnEVBbGZRJK3GTVk1XcsfF9rDKzewSa+wb4LsBoZtFRhc8cJqHGlKWSNk7dQ04B1atPyNLKGpGoo/UIPxyZ6bSqFVxY3nhz46VZ6z8XWI48z0/fRQ== aprl@uwu + ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAAl3/krXJeCcDEJXRuzOdCOrJLG7b6MRqC+a9Xux3mW vika@hydrangea + ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHQjTy9qqHcs5vgTz+iMAiNNMqdyGtOhEpnpJCReEFfZ vika@rafflesia + sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAINAgFdk78I4zssUGsAIV01zefLBpwc1W7hfTobbG80XLAAAABHNzaDo= vika@nitrokey EOF cat < /root/.ssh/environment diff --git a/pkgs/build-worker-oci/source.nix b/pkgs/build-worker-oci/source.nix index b6a86fc..3fd807d 100644 --- a/pkgs/build-worker-oci/source.nix +++ b/pkgs/build-worker-oci/source.nix @@ -4,8 +4,8 @@ dockerTools.pullImage { imageName = "nixos/nix"; - imageDigest = "sha256:fd7a5c67d396fe6bddeb9c10779d97541ab3a1b2a9d744df3754a99add4046f1"; - sha256 = "1ggkwd9zw8lj97ig7zah7dqy463hfhsgq3iwxxf8117gf8xi422s"; + imageDigest = "sha256:133a1607deea14a02c2bc0850e275ed135814235a1147f68967afee261caea2b"; + sha256 = "0602a59g14l1jiqfffz14hcp982qaqczi5f0ylvv0h9pp2pqrqs5"; finalImageName = "nixos/nix"; finalImageTag = "latest"; } From 288d338df44c0808ff5e1c041c778aec230c8aed Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Mon, 18 Nov 2024 15:27:46 +0100 Subject: [PATCH 3/5] hydra: Remove Cloud-V RISC-V build worker --- config/services/hydra/nix-config.nix | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/config/services/hydra/nix-config.nix b/config/services/hydra/nix-config.nix index c836a27..b0e8cb1 100644 --- a/config/services/hydra/nix-config.nix +++ b/config/services/hydra/nix-config.nix @@ -28,15 +28,6 @@ supportedFeatures = base ++ [ "gccarch-rv64imac" "gccarch-rv64imacfd" ]; sshKey = config.sops.secrets."services/hydra/id_ed25519_hydra".path; } - { - hostName = "machine-0008.cloud-v.co"; - sshUser = "root"; - maxJobs = 2; - speedFactor = 4; - systems = [ "riscv64-linux" ]; - supportedFeatures = base ++ [ "gccarch-rv64imac" "gccarch-rv64imacfd" ]; - sshKey = config.sops.secrets."services/hydra/id_ed25519_hydra".path; - } ] ++ lib.forEach (lib.genList (i: i + 1) 8) (num: { hostName = "build-worker-0${toString num}"; sshUser = "root"; @@ -63,7 +54,6 @@ "build-worker-04.nyantec.com".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICOq+5I+nlAN2lJoOtoXrYEDuZ/TMPMa43pIlablYigK"; "integra.kyouma.net".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIBwEQiSfaDrUAwgul4mktusBPcIVxI4pLNDh9DPopVU"; "schrodinger.kyouma.net".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKo7vZ6lS1wx76YsbAdhOsGcc20YMAW52ep8SZ/FCHDp"; - "[machine.cloud-v.co]:20008".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK6Kri0cjPKEXXDEl2GwfwzPO9wuPZEgJS0M6lKRHCqH"; "lab.nyantec.com".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIUePtVPtBK+CYosufbaGiMT4EVanti4V5t2Wg0g/Fy4"; "localhost".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPNVavo3YHVsrYwXRVISu7kDoknn+5inFGySn4azlB8P"; "[build-worker-kyoumanet.fly.dev]:2201".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDL2M97UBHg9aUfjDUxzmzg1r0ga0m3/stummBVwuEAB"; From 7eac95459a0c8c68d16cea608211a53045ffb792 Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Mon, 18 Nov 2024 15:28:16 +0100 Subject: [PATCH 4/5] hydra: Add RV64GC ISA support for schrodinger --- config/services/hydra/nix-config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/services/hydra/nix-config.nix b/config/services/hydra/nix-config.nix index b0e8cb1..9933888 100644 --- a/config/services/hydra/nix-config.nix +++ b/config/services/hydra/nix-config.nix @@ -25,7 +25,7 @@ maxJobs = 0; speedFactor = 20; systems = [ "riscv64-linux" ]; - supportedFeatures = base ++ [ "gccarch-rv64imac" "gccarch-rv64imacfd" ]; + supportedFeatures = base ++ [ "gccarch-rv64imac" "gccarch-rv64imacfd" "gccarch-rv64gc" ]; sshKey = config.sops.secrets."services/hydra/id_ed25519_hydra".path; } ] ++ lib.forEach (lib.genList (i: i + 1) 8) (num: { From afec571eaff6dab598082e1df8dbf8beed5de398 Mon Sep 17 00:00:00 2001 From: Update Bot Date: Tue, 19 Nov 2024 04:20:15 +0100 Subject: [PATCH 5/5] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'disko': 'github:nix-community/disko/5fd852c4155a689098095406500d0ae3d04654a8' (2024-11-14) → 'github:nix-community/disko/639d1520df9417ca2761536c3072688569e83c80' (2024-11-18) • Updated input 'firefox': 'git+https://woof.rip/mikael/firefox.git?ref=refs/heads/main&rev=022ec0becb1ca7b96ddb9bdd046617075357c2cb' (2024-11-17) → 'git+https://woof.rip/mikael/firefox.git?ref=refs/heads/main&rev=f36a4ac2b4bd6845e701bdfafc84058652d69faf' (2024-11-18) • Updated input 'firefox/neoidiosyn': 'git+https://woof.rip/mikael/neoidiosyn.git?ref=refs/heads/main&rev=86605e5489fb5045f4dee48de2a69082e17c033b' (2024-11-17) → 'git+https://woof.rip/mikael/neoidiosyn.git?ref=refs/heads/main&rev=3fd142ca84ae4c08927402f4aa677a098851504e' (2024-11-18) • Updated input 'home-manager': 'github:nix-community/home-manager/1d0862ee2d7c6f6cd720d6f32213fa425004be10' (2024-11-14) → 'github:nix-community/home-manager/a42fa14b53ceab66274a21da480c9f8e06204173' (2024-11-18) • Updated input 'nixos-hardware': 'github:nixos/nixos-hardware/f6581f1c3b137086e42a08a906bdada63045f991' (2024-11-12) → 'github:nixos/nixos-hardware/672ac2ac86f7dff2f6f3406405bddecf960e0db6' (2024-11-16) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/dc460ec76cbff0e66e269457d7b728432263166c' (2024-11-11) → 'github:nixos/nixpkgs/5e4fbfb6b3de1aa2872b76d49fafc942626e2add' (2024-11-15) • Updated input 'nixvim': 'github:nix-community/nixvim/be455f7f2714ce3479ae5bb662a03bd450f45793' (2024-11-15) → 'github:nix-community/nixvim/2017830a2c81a97f6b7679ea5fa0d921cd0f4535' (2024-11-18) • Updated input 'nixvim/nix-darwin': 'github:lnl7/nix-darwin/6c71c49e2448e51ad830ed211024e6d0edc50116' (2024-11-12) → 'github:lnl7/nix-darwin/c60b5c924c6188a0b3ca2e139ead3d0f92ae5db5' (2024-11-17) • Updated input 'nixvim/nuschtosSearch': 'github:NuschtOS/search/135d202e032be70c93b6d7d53592ef4799d6efde' (2024-11-11) → 'github:NuschtOS/search/fe07070f811b717a4626d01fab714a87d422a9e1' (2024-11-18) • Updated input 'nixvim/nuschtosSearch/flake-utils': 'github:numtide/flake-utils/c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a' (2024-09-17) → 'github:numtide/flake-utils/11707dc2f618dd54ca8739b309ec4fc024de578b' (2024-11-13) • Updated input 'nixvim/treefmt-nix': 'github:numtide/treefmt-nix/746901bb8dba96d154b66492a29f5db0693dbfcc' (2024-10-30) → 'github:numtide/treefmt-nix/579b9a2fd0020cd9cd81a4ef4eab2dca4d20c94c' (2024-11-18) • Updated input 'sops-nix': 'github:Mic92/sops-nix/4c91d52db103e757fc25b58998b0576ae702d659' (2024-11-11) → 'github:Mic92/sops-nix/e39947d0ee8e341fa7108bd02a33cdfa24a1360e' (2024-11-18) • Removed input 'sops-nix/nixpkgs-stable' • Updated input 'stylix': 'github:danth/stylix/5ab1207b2fdeb5a022f2dd7cccf6be760f1b150f' (2024-11-15) → 'github:danth/stylix/f8699483e46972f64b0dee5d5e41bf4bb142629b' (2024-11-18) --- flake.lock | 97 ++++++++++++++++++++++-------------------------------- 1 file changed, 40 insertions(+), 57 deletions(-) diff --git a/flake.lock b/flake.lock index dc457d7..fcc4435 100644 --- a/flake.lock +++ b/flake.lock @@ -156,11 +156,11 @@ ] }, "locked": { - "lastModified": 1731549112, - "narHash": "sha256-c9I3i1CwZ10SoM5npQQVnfwgvB86jAS3lT4ZqkRoSOI=", + "lastModified": 1731895210, + "narHash": "sha256-z76Q/OXLxO/RxMII3fIt/TG665DANiE2lVvnolK2lXk=", "owner": "nix-community", "repo": "disko", - "rev": "5fd852c4155a689098095406500d0ae3d04654a8", + "rev": "639d1520df9417ca2761536c3072688569e83c80", "type": "github" }, "original": { @@ -222,10 +222,10 @@ ] }, "locked": { - "lastModified": 1731867603, - "narHash": "sha256-07612Ws2V4iFQAGLEoZVIefA3rM9JP3B/qo/z4tu1Kg=", + "lastModified": 1731970906, + "narHash": "sha256-nE9QShMKAKTKtDUauTjNFs9TJ92IVocDJXBhqPWkdCo=", "ref": "refs/heads/main", - "rev": "022ec0becb1ca7b96ddb9bdd046617075357c2cb", + "rev": "f36a4ac2b4bd6845e701bdfafc84058652d69faf", "revCount": 3, "type": "git", "url": "https://woof.rip/mikael/firefox.git" @@ -420,11 +420,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -636,11 +636,11 @@ ] }, "locked": { - "lastModified": 1731604581, - "narHash": "sha256-Qq2YZZaDTB3FZLWU/Hgh1uuWlUBl3cMLGB99bm7rFUM=", + "lastModified": 1731968878, + "narHash": "sha256-+hTCwETOE9N8voTAaF+IzdUZz28Ws3LDpH90FWADrEE=", "owner": "nix-community", "repo": "home-manager", - "rev": "1d0862ee2d7c6f6cd720d6f32213fa425004be10", + "rev": "a42fa14b53ceab66274a21da480c9f8e06204173", "type": "github" }, "original": { @@ -830,10 +830,10 @@ ] }, "locked": { - "lastModified": 1731867586, - "narHash": "sha256-6anSWv1Vw83RKMAFMHOCv/9pp23ExzscEKFAe+GbAmU=", + "lastModified": 1731970829, + "narHash": "sha256-Nj64byF1YDQOWcea8m0ifSJZW8rJvF26sB01Acn+Ef4=", "ref": "refs/heads/main", - "rev": "86605e5489fb5045f4dee48de2a69082e17c033b", + "rev": "3fd142ca84ae4c08927402f4aa677a098851504e", "revCount": 1, "type": "git", "url": "https://woof.rip/mikael/neoidiosyn.git" @@ -851,11 +851,11 @@ ] }, "locked": { - "lastModified": 1731454423, - "narHash": "sha256-TtwvgFxUa0wyptLhQbKaixgNW1UXf3+TDqfX3Kp63oM=", + "lastModified": 1731885500, + "narHash": "sha256-ZrztYfSOS33J+ewq5alBOSdnIyZ0/sr1iy7FyBe9zIg=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "6c71c49e2448e51ad830ed211024e6d0edc50116", + "rev": "c60b5c924c6188a0b3ca2e139ead3d0f92ae5db5", "type": "github" }, "original": { @@ -953,11 +953,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1731403644, - "narHash": "sha256-T9V7CTucjRZ4Qc6pUEV/kpgNGzQbHWfGcfK6JJLfUeI=", + "lastModified": 1731797098, + "narHash": "sha256-UhWmEZhwJZmVZ1jfHZFzCg+ZLO9Tb/v3Y6LC0UNyeTo=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "f6581f1c3b137086e42a08a906bdada63045f991", + "rev": "672ac2ac86f7dff2f6f3406405bddecf960e0db6", "type": "github" }, "original": { @@ -1034,22 +1034,6 @@ "type": "github" } }, - "nixpkgs-stable_2": { - "locked": { - "lastModified": 1730602179, - "narHash": "sha256-efgLzQAWSzJuCLiCaQUCDu4NudNlHdg2NzGLX5GYaEY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3c2f1c4ca372622cb2f9de8016c9a0b1cbd0f37c", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "release-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1725001927, @@ -1084,11 +1068,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1731319897, - "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=", + "lastModified": 1731676054, + "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "dc460ec76cbff0e66e269457d7b728432263166c", + "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", "type": "github" }, "original": { @@ -1115,11 +1099,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1731707185, - "narHash": "sha256-IfA3x0eL4Be/7hvdvGSnT8fgiXz7GL3PtjGw3BH68gM=", + "lastModified": 1731969202, + "narHash": "sha256-k10MJfCQXUUzkvAQMs8b8UsCjIQQPNWEPMlBrHOoPqU=", "owner": "nix-community", "repo": "nixvim", - "rev": "be455f7f2714ce3479ae5bb662a03bd450f45793", + "rev": "2017830a2c81a97f6b7679ea5fa0d921cd0f4535", "type": "github" }, "original": { @@ -1138,11 +1122,11 @@ ] }, "locked": { - "lastModified": 1731347683, - "narHash": "sha256-BcSWCEUBShuB32LPif+EG0XGXyUi2jyjCSpGE1rbOws=", + "lastModified": 1731936508, + "narHash": "sha256-z0BSSf78LkxIrrFXZYmCoRRAxAmxMUKpK7CyxQRvkZI=", "owner": "NuschtOS", "repo": "search", - "rev": "135d202e032be70c93b6d7d53592ef4799d6efde", + "rev": "fe07070f811b717a4626d01fab714a87d422a9e1", "type": "github" }, "original": { @@ -1195,15 +1179,14 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable_2" + ] }, "locked": { - "lastModified": 1731364708, - "narHash": "sha256-HC0anOL+KmUQ2hdRl0AtunbAckasxrkn4VLmxbW/WaA=", + "lastModified": 1731954233, + "narHash": "sha256-vvXx1m2Rsw7MkbKJdpcICzz4YPgZPApGKQGhNZfkhOI=", "owner": "Mic92", "repo": "sops-nix", - "rev": "4c91d52db103e757fc25b58998b0576ae702d659", + "rev": "e39947d0ee8e341fa7108bd02a33cdfa24a1360e", "type": "github" }, "original": { @@ -1233,11 +1216,11 @@ "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1731657386, - "narHash": "sha256-Mm/JL8tFUS1SOmmZDPcswExUxzw0VpHcEyZI1h58CGA=", + "lastModified": 1731920923, + "narHash": "sha256-Pqe38TdvfyywhlhpR1WLJlD7uTOGXRRuzpHIh2edOz0=", "owner": "danth", "repo": "stylix", - "rev": "5ab1207b2fdeb5a022f2dd7cccf6be760f1b150f", + "rev": "f8699483e46972f64b0dee5d5e41bf4bb142629b", "type": "github" }, "original": { @@ -1401,11 +1384,11 @@ ] }, "locked": { - "lastModified": 1730321837, - "narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=", + "lastModified": 1731944360, + "narHash": "sha256-sJxPh+V0vUkBhlA58ok/y0o96AtfqiEF0O8qsdolI6o=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "746901bb8dba96d154b66492a29f5db0693dbfcc", + "rev": "579b9a2fd0020cd9cd81a4ef4eab2dca4d20c94c", "type": "github" }, "original": {