Upgrade most home stuff to nixpkgs-unstable

configuration.nix

@@ -115,14 +115,9 @@
 
   environment.systemPackages = with pkgs; [
     cifs-utils
-    curl
-    fish
-    git
     neovim
     veracrypt
     vim
-    wl-clipboard
-    wget
   ];
 
   programs.nix-ld.dev.enable = true;

flake.lock

@@ -29,11 +29,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1697454219,
+        "lastModified": 1697477745,
-        "narHash": "sha256-5VskFezqbiGzQaqzsxogFi2AXkqwrjhpRshe8zn4qyw=",
+        "narHash": "sha256-5oY028h/pBNhT8FBsqL6tOM8nPPICRLiCq1grcPLvAI=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "67acc54cceef38a92ba132e121659fef97698184",
+        "rev": "35d46b0cb203c534ddbd1293a573468031000596",
         "type": "github"
       },
       "original": {
@@ -302,6 +302,22 @@
         "type": "github"
       }
     },
+    "nixpkgs-unstable": {
+      "locked": {
+        "lastModified": 1697059129,
+        "narHash": "sha256-9NJcFF9CEYPvHJ5ckE8kvINvI84SZZ87PvqMbH6pro0=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "5e4c2ada4fcd54b99d56d7bd62f384511a7e2593",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixpkgs_2": {
       "locked": {
         "lastModified": 1679318992,
@@ -320,11 +336,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1697451278,
+        "lastModified": 1697470606,
-        "narHash": "sha256-+O4WVZstr0vaBPNRDayubaVAXvI58US0jf7xYKjCa9g=",
+        "narHash": "sha256-TP3UN5RktQpqDVj5mA6rb1Nu4vGTnctWkbe5sef4LEw=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "5d77923d18bdc1333ce766adbb507fced46dbab7",
+        "rev": "cc83a858d3dbf50a934a4f74fe5508ac2fa72bc5",
         "type": "github"
       },
       "original": {
@@ -394,6 +410,7 @@
         "nix-ld": "nix-ld",
         "nix-wallpaper": "nix-wallpaper",
         "nixpkgs": "nixpkgs",
+        "nixpkgs-unstable": "nixpkgs-unstable",
         "nur": "nur",
         "plasma-manager": "plasma-manager",
         "tuxedo-nixos": "tuxedo-nixos"

flake.nix

@@ -11,6 +11,9 @@
   };
 
   inputs = {
+    nixpkgs-unstable = {
+      url = "github:NixOS/nixpkgs/nixos-unstable";
+    };
     nixpkgs = {
       url = "github:NixOS/nixpkgs/nixos-23.05";
     };
@@ -56,15 +59,24 @@
     };
   };
 
-  outputs = inputs: let
+  outputs = {self, nixpkgs, ...}@inputs: let
     system = "x86_64-linux";
-    pkgs = import inputs.nixpkgs {
+    unstable-pkgs = import inputs.nixpkgs-unstable pkgs-args;
-      system = "${system}";
+    unstable-overlay = final: prev: {
-      overlays = [inputs.emacs-overlay.overlay];
+      unstable = unstable-pkgs.pkgs;
+    };
+    overlays = [
+      inputs.emacs-overlay.overlay
+      unstable-overlay
+    ];
+    pkgs-args = {
+      system = system;
+      overlays = overlays;
       config = {
         allowUnfree = true;
       };
     };
+    pkgs = import nixpkgs pkgs-args;
   in {
     formatter = {
       ${system} = pkgs.alejandra;
@@ -83,6 +95,7 @@
           inputs.nur.hmModules.nur
           {
             _module.args.inputs = inputs;
+            _module.args.system = system;
           }
         ];
       };
@@ -103,8 +116,10 @@
           {
             _module.args.inputs = inputs;
             _module.args.system = system;
-            nixpkgs.pkgs = pkgs;
             nix.registry.nixpkgs.flake = inputs.nixpkgs;
+
+            nixpkgs.pkgs = pkgs;
+
             home-manager.useUserPackages = true;
             home-manager.useGlobalPkgs = true;
             home-manager.sharedModules = [
@@ -114,7 +129,7 @@
             ];
 
             hardware.tuxedo-control-center.enable = true;
-            hardware.tuxedo-control-center.package = inputs.tuxedo-nixos.packages.x86_64-linux.default;
+            hardware.tuxedo-control-center.package = inputs.tuxedo-nixos.packages.${system}.default;
           }
         ];
       };

home-mods/dev/default.nix

@@ -63,6 +63,7 @@ in {
       commit.gpgsign = true;
       gpg.format = "ssh";
     };
+    package = pkgs.unstable.git;
   };
 
   programs.nix-index = {
@@ -72,6 +73,7 @@ in {
 
   programs.ssh = {
     enable = true;
+    package = pkgs.unstable.openssh;
 
     matchBlocks = {
       "he3" = {
@@ -97,6 +99,8 @@ in {
 
   programs.gpg = {
     enable = true;
+
+    package = pkgs.unstable.gnupg;
   };
 
   services.gpg-agent = {
@@ -111,7 +115,7 @@ in {
   services.emacs = {
     enable = true;
     defaultEditor = true;
-    package = pkgs.emacs-unstable-pgtk;
+    package = pkgs.unstable.emacs-unstable-pgtk;
   };
 
   home = {
@@ -128,7 +132,7 @@ in {
       TERMINAL = "alacritty";
     };
 
-    packages = with pkgs; [
+    packages = with pkgs.unstable; [
       any-nix-shell
       atool
       aspell
@@ -138,23 +142,28 @@ in {
       aspellDicts.de
       binutils
       cmake
+      curl
       direnv
       emacs-unstable-pgtk
       fd
       gnutls
       gnumake
       gcc
-      git
       imagemagick
       libtool
       pandoc
+      python311Full
+      rcm
       (lib.mkIf (config.services.gpg-agent.enable)
-        pinentry_emacs)
+        pinentry-emacs)
       (ripgrep.override {withPCRE2 = true;})
       rnix-lsp
       shellcheck
       shfmt
       texlive.combined.scheme-full
+      tokei
+      wget
+      wl-clipboard
       zstd
     ];
   };

home-mods/firefox/default.nix

@@ -6,6 +6,7 @@
 }: {
   programs.firefox = {
     enable = true;
+    package = pkgs.unstable.firefox;
 
     profiles = {
       default = {

home.nix

@@ -2,6 +2,7 @@
   pkgs,
   config,
   inputs,
+  system,
   ...
 }: let
   wallpaper = inputs.nix-wallpaper.packages.${pkgs.system}.default.override {
@@ -21,13 +22,12 @@ in {
   home.username = "tristand";
   home.homeDirectory = "/home/tristand";
 
-  home.packages = with pkgs; [
+  home.packages = with pkgs.unstable; [
-    alejandra
     bitwarden
     brave
     btop
     cavalier
-    direnv
+    freetube
     imagemagick
     inkscape
     jellyfin-media-player
@@ -35,17 +35,11 @@ in {
     neofetch
     nextcloud-client
     onlyoffice-bin
-    rcm
-    rustup
     rust-motd
-    python311Full
-    zstd
     rustdesk
     tutanota-desktop
     signal-desktop
     statix
-    tailscale
-    tokei
     thunderbird
     zellij
   ];

users.nix

@@ -2,6 +2,7 @@
   pkgs,
   config,
   inputs,
+  system,
   ...
 }: {
   users.users.tristand = {
@@ -17,5 +18,6 @@
     inherit pkgs;
     inherit config;
     inherit inputs;
+    inherit system;
   };
 }