From 9cff9ce8a4626bb83422e90b55e93c80586ac817 Mon Sep 17 00:00:00 2001
From: sefidel <contact@sefidel.net>
Date: Sat, 5 Feb 2022 13:46:06 +0900
Subject: feat(pkgs)!: unstable-small -> unstable

* Changes default branch to unstable
* nixpkgsUnstable (nixos-unstable) -> nixpkgs
* nixpkgs (nixos-unstable-small) -> nixpkgsSmall
---
 nixos/default.nix       |  4 ++--
 nixos/modules/flake.nix | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'nixos')

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}"
     ];
   };
-- 
cgit 1.4.1