refac(nix): nixpkgs-unstable -> nixos-unstable

`nixos-unstable` seems to be the slightly more "stable" channel with a number of NixOS-specific tests being run only there. It also doesn't contain MacOS packages, so has a smaller overhead and is the basis for many indexes such as search.nixos.org.
workflow · Aug 5, 2024 · f878375 · f878375
1 parent eac9c85
commit f878375
Show file tree

Hide file tree

Showing 10 changed files with 200 additions and 219 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -12,7 +12,7 @@
     };
     nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
     nixpkgs-2311.url = "github:nixos/nixpkgs/nixos-23.11";
-    nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
+    nixos-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
     nixos-hardware.url = "github:nixos/nixos-hardware/master";
     rmob = {
       url = "https://flakehub.com/f/workflow/rmob/*.tar.gz";
@@ -23,18 +23,15 @@
   };
 
   outputs = {
-    self,
-    nix-index-database,
     nixpkgs,
     nixpkgs-2311,
-    nixpkgs-unstable,
-    nixos-hardware,
+    nixos-unstable,
     home-manager,
     secrets,
     ...
   } @ inputs: let
     overlays = {
-      unstable = import nixpkgs-unstable {
+      unstable = import nixos-unstable {
         system = "x86_64-linux";
         config.allowUnfree = true;
       };
@@ -55,7 +52,7 @@
           nix = {
             registry = {
               nixpkgs-local.flake = nixpkgs;
-              nixpkgs-unstable-local.flake = nixpkgs-unstable;
+              nixos-unstable-local.flake = nixos-unstable;
             };
           };
 
@@ -97,7 +94,7 @@
           nix = {
             registry = {
               nixpkgs-local.flake = nixpkgs;
-              nixpkgs-unstable-local.flake = nixpkgs-unstable;
+              nixos-unstable-local.flake = nixos-unstable;
             };
           };
 

diff --git a/home.nix b/home.nix
@@ -70,8 +70,6 @@
     ]
     ++ secretImports;
 
-  nixpkgs-unstable = pkgs.unstable;
-
   profile = pkgs.callPackage ./lib/profile.nix {};
 
   scripts = pkgs.callPackage ./home/scripts {};
@@ -244,7 +242,7 @@ in {
     lorri.enable = true;
 
     flameshot = {
-      package = nixpkgs-unstable.flameshot;
+      package = pkgs.unstable.flameshot;
       enable = true;
       settings = {
         General = {

diff --git a/home/autorandr.nix b/home/autorandr.nix
@@ -8,8 +8,6 @@
   pkgs,
   ...
 }: let
-  nixpkgs-unstable = pkgs.unstable;
-
   baseHook = ''
     pkill -9 variety 2> /dev/null
     variety &>/dev/null &
@@ -28,7 +26,7 @@ in {
           if isHidpi
           then hidpiHook
           else baseHook;
-        notify-i3 = "${nixpkgs-unstable.i3-gaps}/bin/i3-msg restart";
+        notify-i3 = "${pkgs.unstable.i3-gaps}/bin/i3-msg restart";
         change-dpi = ''
           case "$AUTORANDR_CURRENT_PROFILE" in
             movie)

diff --git a/home/gtk-qt/default.nix b/home/gtk-qt/default.nix
@@ -1,6 +1,4 @@
-{pkgs, ...}: let
-  nixpkgs-unstable = pkgs.unstable;
-in {
+{pkgs, ...}: {
   gtk = {
     enable = true;
     font = {
@@ -9,7 +7,7 @@ in {
     };
     iconTheme = {
       name = "Pop";
-      package = nixpkgs-unstable.pop-icon-theme;
+      package = pkgs.unstable.pop-icon-theme;
     };
     theme = {
       name = "Pop";

diff --git a/home/lf.nix b/home/lf.nix
@@ -1,6 +1,4 @@
-{pkgs, ...}: let
-  nixpkgs-unstable = pkgs.unstable;
-in {
+{pkgs, ...}: {
   programs.lf = {
     enable = true;
 
@@ -148,7 +146,7 @@ in {
 
     previewer = {
       keybinding = "i";
-      source = "${nixpkgs-unstable.pistol}/bin/pistol";
+      source = "${pkgs.unstable.pistol}/bin/pistol";
     };
 
     settings = {

diff --git a/home/neovim/default.nix b/home/neovim/default.nix
@@ -1,9 +1,5 @@
-{
-  pkgs,
-  inputs,
-  ...
-}: let
-  nixpkgs-unstable = pkgs.unstable;
+{pkgs, ...}: let
+  nixos-unstable = pkgs.unstable;
 
   bookmarks-nvim = pkgs.vimUtils.buildVimPlugin {
     name = "bookmarks-nvim";
@@ -255,7 +251,7 @@ in {
         type = "lua";
       }
       {
-        plugin = nixpkgs-unstable.vimPlugins.ChatGPT-nvim;
+        plugin = nixos-unstable.vimPlugins.ChatGPT-nvim;
         config = ''
           require("chatgpt").setup({
             openai_params = {
@@ -313,7 +309,7 @@ in {
         '';
         type = "lua";
       }
-      nixpkgs-unstable.vimPlugins.copilot-vim
+      nixos-unstable.vimPlugins.copilot-vim
       {
         plugin = nvim-web-devicons;
         config = ''
@@ -371,7 +367,7 @@ in {
         '';
         type = "lua";
       }
-      nixpkgs-unstable.vimPlugins.leap-nvim
+      nixos-unstable.vimPlugins.leap-nvim
       {
         plugin = lf-nvim;
         config = ''

diff --git a/home/services/dunst/default.nix b/home/services/dunst/default.nix
@@ -1,13 +1,11 @@
 # Themes and many setting looted from: https://github.com/Kthulu120/i3wm-themes/blob/master/Nature/.config/dunst/dunstrc
-{pkgs, ...}: let
-  nixpkgs-unstable = pkgs.unstable;
-in {
+{pkgs, ...}: {
   services.dunst = {
     enable = true;
 
     iconTheme = {
       name = "Pop";
-      package = nixpkgs-unstable.pop-icon-theme;
+      package = pkgs.unstable.pop-icon-theme;
       size = "16x16";
     };
 

diff --git a/nix/default.nix b/nix/default.nix
@@ -18,7 +18,7 @@
 
     nixPath = [
       "nixpkgs=${pkgs.path}"
-      "nixpkgs-unstable=${pkgs.unstable.path}"
+      "nixos-unstable=${pkgs.unstable.path}"
     ];
   };