diff options
| author | sefidel <contact@sefidel.net> | 2022-02-05 13:46:06 +0900 |
|---|---|---|
| committer | sefidel <contact@sefidel.net> | 2022-02-05 13:46:15 +0900 |
| commit | 9cff9ce8a4626bb83422e90b55e93c80586ac817 (patch) | |
| tree | 2429c8c11308032d9bca2b5b2e145d1d9c4f9b92 /nixos | |
| parent | fff4608bf194f4e3a99c41666881a68cbe41280a (diff) | |
| download | nixrc-9cff9ce8a4626bb83422e90b55e93c80586ac817.tar.gz nixrc-9cff9ce8a4626bb83422e90b55e93c80586ac817.zip | |
feat(pkgs)!: unstable-small -> unstable
* Changes default branch to unstable * nixpkgsUnstable (nixos-unstable) -> nixpkgs * nixpkgs (nixos-unstable-small) -> nixpkgsSmall
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/default.nix | 4 | ||||
| -rw-r--r-- | nixos/modules/flake.nix | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/nixos/default.nix b/nixos/default.nix index c947084..616381e 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -1,9 +1,9 @@ -{ self, unstable-small, ... } @ inputs: +{ self, unstable, ... } @ inputs: { alpha = self.lib.mkSystem { name = "alpha"; - nixpkgs = unstable-small; + nixpkgs = unstable; overlays = with inputs; [ chaotic-nixpkgs.overlay ]; extraModules = [ inputs.sops-nix.nixosModules.sops diff --git a/nixos/modules/flake.nix b/nixos/modules/flake.nix index 7dc405b..15a4254 100644 --- a/nixos/modules/flake.nix +++ b/nixos/modules/flake.nix @@ -3,7 +3,7 @@ let base = "/etc/nixpkgs/channels"; nixpkgsPath = "${base}/nixpkgs"; - nixpkgsUnstablePath = "${base}/nixpkgsUnstable"; + nixpkgsSmallPath = "${base}/nixpkgsSmall"; nixpkgs2111Path = "${base}/nixpkgs2111"; in { @@ -14,21 +14,21 @@ in package = pkgs.nixUnstable; experimentalFeatures = "nix-command flakes"; - registry.nixpkgs.flake = unstable-small; - registry.nixpkgsUnstable.flake = unstable; + registry.nixpkgs.flake = unstable; + registry.nixpkgsSmall.flake = unstable-small; registry.nixpkgs2111.flake = nixpkgs-2111; nixPath = [ "nixpkgs=${nixpkgsPath}" - "nixpkgsUnstable=${nixpkgsUnstablePath}" + "nixpkgsSmall=${nixpkgsSmallPath}" "nixpkgs2111=${nixpkgs2111Path}" "/nix/var/nix/profiles/per-user/root/channels" ]; }; systemd.tmpfiles.rules = [ - "L+ ${nixpkgsPath} - - - - ${unstable-small}" - "L+ ${nixpkgsUnstablePath} - - - - ${unstable}" + "L+ ${nixpkgsPath} - - - - ${unstable}" + "L+ ${nixpkgsSmallPath} - - - - ${unstable-small}" "L+ ${nixpkgs2111Path} - - - - ${nixpkgs-2111}" ]; }; |