diff options
| -rw-r--r-- | flake.lock | 34 | ||||
| -rw-r--r-- | flake.nix | 4 | ||||
| -rw-r--r-- | modules/system/nix/default.nix | 23 | ||||
| -rw-r--r-- | nix/mkHomeManagerConfiguration.nix | 20 |
4 files changed, 51 insertions, 30 deletions
diff --git a/flake.lock b/flake.lock index 63f226c..9054561 100644 --- a/flake.lock +++ b/flake.lock @@ -280,19 +280,20 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ] + ], + "utils": "utils" }, "locked": { - "lastModified": 1665996265, - "narHash": "sha256-/k9og6LDBQwT+f/tJ5ClcWiUl8kCX5m6ognhsAxOiCY=", + "lastModified": 1670253003, + "narHash": "sha256-/tJIy4+FbsQyslq1ipyicZ2psOEd8dvl4OJ9lfisjd0=", "owner": "nix-community", "repo": "home-manager", - "rev": "b81e128fc053ab3159d7b464d9b7dedc9d6a6891", + "rev": "0e8125916b420e41bf0d23a0aa33fadd0328beb3", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-22.05", + "ref": "release-22.11", "repo": "home-manager", "type": "github" } @@ -345,16 +346,16 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1667051795, - "narHash": "sha256-S47/UGqErL4XxoQiDDtuE3EcRM614OWubyJDnADM0HU=", + "lastModified": 1671718464, + "narHash": "sha256-yZpj27iPsaDKVyIezCJAoOsg46FCcnq2J9RkrqQH0s8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b62e0c1523295ac3316a9bc514f013173e5ad7ba", + "rev": "050bad7de82834f25b2bd1769ef2813c35062ad0", "type": "github" }, "original": { "owner": "nixos", - "ref": "release-22.05", + "ref": "release-22.11", "repo": "nixpkgs", "type": "github" } @@ -693,6 +694,21 @@ "url": "https://git.fcuny.net/fcuny/sendsms" } }, + "utils": { + "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" + } + }, "x509-tools": { "inputs": { "crane": "crane_3", diff --git a/flake.nix b/flake.nix index 9de6d9f..d4adb95 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "personal NixOS configurations"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/release-22.05"; + nixpkgs.url = "github:nixos/nixpkgs/release-22.11"; futils.url = "github:numtide/flake-utils"; @@ -18,7 +18,7 @@ nur.url = "github:nix-community/NUR"; home-manager = { - url = "github:nix-community/home-manager/release-22.05"; + url = "github:nix-community/home-manager/release-22.11"; # We want home-manager to use the same set of nixpkgs as our system. inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/modules/system/nix/default.nix b/modules/system/nix/default.nix index ad6bb8d..01df04b 100644 --- a/modules/system/nix/default.nix +++ b/modules/system/nix/default.nix @@ -5,18 +5,19 @@ extraOptions = '' experimental-features = nix-command flakes ''; - autoOptimiseStore = true; - trustedUsers = [ "root" "@wheel" ]; - binaryCaches = [ - "https://cachix.cachix.org" - "https://nix-community.cachix.org" - ]; - - binaryCachePublicKeys = [ - "cachix.cachix.org-1:eWNHQldwUO7G2VkjpnjDbWwy4KQ/HNxht7H4SSoMckM=" - "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - ]; + settings = { + trusted-users = [ "root" "@wheel" ]; + auto-optimise-store = true; + substituters = [ + "https://cachix.cachix.org" + "https://nix-community.cachix.org" + ]; + trusted-public-keys = [ + "cachix.cachix.org-1:eWNHQldwUO7G2VkjpnjDbWwy4KQ/HNxht7H4SSoMckM=" + "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + ]; + }; gc = { automatic = true; diff --git a/nix/mkHomeManagerConfiguration.nix b/nix/mkHomeManagerConfiguration.nix index 264ba7d..67cee3c 100644 --- a/nix/mkHomeManagerConfiguration.nix +++ b/nix/mkHomeManagerConfiguration.nix @@ -2,18 +2,24 @@ inputs@{ self, ... }: { system ? "x86_64-linux" , username ? "fcuny" , hostname -, stateVersion ? "22.05" +, stateVersion ? "22.11" , }: let naersk = inputs.naersk.lib."${system}"; in inputs.home-manager.lib.homeManagerConfiguration { - inherit system; - inherit username; - inherit stateVersion; - - homeDirectory = "/home/${username}"; + modules = [ + "${self}/home" + "${self}/hosts/${hostname}/home.nix" + { + home = { + username = username; + homeDirectory = "/home/${username}"; + stateVersion = stateVersion; + }; + } + ]; pkgs = import inputs.nixpkgs { inherit system; @@ -31,6 +37,4 @@ inputs.home-manager.lib.homeManagerConfiguration { }) ]; }; - configuration.imports = - [ "${self}/home" "${self}/hosts/${hostname}/home.nix" ]; } |