diff --git a/flake.lock b/flake.lock index 1ec1755..bb03db8 100644 --- a/flake.lock +++ b/flake.lock @@ -220,7 +220,9 @@ }, "nixinate": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1654872030, @@ -267,22 +269,6 @@ } }, "nixpkgs": { - "locked": { - "lastModified": 1653060744, - "narHash": "sha256-kfRusllRumpt33J1hPV+CeCCylCXEU7e0gn2/cIM7cY=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "dfd82985c273aac6eced03625f454b334daae2e8", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { "locked": { "lastModified": 1657447684, "narHash": "sha256-FCP9AuU1q6PE3vOeM5SFf58f/UKPBAsoSGDUGamNBbo=", @@ -322,7 +308,7 @@ "nixinate": "nixinate", "nixos-hardware": "nixos-hardware", "nixos-persistence": "nixos-persistence", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "nur": "nur" } }, diff --git a/flake.nix b/flake.nix index 76583f6..b1f9b57 100644 --- a/flake.nix +++ b/flake.nix @@ -12,6 +12,7 @@ nixos-persistence.url = "github:nix-community/impermanence"; nixinate.url = "github:matthewcroughan/nixinate"; + nixinate.inputs.nixpkgs.follows = "nixpkgs"; helix.url = "github:helix-editor/helix"; helix.inputs.nixpkgs.follows = "nixpkgs"; diff --git a/hosts/wolumonde/default.nix b/hosts/wolumonde/default.nix index 2f4b9da..5a1295f 100644 --- a/hosts/wolumonde/default.nix +++ b/hosts/wolumonde/default.nix @@ -22,4 +22,6 @@ substituteOnTarget = true; # if buildOn is "local" then it will substitute on the target, "-s" hermetic = true; }; + + system.stateVersion = "22.05"; } diff --git a/modules/base/nix.nix b/modules/base/nix.nix index 72aac6b..fedf7e3 100644 --- a/modules/base/nix.nix +++ b/modules/base/nix.nix @@ -30,7 +30,4 @@ trusted-users = ["root" "@wheel"]; auto-optimise-store = true; }; - environment.etc."nix/netrc".text = '' - machine private-ardanalabs.cachix.org password ${config.environment.sessionVariables.CACHIX_AUTH_TOKEN} - ''; } diff --git a/secrets/default.nix b/secrets/default.nix index 304184b..42525ec 100644 Binary files a/secrets/default.nix and b/secrets/default.nix differ