diff --git a/flake.lock b/flake.lock index 9ab58d3..143e334 100644 --- a/flake.lock +++ b/flake.lock @@ -194,11 +194,11 @@ ] }, "locked": { - "lastModified": 1775425411, - "narHash": "sha256-KY6HsebJHEe5nHOWP7ur09mb0drGxYSzE3rQxy62rJo=", + "lastModified": 1779506708, + "narHash": "sha256-QOD/CNm196nCJRheux/URi4/HE66fthdOMqCJoPP1Y0=", "owner": "nix-community", "repo": "home-manager", - "rev": "0d02ec1d0a05f88ef9e74b516842900c41f0f2fe", + "rev": "3ee51fbdac8c8bdfe1e7e1fcaba6520a563f394f", "type": "github" }, "original": { @@ -208,6 +208,27 @@ "type": "github" } }, + "home-manager-2605": { + "inputs": { + "nixpkgs": [ + "nixpkgs-2605" + ] + }, + "locked": { + "lastModified": 1779726825, + "narHash": "sha256-RUkMrREjKDQrA+dA9+xZviGAxM5W1aVdyOr/bSYpHrE=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "b179bde238977f7d4454fc770b1a727eaf55111c", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "release-26.05", + "repo": "home-manager", + "type": "github" + } + }, "home-manager-edge": { "inputs": { "nixpkgs": [ @@ -215,11 +236,11 @@ ] }, "locked": { - "lastModified": 1776562531, - "narHash": "sha256-Lh5Ns9DI67E+lSMOCGK0S+mFPy0mz0yOGiJTUXiR9JI=", + "lastModified": 1780099287, + "narHash": "sha256-efIPwVGtIWIjWcznhaop6XN6HxnOL8800hF6CBNvlqQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "5b56ad02dc643808b8af6d5f3ff179e2ce9593f4", + "rev": "7d8127d308c3fb9664f7e643eec944be74ebb37d", "type": "github" }, "original": { @@ -350,11 +371,11 @@ ] }, "locked": { - "lastModified": 1776575850, - "narHash": "sha256-28Gqz0GDpGsBv8GtAn2dywEQRr+CtTDsD5J7VD6icBE=", + "lastModified": 1779604987, + "narHash": "sha256-ZQ5z+fVhxYKtIFwtqGp5O0PD84BM1riASvqDaN5Xs+s=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "3b9653a107c736222b5ae0d4036dd3b885219065", + "rev": "8fba98c80b48fa013820e0163c5096922fea4ddd", "type": "github" }, "original": { @@ -498,12 +519,15 @@ } }, "nixos-hardware": { + "inputs": { + "nixpkgs": "nixpkgs" + }, "locked": { - "lastModified": 1775490113, - "narHash": "sha256-2ZBhDNZZwYkRmefK5XLOusCJHnoeKkoN95hoSGgMxWM=", + "lastModified": 1780065812, + "narHash": "sha256-SCSLUKBmwlSLGQ8Xbr8PjRFtiHNk0l9ktqkcmqdBkfE=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "c775c2772ba56e906cbeb4e0b2db19079ef11ff7", + "rev": "b76b5639c0593e0aeb0b5879ad62d4b30596c144", "type": "github" }, "original": { @@ -528,6 +552,19 @@ "type": "github" } }, + "nixpkgs": { + "locked": { + "lastModified": 1767892417, + "narHash": "sha256-8bW3q88CEg2u4hSP66Vf4lpbLonHz7hqDNBMcCY7E9U=", + "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba", + "type": "tarball", + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre924538.3497aa5c9457/nixexprs.tar.xz" + }, + "original": { + "type": "tarball", + "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" + } + }, "nixpkgs-1909": { "flake": false, "locked": { @@ -677,17 +714,30 @@ }, "nixpkgs-2511": { "locked": { - "lastModified": 1776434932, - "narHash": "sha256-EVobw7mrC4S2+TuLll6DMAX3p3VTc+r4UmMeFRhOvB0=", - "rev": "c7f47036d3df2add644c46d712d14262b7d86c0c", + "lastModified": 1779796641, + "narHash": "sha256-Cy89LFmgiCxIPBxJLWTmFJHwdeLkxUUYspm5yy8wJps=", + "rev": "25f538306313eae3927264466c70d7001dcea1df", "type": "tarball", - "url": "https://releases.nixos.org/nixos/25.11/nixos-25.11.9418.c7f47036d3df/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixos/25.11/nixos-25.11.11422.25f538306313/nixexprs.tar.xz" }, "original": { "type": "tarball", "url": "https://nixos.org/channels/nixos-25.11/nixexprs.tar.xz" } }, + "nixpkgs-2605": { + "locked": { + "lastModified": 1779971959, + "narHash": "sha256-psmr7iqDt3hBNgxmITgmUHmjM3uUvpvLvMlHqLeJM4I=", + "rev": "ec942ba042dad5ef097e2ef3a3effc034241f011", + "type": "tarball", + "url": "https://releases.nixos.org/nixos/26.05/nixos-26.05.590.ec942ba042da/nixexprs.tar.xz" + }, + "original": { + "type": "tarball", + "url": "https://nixos.org/channels/nixos-26.05/nixexprs.tar.xz" + } + }, "nixpkgs-docs": { "locked": { "lastModified": 1705957679, @@ -738,11 +788,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1776169885, - "narHash": "sha256-Gk2T0tDDDAs319hp/ak+bAIUG5bPMvnNEjPV8CS86Fg=", - "rev": "4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9", + "lastModified": 1779560665, + "narHash": "sha256-NpH8iEQ5JHv/BtUuzTEXUMDxPLetCDzIv4OxL8H7Kps=", + "rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786", "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre980183.4bd9165a9165/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre1004030.64c08a7ca051/nixexprs.tar.xz" }, "original": { "type": "tarball", @@ -995,6 +1045,7 @@ "home-manager-2411": "home-manager-2411", "home-manager-2505": "home-manager-2505", "home-manager-2511": "home-manager-2511", + "home-manager-2605": "home-manager-2605", "home-manager-edge": "home-manager-edge", "nix-index-database": "nix-index-database", "nix-on-droid-2405": "nix-on-droid-2405", @@ -1017,6 +1068,7 @@ "nixpkgs-2411": "nixpkgs-2411", "nixpkgs-2505": "nixpkgs-2505", "nixpkgs-2511": "nixpkgs-2511", + "nixpkgs-2605": "nixpkgs-2605", "nixpkgs-edge": "nixpkgs-edge", "nixpkgs-test": "nixpkgs-test", "sops-nix-2305": "sops-nix-2305", @@ -1025,6 +1077,7 @@ "sops-nix-2411": "sops-nix-2411", "sops-nix-2505": "sops-nix-2505", "sops-nix-2511": "sops-nix-2511", + "sops-nix-2605": "sops-nix-2605", "sops-nix-edge": "sops-nix-edge", "system-manager-edge": "system-manager-edge" } @@ -1084,11 +1137,11 @@ ] }, "locked": { - "lastModified": 1773698643, - "narHash": "sha256-VCiDjE8kNs8uCAK73Ezk1r3fFuc4JepvW07YFqaN968=", + "lastModified": 1777944972, + "narHash": "sha256-VfGRo1qTBKOe3s2gOv8LSoA6Fk19PvBlwQ1ECN0Evn8=", "owner": "Mic92", "repo": "sops-nix", - "rev": "8237de83e8200d16fe0c4467b02a1c608ff28044", + "rev": "c591bf665727040c6cc5cb409079acb22dcce33c", "type": "github" }, "original": { @@ -1104,11 +1157,11 @@ ] }, "locked": { - "lastModified": 1773698643, - "narHash": "sha256-VCiDjE8kNs8uCAK73Ezk1r3fFuc4JepvW07YFqaN968=", + "lastModified": 1777944972, + "narHash": "sha256-VfGRo1qTBKOe3s2gOv8LSoA6Fk19PvBlwQ1ECN0Evn8=", "owner": "Mic92", "repo": "sops-nix", - "rev": "8237de83e8200d16fe0c4467b02a1c608ff28044", + "rev": "c591bf665727040c6cc5cb409079acb22dcce33c", "type": "github" }, "original": { @@ -1124,11 +1177,11 @@ ] }, "locked": { - "lastModified": 1773698643, - "narHash": "sha256-VCiDjE8kNs8uCAK73Ezk1r3fFuc4JepvW07YFqaN968=", + "lastModified": 1777944972, + "narHash": "sha256-VfGRo1qTBKOe3s2gOv8LSoA6Fk19PvBlwQ1ECN0Evn8=", "owner": "Mic92", "repo": "sops-nix", - "rev": "8237de83e8200d16fe0c4467b02a1c608ff28044", + "rev": "c591bf665727040c6cc5cb409079acb22dcce33c", "type": "github" }, "original": { @@ -1144,11 +1197,11 @@ ] }, "locked": { - "lastModified": 1773698643, - "narHash": "sha256-VCiDjE8kNs8uCAK73Ezk1r3fFuc4JepvW07YFqaN968=", + "lastModified": 1777944972, + "narHash": "sha256-VfGRo1qTBKOe3s2gOv8LSoA6Fk19PvBlwQ1ECN0Evn8=", "owner": "Mic92", "repo": "sops-nix", - "rev": "8237de83e8200d16fe0c4467b02a1c608ff28044", + "rev": "c591bf665727040c6cc5cb409079acb22dcce33c", "type": "github" }, "original": { @@ -1164,11 +1217,11 @@ ] }, "locked": { - "lastModified": 1773698643, - "narHash": "sha256-VCiDjE8kNs8uCAK73Ezk1r3fFuc4JepvW07YFqaN968=", + "lastModified": 1777944972, + "narHash": "sha256-VfGRo1qTBKOe3s2gOv8LSoA6Fk19PvBlwQ1ECN0Evn8=", "owner": "Mic92", "repo": "sops-nix", - "rev": "8237de83e8200d16fe0c4467b02a1c608ff28044", + "rev": "c591bf665727040c6cc5cb409079acb22dcce33c", "type": "github" }, "original": { @@ -1184,11 +1237,31 @@ ] }, "locked": { - "lastModified": 1776119890, - "narHash": "sha256-Zm6bxLNnEOYuS/SzrAGsYuXSwk3cbkRQZY0fJnk8a5M=", + "lastModified": 1777944972, + "narHash": "sha256-VfGRo1qTBKOe3s2gOv8LSoA6Fk19PvBlwQ1ECN0Evn8=", "owner": "Mic92", "repo": "sops-nix", - "rev": "d4971dd58c6627bfee52a1ad4237637c0a2fb0cd", + "rev": "c591bf665727040c6cc5cb409079acb22dcce33c", + "type": "github" + }, + "original": { + "owner": "Mic92", + "repo": "sops-nix", + "type": "github" + } + }, + "sops-nix-2605": { + "inputs": { + "nixpkgs": [ + "nixpkgs-2605" + ] + }, + "locked": { + "lastModified": 1777944972, + "narHash": "sha256-VfGRo1qTBKOe3s2gOv8LSoA6Fk19PvBlwQ1ECN0Evn8=", + "owner": "Mic92", + "repo": "sops-nix", + "rev": "c591bf665727040c6cc5cb409079acb22dcce33c", "type": "github" }, "original": { @@ -1204,11 +1277,11 @@ ] }, "locked": { - "lastModified": 1776119890, - "narHash": "sha256-Zm6bxLNnEOYuS/SzrAGsYuXSwk3cbkRQZY0fJnk8a5M=", + "lastModified": 1777944972, + "narHash": "sha256-VfGRo1qTBKOe3s2gOv8LSoA6Fk19PvBlwQ1ECN0Evn8=", "owner": "Mic92", "repo": "sops-nix", - "rev": "d4971dd58c6627bfee52a1ad4237637c0a2fb0cd", + "rev": "c591bf665727040c6cc5cb409079acb22dcce33c", "type": "github" }, "original": { @@ -1226,11 +1299,11 @@ "userborn": "userborn" }, "locked": { - "lastModified": 1776157262, - "narHash": "sha256-bqjt0B5j0IBoc3IwM25srMZuZ26Jlk4uZi+9kTuU9ME=", + "lastModified": 1778508009, + "narHash": "sha256-mp63mt+EwfKiVZX+4BC/59g5oTbsXNtSYESVci3opso=", "owner": "numtide", "repo": "system-manager", - "rev": "39b3806f065ed131d7abb607ad194a63891e020a", + "rev": "dc1baae12eed1758755e73f8aff7fca5502c6e9f", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 2d0e291..a027546 100644 --- a/flake.nix +++ b/flake.nix @@ -6,6 +6,7 @@ nixpkgs-test.url = "github:NixOS/nixpkgs/refs/pull/379645/merge"; # for testing nixpkgs-edge.url = "https://nixos.org/channels/nixos-unstable/nixexprs.tar.xz"; # len("edge") == 4 # remember to update ./profiles/auto-upgrade.nix + nixpkgs-2605.url = "https://nixos.org/channels/nixos-26.05/nixexprs.tar.xz"; nixpkgs-2511.url = "https://nixos.org/channels/nixos-25.11/nixexprs.tar.xz"; nixpkgs-2505.url = "https://nixos.org/channels/nixos-25.05/nixexprs.tar.xz"; nixpkgs-2411.url = "https://nixos.org/channels/nixos-24.11/nixexprs.tar.xz"; # for old docs @@ -27,6 +28,8 @@ # https://github.com/nix-community/home-manager home-manager-edge.url = "github:nix-community/home-manager/master"; home-manager-edge.inputs.nixpkgs.follows = "nixpkgs-edge"; + home-manager-2605.url = "github:nix-community/home-manager/release-26.05"; + home-manager-2605.inputs.nixpkgs.follows = "nixpkgs-2605"; home-manager-2511.url = "github:nix-community/home-manager/release-25.11"; home-manager-2511.inputs.nixpkgs.follows = "nixpkgs-2511"; home-manager-2505.url = "github:nix-community/home-manager/release-25.05"; @@ -81,6 +84,8 @@ # https://github.com/Mic92/sops-nix sops-nix-edge.url = "github:Mic92/sops-nix"; sops-nix-edge.inputs.nixpkgs.follows = "nixpkgs-edge"; + sops-nix-2605.url = "github:Mic92/sops-nix"; + sops-nix-2605.inputs.nixpkgs.follows = "nixpkgs-2605"; sops-nix-2511.url = "github:Mic92/sops-nix"; sops-nix-2511.inputs.nixpkgs.follows = "nixpkgs-2511"; sops-nix-2505.url = "github:Mic92/sops-nix"; @@ -148,10 +153,15 @@ home-manager = inputs'.home-manager-edge; sops-nix = inputs'.sops-nix-edge; }; - input-views.inputs-2605 = input-views.inputs-edge; + input-views.inputs-2605 = inputs' // { + nixpkgs = inputs'.nixpkgs-2605; + unstable = inputs'.nixpkgs-edge; + home-manager = inputs'.home-manager-2605; + sops-nix = inputs'.sops-nix-2605; + }; input-views.inputs-2511 = inputs' // { nixpkgs = inputs'.nixpkgs-2511; - unstable = inputs'.nixpkgs-edge; + unstable = inputs'.nixpkgs-2605; home-manager = inputs'.home-manager-2511; sops-nix = inputs'.sops-nix-2511; }; diff --git a/hosts/default.nix b/hosts/default.nix index 2714b38..643fa0c 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -87,7 +87,7 @@ let #hostname "domain" "system" inputs "state" [ modules ... ] # asgaut = mk "pbsds.net" "riscv64-linux" input-views.inputs-2405 "24.05" [ hw.starfive-visionfive-2 ]; # noximilien = mk "pbsds.net" "x86_64-linux" input-views.inputs-251T "24.11" [ ts1 au tse ]; - noximilien = mk "pbsds.net" "x86_64-linux" input-views.inputs-2511 "25.05" [ ts1 au tse ]; + noximilien = mk "pbsds.net" "x86_64-linux" input-views.inputs-2605 "25.05" [ ts1 au tse ]; nord = mk "pbsds.net" "x86_64-linux" input-views.inputs-2511 "25.05" [ ts1 au ]; sopp = mk "pbsds.net" "x86_64-linux" input-views.inputs-edge "25.05" [ ts1 au ]; bjarte = mk "pbsds.net" "x86_64-linux" input-views.inputs-edge "25.05" [ ts1 ]; diff --git a/hosts/nixos/noximilien/configuration.nix b/hosts/nixos/noximilien/configuration.nix index aa8394d..a3b8ab9 100644 --- a/hosts/nixos/noximilien/configuration.nix +++ b/hosts/nixos/noximilien/configuration.nix @@ -86,7 +86,7 @@ # TODO: move to a separate host, these suck to build ../../../profiles/http/docs # ../../../profiles/http/docs/pdoc.nix - ../../../profiles/http/docs/python-docs.nix + # ../../../profiles/http/docs/python-docs.nix ../../../profiles/http/docs/nixpkgs.nix ../../../profiles/http/docs/home-manager.nix ../../../profiles/http/docs/linux-docs.nix # TODO: fix diff --git a/secrets/default.nix b/secrets/default.nix index 66733c6..e94ce5a 100644 --- a/secrets/default.nix +++ b/secrets/default.nix @@ -21,4 +21,7 @@ # "${secret}".sopsFile = file; # } # )); + + # generate a host key even if ssh is not enabled + services.openssh.generateHostKeys = true; }