refactor: fully rebase to nixpkgs-unstable rather than fixed release with backports

hosts/franks-macbook-pro/configuration.nix

@@ -1,11 +1,7 @@
 {
   pkgs,
-  inputs,
   ...
 }:
-let
-  unstable = inputs.nixpkgs-unstable.legacyPackages.${pkgs.stdenv.hostPlatform.system};
-in
 {
   imports = [
     ../shared/darwin.nix
@@ -15,8 +11,7 @@ in
     systemPackages = with pkgs; [
       bash-language-server
       nil
-
-      unstable.devenv
+      devenv
     ];
 
     shellAliases = {
@@ -25,7 +20,6 @@ in
   };
 
   homebrew.casks = [
-    "zed"
     "firefox"
   ];
 

hosts/nero/configuration.nix

@@ -3,16 +3,6 @@
   inputs,
   ...
 }:
-let
-  unstable = import inputs.nixpkgs-unstable {
-    system = pkgs.stdenv.hostPlatform.system;
-    config.allowUnfree = true;
-  };
-
-  wivrn-overlay = _final: _prev: {
-    inherit (unstable) wivrn;
-  };
-in
 {
   imports = [
     ../shared/nixos-pc.nix
@@ -21,7 +11,6 @@ in
   ];
 
   nixpkgs.overlays = [
-    wivrn-overlay
     inputs.millennium.overlays.default
     inputs.cheatengine.overlays.default
   ];
@@ -133,14 +122,13 @@ in
       cheatengine
       lsfg-vk
       lsfg-vk-ui
-
-      unstable.qbittorrent
-      unstable.aseprite
+      qbittorrent
+      aseprite
 
       inputs.scopebuddy.packages.${pkgs.stdenv.hostPlatform.system}.default
       inputs.xivlauncher-rb.packages.${pkgs.stdenv.hostPlatform.system}.default
 
-      (callPackage ../../packages/aseprite-thumbnailer-kde/package.nix { inherit unstable; })
+      (callPackage ../../packages/aseprite-thumbnailer-kde/package.nix { })
       (callPackage ../../packages/undertale-mod-tool/package.nix { })
     ];
   };

hosts/pdw-frankiel/configuration.nix

@@ -1,11 +1,6 @@
 {
-  pkgs,
-  inputs,
   ...
 }:
-let
-  unstable = inputs.nixpkgs-unstable.legacyPackages.${pkgs.stdenv.hostPlatform.system};
-in
 {
   imports = [
     ../shared/nixos-pc.nix
@@ -36,7 +31,7 @@ in
 
           settings = {
             main = {
-              capslock = "oneshot(control)";
+              capslock = "leftcontrol";
               insert = "S-insert";
             };
           };

hosts/shared/darwin.nix

@@ -77,6 +77,7 @@
       btop
       nerd-fonts.hack
       jump
+      ripgrep
     ];
   };
 

hosts/shared/nixos-pc.nix

@@ -5,9 +5,6 @@
   inputs,
   ...
 }:
-let
-  unstable = inputs.nixpkgs-unstable.legacyPackages.${pkgs.stdenv.hostPlatform.system};
-in
 {
   boot = {
     loader = {
@@ -359,8 +356,8 @@ in
           doCheck = false;
         });
       })
+
       inputs.affinity-nix.overlays.default
-      inputs.nix-cachyos-kernel.overlays.default
     ];
   };
 
@@ -410,13 +407,13 @@ in
       hunspellDicts.en_US
       hyphenDicts.en_US
       affinity-v3
-
-      unstable.libreoffice-qt
-      unstable.qimgv
-      unstable.fastfetch
-      unstable.vorta
-      unstable.distrobox
-      unstable.devenv
+      libreoffice-qt
+      qimgv
+      fastfetch
+      vorta
+      distrobox
+      devenv
+      ripgrep
 
       inputs.appimage-manager.packages.${pkgs.stdenv.hostPlatform.system}.default
       inputs.gloomberb.packages.${pkgs.stdenv.hostPlatform.system}.default
@@ -430,7 +427,7 @@ in
       ))
 
       (callPackage ../../packages/virtiofsd-looking-glass/package.nix { })
-      (callPackage ../../packages/heidisql/package.nix { pkgs = unstable; })
+      (callPackage ../../packages/heidisql/package.nix { })
       (callPackage ../../packages/looking-glass-client/package.nix { })
     ];
 

hosts/shared/nixos-server.nix

@@ -1,13 +1,8 @@
 {
-  config,
   pkgs,
-  lib,
   inputs,
   ...
 }:
-let
-  unstable = inputs.nixpkgs-unstable.legacyPackages.${pkgs.stdenv.hostPlatform.system};
-in
 {
   boot.loader = {
     systemd-boot.enable = true;
@@ -186,8 +181,8 @@ in
       openjdk17
       openjdk25
       tmux
-
-      unstable.fastfetch
+      fastfetch
+      ripgrep
 
       (python3.withPackages (
         python-pkgs: with python-pkgs; [

hosts/vergil/configuration.nix

@@ -1,11 +1,7 @@
 {
   pkgs,
-  inputs,
   ...
 }:
-let
-  unstable = inputs.nixpkgs-unstable.legacyPackages.${pkgs.stdenv.hostPlatform.system};
-in
 {
   imports = [
     ../shared/nixos-server.nix