diff --git a/common/linux.nix b/common/linux.nix index 0dca86b..7f8dd4d 100644 --- a/common/linux.nix +++ b/common/linux.nix @@ -2,7 +2,7 @@ boot.kernelPackages = pkgs.linuxPackages; boot.supportedFilesystems = ["ntfs"]; - system.stateVersion = "22.11"; + system.stateVersion = "23.05"; system.autoUpgrade.enable = true; diff --git a/flake.lock b/flake.lock index 86c537c..2721160 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1684774948, - "narHash": "sha256-hJTaw4dYzcB+lsasKejnafq0CxPsVetn9RLXrcL+4jE=", + "lastModified": 1685559570, + "narHash": "sha256-MNIQvLRoq92isMLR/ordKNCl+aXNiuwBM4QyqmS8d00=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "b8c286c82c6b47826a6c0377e7017052ad91353c", + "rev": "4338bc869e9874d54a4c89539af72f16666b2abe", "type": "github" }, "original": { @@ -22,20 +22,19 @@ }, "home-manager": { "inputs": { - "nixpkgs": "nixpkgs", - "utils": "utils" + "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1681092193, - "narHash": "sha256-JerCqqOqbT2tBnXQW4EqwFl0hHnuZp21rIQ6lu/N4rI=", + "lastModified": 1685599623, + "narHash": "sha256-Tob4CMOVHue0D3RzguDBCtUmX5ji2PsdbQDbIOIKvsc=", "owner": "nix-community", "repo": "home-manager", - "rev": "f9edbedaf015013eb35f8caacbe0c9666bbc16af", + "rev": "93db05480c0c0f30382d3e80779e8386dcb4f9dd", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-22.11", + "ref": "release-23.05", "repo": "home-manager", "type": "github" } @@ -43,7 +42,7 @@ "nix-ld": { "inputs": { "nixpkgs": "nixpkgs_2", - "utils": "utils_2" + "utils": "utils" }, "locked": { "lastModified": 1682533818, @@ -77,11 +76,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1667629849, - "narHash": "sha256-P+v+nDOFWicM4wziFK9S/ajF2lc0N2Rg9p6Y35uMoZI=", + "lastModified": 1684570954, + "narHash": "sha256-FX5y4Sm87RWwfu9PI71XFvuRpZLowh00FQpIJ1WfXqE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3bacde6273b09a21a8ccfba15586fb165078fb62", + "rev": "3005f20ce0aaa58169cdee57c8aa12e5f1b6e1b3", "type": "github" }, "original": { @@ -108,16 +107,16 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1685314633, - "narHash": "sha256-8LXBPqTQXl5ofkjpJ18JcbmLJ/lWDoMxtUwiDYv0wro=", + "lastModified": 1685620773, + "narHash": "sha256-iQ+LmporQNdLz8uMJdP62TaAWeLUwl43/MYUBtWqulM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c8a17ce7abc03c50cd072e9e6c9b389c5f61836b", + "rev": "f0ba8235153dd2e25cf06cbf70d43efdd4443592", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-22.11", + "ref": "nixos-23.05", "repo": "nixpkgs", "type": "github" } @@ -145,21 +144,6 @@ "repo": "flake-utils", "type": "github" } - }, - "utils_2": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index c3714dd..2fde20e 100644 --- a/flake.nix +++ b/flake.nix @@ -3,10 +3,10 @@ inputs = { home-manager = { - url = "github:nix-community/home-manager/release-22.11"; + url = "github:nix-community/home-manager/release-23.05"; }; - nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; diff --git a/home/default.nix b/home/default.nix index 12a277c..3acbb5e 100644 --- a/home/default.nix +++ b/home/default.nix @@ -15,7 +15,7 @@ }; inherit (pkgs) stdenv; in { - home.stateVersion = "22.11"; + home.stateVersion = "23.05"; services = { gpg-agent = { diff --git a/machines/hephaestus/hardware.nix b/machines/hephaestus/hardware.nix index c2d65b0..d13d006 100644 --- a/machines/hephaestus/hardware.nix +++ b/machines/hephaestus/hardware.nix @@ -27,7 +27,6 @@ boot.loader.grub = { enable = true; device = "nodev"; - version = 2; efiSupport = true; enableCryptodisk = true; };