From 5b65d7d5b12edc7ef6ddb9c63863a51b4e7e8ed8 Mon Sep 17 00:00:00 2001 From: Sam Date: Sat, 22 Jun 2024 14:37:19 +0100 Subject: [PATCH] update to nixpkgs 24.04 --- flake.lock | 97 +++++++++++--------- flake.nix | 7 +- home/common/core/default.nix | 1 + home/common/optional/desktop/dwm/default.nix | 1 + hosts/common/optional/openssh.nix | 2 +- 5 files changed, 59 insertions(+), 49 deletions(-) diff --git a/flake.lock b/flake.lock index 632b8e7..2a608fd 100644 --- a/flake.lock +++ b/flake.lock @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1718588625, - "narHash": "sha256-8ZbrJq1jcmyzJ4SDkvd8JOZD4/fNUHpL4cpqVe4w3CU=", + "lastModified": 1718846788, + "narHash": "sha256-9dtXYtEkmXoUJV+PGLqscqF7qTn4AIhAKpFWRFU2NYs=", "owner": "nix-community", "repo": "disko", - "rev": "8262659fc990cecdf6a8de74c3de7b6ec58c2276", + "rev": "e1174d991944a01eaaa04bc59c6281edca4c0e6e", "type": "github" }, "original": { @@ -195,11 +195,11 @@ ] }, "locked": { - "lastModified": 1717664902, - "narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=", + "lastModified": 1718879355, + "narHash": "sha256-RTyqP4fBX2MdhNuMP+fnR3lIwbdtXhyj7w7fwtvgspc=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1", + "rev": "8cd35b9496d21a6c55164d8547d9d5280162b07a", "type": "github" }, "original": { @@ -237,15 +237,16 @@ ] }, "locked": { - "lastModified": 1718526747, - "narHash": "sha256-sKrD/utGvmtQALvuDj4j0CT3AJXP1idOAq2p+27TpeE=", + "lastModified": 1718530513, + "narHash": "sha256-BmO8d0r+BVlwWtMLQEYnwmngqdXIuyFzMwvmTcLMee8=", "owner": "nix-community", "repo": "home-manager", - "rev": "0a7ffb28e5df5844d0e8039c9833d7075cdee792", + "rev": "a1fddf0967c33754271761d91a3d921772b30d0e", "type": "github" }, "original": { "owner": "nix-community", + "ref": "release-24.05", "repo": "home-manager", "type": "github" } @@ -258,15 +259,16 @@ ] }, "locked": { - "lastModified": 1718141734, - "narHash": "sha256-cA+6l8ZCZ7MXGijVuY/1f55+wF/RT4PlTR9+g4bx86w=", + "lastModified": 1718530513, + "narHash": "sha256-BmO8d0r+BVlwWtMLQEYnwmngqdXIuyFzMwvmTcLMee8=", "owner": "nix-community", "repo": "home-manager", - "rev": "892f76bd0aa09a0f7f73eb41834b8a904b6d0fad", + "rev": "a1fddf0967c33754271761d91a3d921772b30d0e", "type": "github" }, "original": { "owner": "nix-community", + "ref": "release-24.05", "repo": "home-manager", "type": "github" } @@ -313,11 +315,11 @@ ] }, "locked": { - "lastModified": 1717976995, - "narHash": "sha256-u3HBinyIyUvL1+N816bODpJmSQdgn0Mbb8BprFw7kqo=", + "lastModified": 1718662658, + "narHash": "sha256-AKG7BsqtVWDlefgzyKz7vjaKTLi4+bmTSBhowbQoZtM=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "315aa649ba307704db0b16c92f097a08a65ec955", + "rev": "29b3096a6e283d7e6779187244cb2a3942239fdf", "type": "github" }, "original": { @@ -387,14 +389,18 @@ }, "nixpkgs": { "locked": { - "lastModified": 0, - "narHash": "sha256-7R2ZvOnvd9h8fDd65p0JnB7wXfUvreox3xFdYWd1BnY=", - "path": "/nix/store/l4wskml8vcs49mg6w9la715cx10sviwh-source", - "type": "path" + "lastModified": 1718835956, + "narHash": "sha256-wM9v2yIxClRYsGHut5vHICZTK7xdrUGfrLkXvSuv6s4=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "dd457de7e08c6d06789b1f5b88fc9327f4d96309", + "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "nixos", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs-lib": { @@ -430,11 +436,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1718318537, - "narHash": "sha256-4Zu0RYRcAY/VWuu6awwq4opuiD//ahpc2aFHg2CWqFY=", + "lastModified": 1718895438, + "narHash": "sha256-k3JqJrkdoYwE3fHE6xGDY676AYmyh4U2Zw+0Bwe5DLU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e9ee548d90ff586a6471b4ae80ae9cfcbceb3420", + "rev": "d603719ec6e294f034936c0d0dc06f689d91b6c3", "type": "github" }, "original": { @@ -446,11 +452,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1718541509, - "narHash": "sha256-TmC5TxW5WPAfmovDzi1hLe1i4qqND79s9SH9UOKcSvo=", + "lastModified": 1718632497, + "narHash": "sha256-YtlyfqOdYMuu7gumZtK0Kg7jr4OKfHUhJkZfNUryw68=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ba06293cdba1c94af9710024abf3b94cf8d76349", + "rev": "c58b4a9118498c1055c5908a5bbe666e56abe949", "type": "github" }, "original": { @@ -462,11 +468,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1718632497, - "narHash": "sha256-YtlyfqOdYMuu7gumZtK0Kg7jr4OKfHUhJkZfNUryw68=", + "lastModified": 1719036971, + "narHash": "sha256-t1g+Iq3wRWLkB1VAvdqmud9gjhedqgoaaRHd7YsC0JA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c58b4a9118498c1055c5908a5bbe666e56abe949", + "rev": "165dfa10e2983708c5eae03a1f02674b5d03208a", "type": "github" }, "original": { @@ -490,26 +496,27 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1718614971, - "narHash": "sha256-ID/Fvvd9Bz01gpm36mIfjoqXIknb2WkacSukW75cRNw=", + "lastModified": 1718966331, + "narHash": "sha256-JKc3awrDQhdYT9LUAVgt74rFVcSrZ+VgNTsWLo2Kp24=", "owner": "nix-community", "repo": "nixvim", - "rev": "b822078ec1b2bbf666af767061e29575edc5ec05", + "rev": "1cd17226d5c75d20df2ebb754c3fc60ccc735a25", "type": "github" }, "original": { "owner": "nix-community", + "ref": "nixos-24.05", "repo": "nixvim", "type": "github" } }, "nur": { "locked": { - "lastModified": 1718649005, - "narHash": "sha256-1Aw+JgGQK6e9MZdV4cbO1d3GRvYRKbwOvmet5gSFwvE=", + "lastModified": 1719053107, + "narHash": "sha256-gUnarEm0XN7xVK2s9t7eEEixctynaERMruLdzkDloV8=", "owner": "nix-community", "repo": "NUR", - "rev": "d4bfad4cd8a5c44bb469f95f20e6eb4799145046", + "rev": "f1b52ba4df9226117b0f33b5226ccea7aad08068", "type": "github" }, "original": { @@ -527,11 +534,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1718647444, - "narHash": "sha256-RzTDK86nI7yzSrOCYy+jPW+7LZigJm1WnFULNdOXblU=", + "lastModified": 1718881664, + "narHash": "sha256-ZULRSiURptz6Da+yECzQDS30IIEAEOYyIAv5rs+p9Fg=", "owner": "nix-community", "repo": "poetry2nix", - "rev": "d3e889d71b028f61ff6a587cfe437bde16cf8ac1", + "rev": "5392004e2b350afda0dd5e92ccd53ab9b1261947", "type": "github" }, "original": { @@ -552,11 +559,11 @@ "treefmt-nix": "treefmt-nix_3" }, "locked": { - "lastModified": 1718647444, - "narHash": "sha256-RzTDK86nI7yzSrOCYy+jPW+7LZigJm1WnFULNdOXblU=", + "lastModified": 1718881664, + "narHash": "sha256-ZULRSiURptz6Da+yECzQDS30IIEAEOYyIAv5rs+p9Fg=", "owner": "nix-community", "repo": "poetry2nix", - "rev": "d3e889d71b028f61ff6a587cfe437bde16cf8ac1", + "rev": "5392004e2b350afda0dd5e92ccd53ab9b1261947", "type": "github" }, "original": { @@ -720,11 +727,11 @@ ] }, "locked": { - "lastModified": 1718139168, - "narHash": "sha256-1TZQcdETNdJMcfwwoshVeCjwWfrPtkSQ8y8wFX3it7k=", + "lastModified": 1718522839, + "narHash": "sha256-ULzoKzEaBOiLRtjeY3YoGFJMwWSKRYOic6VNw2UyTls=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "1cb529bffa880746a1d0ec4e0f5076876af931f1", + "rev": "68eb1dc333ce82d0ab0c0357363ea17c31ea1f81", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 7738745..324c4e9 100644 --- a/flake.nix +++ b/flake.nix @@ -3,6 +3,7 @@ inputs = { # Nixpkgs + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; # NUR @@ -14,15 +15,15 @@ # Home manager home-manager = { - url = "github:nix-community/home-manager"; + url = "github:nix-community/home-manager/release-24.05"; inputs.nixpkgs.follows = "nixpkgs"; }; # Nixvim nixvim = { - url = "github:nix-community/nixvim"; + #url = "github:nix-community/nixvim"; # If you are not running an unstable channel of nixpkgs, select the corresponding branch of nixvim. - # url = "github:nix-community/nixvim/nixos-23.05"; + url = "github:nix-community/nixvim/nixos-24.05"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/home/common/core/default.nix b/home/common/core/default.nix index 1c10ec6..2f6d31c 100644 --- a/home/common/core/default.nix +++ b/home/common/core/default.nix @@ -10,6 +10,7 @@ nixpkgs.overlays = [ inputs.nur.overlay outputs.overlays.additions + outputs.overlays.unstable-packages ]; # Global home packages without config go here (for all hosts and users) diff --git a/home/common/optional/desktop/dwm/default.nix b/home/common/optional/desktop/dwm/default.nix index 90aae8a..7a572a0 100644 --- a/home/common/optional/desktop/dwm/default.nix +++ b/home/common/optional/desktop/dwm/default.nix @@ -35,5 +35,6 @@ pkgs.picom pkgs.sxhkd pkgs.nsxiv + pkgs.unstable.aichat ]; } diff --git a/hosts/common/optional/openssh.nix b/hosts/common/optional/openssh.nix index 29fae74..95bdad3 100644 --- a/hosts/common/optional/openssh.nix +++ b/hosts/common/optional/openssh.nix @@ -9,7 +9,7 @@ in services.openssh = { enable = true; ports = [ sshPort ]; - authorizedKeysFiles = lib.mkForce ["/etc/ssh/authorized_keys.d/%u"]; + authorizedKeysFiles = lib.mkForce [ "/etc/ssh/authorized_keys.d/%u" ]; hostKeys = [{ path = "${lib.optionalString hasOptinPersistence "/persist"}/etc/ssh/ssh_host_ed25519_key"; type = "ed25519";