diff --git a/flake.lock b/flake.lock index 6409d89..0e02634 100644 --- a/flake.lock +++ b/flake.lock @@ -4,19 +4,20 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ] + ], + "utils": "utils" }, "locked": { - "lastModified": 1656169755, - "narHash": "sha256-Nlnm4jeQWEGjYrE6hxi/7HYHjBSZ/E0RtjCYifnNsWk=", + "lastModified": 1667234164, + "narHash": "sha256-oPMAvHZBDgamjmIQly5+sw2LtfKwY7qcWZZwKiwKQy8=", "owner": "nix-community", "repo": "home-manager", - "rev": "4a3d01fb53f52ac83194081272795aa4612c2381", + "rev": "722e8d65d3aba6f527100cc2d1539e4ca04d066f", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-22.05", + "ref": "master", "repo": "home-manager", "type": "github" } @@ -57,11 +58,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1665081174, - "narHash": "sha256-6hsmzdhdy8Kbvl5e0xZNE83pW3fKQvNiobJkM6KQrgA=", + "lastModified": 1667050928, + "narHash": "sha256-xOn0ZgjImIyeecEsrjxuvlW7IW5genTwvvnDQRFncB8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "598f83ebeb2235435189cf84d844b8b73e858e0f", + "rev": "fdebb81f45a1ba2c4afca5fd9f526e1653ad0949", "type": "github" }, "original": { @@ -102,10 +103,26 @@ "type": "github" } }, + "nur": { + "locked": { + "lastModified": 1667138094, + "narHash": "sha256-9D5YZlgXR4qdTff7DNoyANyH0v+ad+Ipom0A23BCUlA=", + "owner": "nix-community", + "repo": "NUR", + "rev": "50c60a363e0e1e7423d29efd11f7882bfe8f6bdd", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "NUR", + "type": "github" + } + }, "root": { "inputs": { "home-manager": "home-manager", "nixpkgs": "nixpkgs", + "nur": "nur", "ssbm-nix": "ssbm-nix" } }, @@ -144,6 +161,21 @@ "repo": "ssbm-nix", "type": "github" } + }, + "utils": { + "locked": { + "lastModified": 1667077288, + "narHash": "sha256-bdC8sFNDpT0HK74u9fUkpbf1MEzVYJ+ka7NXCdgBoaA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "6ee9ebb6b1ee695d2cacc4faa053a7b9baa76817", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 2fafc91..2f4044e 100644 --- a/flake.nix +++ b/flake.nix @@ -5,12 +5,14 @@ nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; home-manager.url = "github:nix-community/home-manager/master"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; + nur.url = github:nix-community/NUR; ssbm-nix.url = github:djanatyn/ssbm-nix; }; outputs = { nixpkgs, home-manager, + nur, ssbm-nix, ... }: let @@ -73,6 +75,7 @@ modules = [ ssbm-nix.nixosModule + nur.nixosModules.nur ./system/gospel/configuration.nix ./common/yubikey.nix ]; diff --git a/system/gospel/configuration.nix b/system/gospel/configuration.nix index fe5e3f0..b56a870 100644 --- a/system/gospel/configuration.nix +++ b/system/gospel/configuration.nix @@ -21,11 +21,13 @@ nixpkgs.config.allowUnfree = true; - # Make ready for nix flakes - nix.package = pkgs.nixVersions.stable; - nix.extraOptions = '' - experimental-features = nix-command flakes - ''; + nix = { + # Make ready for nix flakes + package = pkgs.nixVersions.stable; + extraOptions = '' + experimental-features = nix-command flakes + ''; + }; networking.hostName = "gospel"; # Define your hostname. # Pick only one of the below networking options. @@ -108,6 +110,14 @@ usbutils pavucontrol cachix + nixos-generators + config.nur.repos.mic92.yubikey-touch-detector + + cryptsetup + paperkey + unzip + p7zip + nix-index ]; # Some programs need SUID wrappers, can be configured further or are