diff options
| -rw-r--r-- | flake.lock | 26 | ||||
| -rw-r--r-- | flake.nix | 8 | ||||
| -rw-r--r-- | home/default.nix | 4 | ||||
| -rw-r--r-- | lib/home_configurations_as_packages.nix | 2 | ||||
| -rw-r--r-- | lib/nixos_configurations_as_packages.nix | 2 | ||||
| -rw-r--r-- | nixos/default.nix | 4 | ||||
| -rw-r--r-- | nixos/modules/flake.nix | 12 | ||||
| -rw-r--r-- | packages/default.nix | 4 |
8 files changed, 30 insertions, 32 deletions
diff --git a/flake.lock b/flake.lock index 7d30c3d..6ed6692 100644 --- a/flake.lock +++ b/flake.lock @@ -5,7 +5,7 @@ "flake-compat": "flake-compat", "flake-utils": "flake-utils", "nixpkgs": [ - "unstable-small" + "unstable" ] }, "locked": { @@ -72,7 +72,7 @@ "home-manager": { "inputs": { "nixpkgs": [ - "unstable-small" + "unstable" ] }, "locked": { @@ -91,11 +91,11 @@ }, "master": { "locked": { - "lastModified": 1643948526, - "narHash": "sha256-XmRNI2zmR0iTX7LUJy93MG6GZoMHy1nlMNcp31XHi8w=", + "lastModified": 1644032206, + "narHash": "sha256-Bc93OGzPF2+TTt7PUZ5GZFrdeLiVpaw/gkPLPLhGrtI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d67ad28fc301305baeeb364a04f0565c5f5118c8", + "rev": "357a1cf5e9071f1092f060d778c41937bde3e00a", "type": "github" }, "original": { @@ -109,16 +109,16 @@ "inputs": { "flake-utils": "flake-utils_2", "nixpkgs": [ - "unstable-small" + "unstable" ] }, "locked": { "dir": "contrib", - "lastModified": 1643939328, - "narHash": "sha256-aHh//a+2ITDYaOmf6Tx8sNW+j2eCTqpgRnmhdqfUw6Q=", + "lastModified": 1643987241, + "narHash": "sha256-s94M2ta+BkdVUrrSQQvwz7kenc+GPP7W1vvkwBLD0zk=", "owner": "neovim", "repo": "neovim", - "rev": "6bee2bf7903b84feffb14a42668626b3014f2132", + "rev": "dcbf9f93e9038d9b4eb782aff2a07e2560f6e04e", "type": "github" }, "original": { @@ -160,7 +160,7 @@ "sops-nix": { "inputs": { "nixpkgs": [ - "unstable-small" + "unstable" ] }, "locked": { @@ -195,11 +195,11 @@ }, "unstable-small": { "locked": { - "lastModified": 1643919911, - "narHash": "sha256-f6/nmdX1Gsc17UL0u7FtBGUKEJ//CztzqTdghuVK4kY=", + "lastModified": 1644006260, + "narHash": "sha256-gDKpUz/OALbct1IBHulbZnE+xJplOaXb+wnfHT/OKBs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "07a283bb00398dc8b32e31269ca1fa051c646305", + "rev": "7f3473534d47af832cd255ec8ff52ec5fb8274b2", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index dfacbf5..b08d42d 100644 --- a/flake.nix +++ b/flake.nix @@ -9,17 +9,17 @@ master.url = "github:nixos/nixpkgs/master"; home-manager.url = "github:nix-community/home-manager"; - home-manager.inputs.nixpkgs.follows = "unstable-small"; + home-manager.inputs.nixpkgs.follows = "unstable"; sops-nix.url = "github:Mic92/sops-nix"; - sops-nix.inputs.nixpkgs.follows = "unstable-small"; + sops-nix.inputs.nixpkgs.follows = "unstable"; neovim.url = "github:neovim/neovim?dir=contrib"; - neovim.inputs.nixpkgs.follows = "unstable-small"; + neovim.inputs.nixpkgs.follows = "unstable"; # https://github.com/NixOS/nix/pull/5342 chaotic-nixpkgs.url = "git+https://git.sr.ht/~boppy/chaotic-nixpkgs?ref=main"; - chaotic-nixpkgs.inputs.nixpkgs.follows = "unstable-small"; + chaotic-nixpkgs.inputs.nixpkgs.follows = "unstable"; wallpapers = { url = "git+https://git.sr.ht/~boppy/wall?ref=main"; flake = false; }; }; diff --git a/home/default.nix b/home/default.nix index 2ba3707..53dc719 100644 --- a/home/default.nix +++ b/home/default.nix @@ -1,11 +1,11 @@ -{ self, unstable-small, ... } @ inputs: +{ self, unstable, ... } @ inputs: { "boopy@alpha" = self.lib.mkHome { username = "boopy"; hostname = "alpha"; system = "x86_64-linux"; - pkgs = import unstable-small { system = "x86_64-linux"; overlays = with inputs; [ chaotic-nixpkgs.overlay ]; }; + pkgs = import unstable { system = "x86_64-linux"; overlays = with inputs; [ chaotic-nixpkgs.overlay ]; }; extraModules = [ ./profiles/populate.nix diff --git a/lib/home_configurations_as_packages.nix b/lib/home_configurations_as_packages.nix index 2f6aa18..55d3e55 100644 --- a/lib/home_configurations_as_packages.nix +++ b/lib/home_configurations_as_packages.nix @@ -1,7 +1,7 @@ { self, ... } @ inputs: let - pkgs = import inputs.unstable-small { system = "x86_64-linux"; }; + pkgs = import inputs.unstable { system = "x86_64-linux"; }; inherit (pkgs.lib) genAttrs mapAttrs'; diff --git a/lib/nixos_configurations_as_packages.nix b/lib/nixos_configurations_as_packages.nix index c761c3d..356b09b 100644 --- a/lib/nixos_configurations_as_packages.nix +++ b/lib/nixos_configurations_as_packages.nix @@ -1,7 +1,7 @@ { self, ... } @ inputs: let - pkgs = import inputs.unstable-small { system = "x86_64-linux"; }; + pkgs = import inputs.unstable { system = "x86_64-linux"; }; inherit (pkgs.lib) genAttrs mapAttrs'; 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}" ]; }; diff --git a/packages/default.nix b/packages/default.nix index 5411894..0f6e9ec 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -1,7 +1,5 @@ { self, neovim, ... } @ inputs: -let - pkgs = inputs.unstable-small.legacyPackages.x86_64-linux; -in + { "neovim" = neovim.packages.x86_64-linux.neovim; } |