commit b93521faae015a4768e11fe67f0346c04ef0a67c
parent 0e2587617458ac99d630d7b1ba98751fa92ca057
Author: Katja (zaphyra) <git@ctu.cx>
Date: Fri, 6 Jun 2025 19:28:50 +0200
parent 0e2587617458ac99d630d7b1ba98751fa92ca057
Author: Katja (zaphyra) <git@ctu.cx>
Date: Fri, 6 Jun 2025 19:28:50 +0200
flake(inputs.grapevine): switch to `sss` branch
3 files changed, 77 insertions(+), 112 deletions(-)
diff --git a/flake.lock b/flake.lock @@ -79,15 +79,12 @@ } }, "crane_3": { - "inputs": { - "nixpkgs": "nixpkgs_2" - }, "locked": { - "lastModified": 1717535930, - "narHash": "sha256-1hZ/txnbd/RmiBPNUs7i8UQw2N89uAK3UzrGAWdnFfU=", + "lastModified": 1731098351, + "narHash": "sha256-HQkYvKvaLQqNa10KEFGgWHfMAbWBfFp+4cAgkut+NNE=", "owner": "ipetkov", "repo": "crane", - "rev": "55e7754ec31dac78980c8be45f8a28e80e370946", + "rev": "ef80ead953c1b28316cc3f8613904edc2eb90c28", "type": "github" }, "original": { @@ -109,11 +106,11 @@ ] }, "locked": { - "lastModified": 1727447169, - "narHash": "sha256-3KyjMPUKHkiWhwR91J1YchF6zb6gvckCAY1jOE+ne0U=", + "lastModified": 1749105467, + "narHash": "sha256-hXh76y/wDl15almBcqvjryB50B0BaiXJKk20f314RoE=", "owner": "serokell", "repo": "deploy-rs", - "rev": "aa07eb05537d4cd025e2310397a6adcedfe72c76", + "rev": "6bc76b872374845ba9d645a2f012b764fecd765f", "type": "github" }, "original": { @@ -129,11 +126,11 @@ ] }, "locked": { - "lastModified": 1747742835, - "narHash": "sha256-kYL4GCwwznsypvsnA20oyvW8zB/Dvn6K5G/tgMjVMT4=", + "lastModified": 1749089136, + "narHash": "sha256-A1UgwtAEQYd38Z6VoRAiGs4jZQczAGyP5DF3hhYUdpg=", "owner": "nix-community", "repo": "disko", - "rev": "df522e787fdffc4f32ed3e1fca9ed0968a384d62", + "rev": "a4f7deb49f7336feb6c5abaf213b374936421dbe", "type": "github" }, "original": { @@ -149,11 +146,11 @@ ] }, "locked": { - "lastModified": 1747742835, - "narHash": "sha256-kYL4GCwwznsypvsnA20oyvW8zB/Dvn6K5G/tgMjVMT4=", + "lastModified": 1749089136, + "narHash": "sha256-A1UgwtAEQYd38Z6VoRAiGs4jZQczAGyP5DF3hhYUdpg=", "owner": "nix-community", "repo": "disko", - "rev": "df522e787fdffc4f32ed3e1fca9ed0968a384d62", + "rev": "a4f7deb49f7336feb6c5abaf213b374936421dbe", "type": "github" }, "original": { @@ -260,24 +257,6 @@ "type": "github" } }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "flakeCompat": { "locked": { "lastModified": 1747046372, @@ -300,11 +279,11 @@ ] }, "locked": { - "lastModified": 1743550720, - "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", + "lastModified": 1748821116, + "narHash": "sha256-F82+gS044J1APL0n4hH50GYdPRv/5JWm34oCJYmVKdE=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c621e8422220273271f52058f618c94e405bb0f5", + "rev": "49f0870db23e8c1ca0b5259734a02cd9e1e371a1", "type": "github" }, "original": { @@ -477,17 +456,17 @@ }, "locked": { "host": "gitlab.computer.surgery", - "lastModified": 1746392626, - "narHash": "sha256-nEqrWmRwMW2KUJKycc3M2aaqUaugqgW5SfHm/2m17b4=", + "lastModified": 1748889509, + "narHash": "sha256-B63X60UQljp8s5TKwPZaGt7AY5FKJJeAyNvLgQ1M87M=", "owner": "matrix", "repo": "grapevine", - "rev": "d425ba72f879854e10de5f8f2e4b6bc18257eb89", + "rev": "5125c32edb8baac3fa269c08cc6f4858fe39c330", "type": "gitlab" }, "original": { "host": "gitlab.computer.surgery", "owner": "matrix", - "ref": "main", + "ref": "lambda/sss", "repo": "grapevine", "type": "gitlab" } @@ -519,11 +498,11 @@ ] }, "locked": { - "lastModified": 1747556831, - "narHash": "sha256-Qb84nbYFFk0DzFeqVoHltS2RodAYY5/HZQKE8WnBDsc=", + "lastModified": 1748665073, + "narHash": "sha256-RMhjnPKWtCoIIHiuR9QKD7xfsKb3agxzMfJY8V9MOew=", "owner": "nix-community", "repo": "home-manager", - "rev": "d0bbd221482c2713cccb80220f3c9d16a6e20a33", + "rev": "282e1e029cb6ab4811114fc85110613d72771dea", "type": "github" }, "original": { @@ -540,11 +519,11 @@ ] }, "locked": { - "lastModified": 1747978958, - "narHash": "sha256-pQQnbxWpY3IiZqgelXHIe/OAE/Yv4NSQq7fch7M6nXQ=", + "lastModified": 1749062139, + "narHash": "sha256-gGGLujmeWU+ZjFzfMvFMI0hp9xONsSbm88187wJr82Q=", "owner": "nix-community", "repo": "home-manager", - "rev": "7419250703fd5eb50e99bdfb07a86671939103ea", + "rev": "86b95fc1ed2b9b04a451a08ccf13d78fb421859c", "type": "github" }, "original": { @@ -602,11 +581,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1748003224, - "narHash": "sha256-ip8bnJN8+Q4RCCt1lXKXUEwBH8ijk2WCMudiVWmXk4I=", - "rev": "bbc9aaf8a6766daf9b48b7d9f6bb677d35060990", + "lastModified": 1748893954, + "narHash": "sha256-Vj1GHarIzlJI3We5KnYcAQlSjn++fx7/lKRaiIVz3tg=", + "rev": "019b17f4e93c098f99a9bc691be1f1c4df026c7d", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/bbc9aaf8a6766daf9b48b7d9f6bb677d35060990.tar.gz?rev=bbc9aaf8a6766daf9b48b7d9f6bb677d35060990" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/019b17f4e93c098f99a9bc691be1f1c4df026c7d.tar.gz" }, "original": { "type": "tarball", @@ -633,7 +612,7 @@ "narHash": "sha256-7EICjbmG6lApWKhFtwvZovdcdORY1CEe6/K7JwtpYfs=", "rev": "3c23c6ae2aecc1f76ae7993efe1a78b5316f0700", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/3c23c6ae2aecc1f76ae7993efe1a78b5316f0700.tar.gz?rev=3c23c6ae2aecc1f76ae7993efe1a78b5316f0700" + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/3c23c6ae2aecc1f76ae7993efe1a78b5316f0700.tar.gz" }, "original": { "type": "tarball", @@ -762,27 +741,27 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1710695816, - "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=", + "lastModified": 1730741070, + "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "614b4613980a522ba49f0d194531beddbb7220d3", + "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgsUnstable": { "locked": { - "lastModified": 1747958103, - "narHash": "sha256-qmmFCrfBwSHoWw7cVK4Aj+fns+c54EBP8cGqp/yK410=", + "lastModified": 1748856973, + "narHash": "sha256-RlTsJUvvr8ErjPBsiwrGbbHYW8XbB/oek0Gi78XdWKg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fe51d34885f7b5e3e7b59572796e1bcb427eccb1", + "rev": "e4b09e47ace7d87de083786b404bf232eb6c89d8", "type": "github" }, "original": { @@ -794,27 +773,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1747958103, - "narHash": "sha256-qmmFCrfBwSHoWw7cVK4Aj+fns+c54EBP8cGqp/yK410=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "fe51d34885f7b5e3e7b59572796e1bcb427eccb1", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1747953325, - "narHash": "sha256-y2ZtlIlNTuVJUZCqzZAhIw5rrKP4DOSklev6c8PyCkQ=", + "lastModified": 1749024892, + "narHash": "sha256-OGcDEz60TXQC+gVz5sdtgGJdKVYr6rwdzQKuZAJQpCA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "55d1f923c480dadce40f5231feb472e81b0bab48", + "rev": "8f1b52b04f2cb6e5ead50bd28d76528a2f0380ef", "type": "github" }, "original": { @@ -858,11 +821,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1717664902, - "narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=", + "lastModified": 1731363552, + "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1", + "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", "type": "github" }, "original": { @@ -912,7 +875,7 @@ "mqttWebUI": "mqttWebUI", "nixStd": "nixStd", "nixSystemsDefault": "nixSystemsDefault", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "nixpkgsUnstable": "nixpkgsUnstable", "oeffisearch": "oeffisearch", "simpleNixosMailserver": "simpleNixosMailserver", @@ -941,18 +904,17 @@ }, "rust-overlay": { "inputs": { - "flake-utils": "flake-utils", "nixpkgs": [ "lanzaboote", "nixpkgs" ] }, "locked": { - "lastModified": 1717813066, - "narHash": "sha256-wqbRwq3i7g5EHIui0bIi84mdqZ/It1AXBSLJ5tafD28=", + "lastModified": 1731897198, + "narHash": "sha256-Ou7vLETSKwmE/HRQz4cImXXJBr/k9gp4J4z/PF8LzTE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "6dc3e45fe4aee36efeed24d64fc68b1f989d5465", + "rev": "0be641045af6d8666c11c2c40e45ffc9667839b5", "type": "github" }, "original": { @@ -1030,21 +992,6 @@ "url": "https://git.zaphyra.eu/stagit" } }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "things": { "inputs": { "nixpkgs": [
diff --git a/flake.nix b/flake.nix @@ -237,7 +237,7 @@ deploy-rs.inputs.utils.follows = "flakeUtils"; deploy-rs.inputs.flake-compat.follows = "flakeCompat"; - grapevine.url = "gitlab:matrix/grapevine?host=gitlab.computer.surgery&ref=main"; + grapevine.url = "gitlab:matrix/grapevine?host=gitlab.computer.surgery&ref=lambda/sss"; grapevine.inputs = { nixpkgs.follows = "nixpkgs"; flake-compat.follows = "flakeCompat";
diff --git a/hosts/huntii/default.nix b/hosts/huntii/default.nix @@ -5,7 +5,7 @@ domain = "infra.zaphyra.eu"; - sshPubKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMX8q2ux3YdAFGLRfD8/fCEAEalqxsRQwkOSp6gYedFt"; + sshPubKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBGgd/59d8wyU9kE6iRSMvTmev8z5dq4YtjeBlEoAI4S"; hardware = { cpuVendor = "intel"; @@ -13,15 +13,29 @@ }; configuration = - { config, pkgs, ... }: + { config, pkgs, lib, ... }: { + boot.initrd.systemd.emergencyAccess = true; + modules = { - filesystem.rootDisk = { - enable = true; - encrypt = true; - type = "ext4"; - path = "/dev/disk/by-id/nvme-SKHynix_HFS512GDE9X081N_FYB8N034411508M5G"; + filesystem = { + impermanence.system.enable = true; + impermanence.home.enable = true; + rootDisk = { + enable = true; + encrypt = true; + type = "zfs"; + path = "/dev/disk/by-id/nvme-SKHynix_HFS512GDE9X081N_FYB8N034411508M5G"; + reservedSpace = "3G"; + parts = { + nix = true; + }; + swap = { + enable = true; + size = "8G"; + }; + }; }; hardware = { @@ -46,11 +60,15 @@ users.katja.enable = true; }; - boot.kernelPackages = pkgs.linuxPackages_latest; - networking = { useNetworkd = false; hosts."127.0.0.1" = [ config.networking.fqdn ]; + modemmanager.fccUnlockScripts = [ + { + id = "2c7c:030a"; + path = "${pkgs.modemmanager}/share/ModemManager/fcc-unlock.available.d/2c7c"; + } + ]; }; hardware.bluetooth.settings = { @@ -66,8 +84,8 @@ gnome.gnome-online-accounts.enable = true; }; - system.stateVersion = "24.11"; - home-manager.users.katja.home.stateVersion = "24.11"; + system.stateVersion = "25.05"; + home-manager.users.katja.home.stateVersion = "25.05"; }; }