flake: switch to nixpkgs unstable by default

flake.lock

@@ -445,7 +445,7 @@
       "inputs": {
         "hyprland-protocols": "hyprland-protocols",
         "nixpkgs": [
-          "nixpkgs-unstable"
+          "nixpkgs"
         ],
         "wlroots": "wlroots",
         "xdph": "xdph"
@@ -614,21 +614,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-unstable": {
-      "locked": {
-        "lastModified": 1685655444,
-        "narHash": "sha256-6EujQNAeaUkWvpEZZcVF8qSfQrNVWFNNGbUJxv/A5a8=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "e635192892f5abbc2289eaac3a73cdb249abaefd",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "ref": "nixos-unstable",
-        "type": "indirect"
-      }
-    },
     "nixpkgs_2": {
       "locked": {
         "lastModified": 1673796341,
@@ -647,16 +632,16 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1685620773,
+        "lastModified": 1686501370,
-        "narHash": "sha256-iQ+LmporQNdLz8uMJdP62TaAWeLUwl43/MYUBtWqulM=",
+        "narHash": "sha256-G0WuM9fqTPRc2URKP9Lgi5nhZMqsfHGrdEbrLvAPJcg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "f0ba8235153dd2e25cf06cbf70d43efdd4443592",
+        "rev": "75a5ebf473cd60148ba9aec0d219f72e5cf52519",
         "type": "github"
       },
       "original": {
         "id": "nixpkgs",
-        "ref": "nixos-23.05",
+        "ref": "nixos-unstable",
         "type": "indirect"
       }
     },
@@ -740,7 +725,6 @@
         "nix-software-center": "nix-software-center",
         "nixos-conf-editor": "nixos-conf-editor",
         "nixpkgs": "nixpkgs_3",
-        "nixpkgs-unstable": "nixpkgs-unstable",
         "nur": "nur",
         "plymouth-themes": "plymouth-themes",
         "ranger-icons": "ranger-icons",

flake.nix

@@ -1,8 +1,7 @@
 {
   description = "My system config";
   inputs = {
-    nixpkgs.url = "nixpkgs/nixos-23.05";
+    nixpkgs.url = "nixpkgs/nixos-unstable";
-    nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
     home-manager.url = "github:nix-community/home-manager/release-23.05";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
     nur.url = "github:nix-community/NUR";
@@ -14,7 +13,7 @@
 
     hyprland = {
       url = "github:hyprwm/Hyprland";
-      inputs.nixpkgs.follows = "nixpkgs-unstable";
+      inputs.nixpkgs.follows = "nixpkgs";
     };
 
     alacritty-sixel.url = "github:ayosec/alacritty";
@@ -72,7 +71,7 @@
     nixos-conf-editor.url = "github:vlinkz/nixos-conf-editor";
     nix-software-center.url = "github:vlinkz/nix-software-center";
   };
-  outputs = inputs@{ nixpkgs, nixpkgs-unstable, home-manager, nur, ... }:
+  outputs = inputs@{ nixpkgs, home-manager, nur, ... }:
     let
       inherit (import ./user/variables.nix) desktop;
       system = "x86_64-linux";

overlays/default.nix

@@ -3,7 +3,6 @@
     nur
     scripts
     sway
-    unstable
     sixel-patches
     themes
     new-packages
@@ -17,12 +16,6 @@
 
   sway = (import ./sway.nix);
 
-  unstable = (final: prev: {
-    unstable = import inputs.nixpkgs-unstable {
-      inherit (prev) system config;
-    };
-  });
-
   sixel-patches = (import ./sixel-patches.nix (inputs));
 
   themes = (final: prev: {
@@ -33,13 +26,10 @@
         install -D material-wifi.ttf $out/share/fonts/${name}
       '';
     };
-    papirus_red = (final.unstable.papirus-icon-theme.override { color = "red"; });
+    papirus_red = (final.papirus-icon-theme.override { color = "red"; });
     orchis_theme_compact = (final.orchis-theme.override {
       border-radius = 0;
       tweaks = [ "compact" "solid" ];
-    }).overrideAttrs (old: {
-      patches = (old.patches or [ ]) ++
-        [ ../patches/orchis-fix-warnings.patch ];
     });
     nerdfonts_fira_hack = (final.nerdfonts.override { fonts = [ "FiraCode" "Hack" ]; });
   });
@@ -51,10 +41,10 @@
     maildir-notify-daemon = inputs.maildir-notify-daemon.packages.${prev.system}.default;
     wl-crosshair = inputs.wl-crosshair.packages.${prev.system}.default;
 
-    webcord = (prev.webcord or prev.unstable.webcord).overrideAttrs (old: {
+    webcord = (prev.webcord or prev.webcord).overrideAttrs (old: {
       patches = (old.patches or [ ]) ++ [ ../patches/webcord/fix-reading-config.patch ];
     });
-    mullvad = final.unstable.mullvad;
+    mullvad = final.mullvad;
   });
 
   patches = (final: prev: {

overlays/sixel-patches.nix

@@ -1,5 +1,5 @@
 inputs: (final: prev: {
-  alacritty = (prev.unstable.alacritty.overrideAttrs (old-alacritty: rec {
+  alacritty = (prev.alacritty.overrideAttrs (old-alacritty: rec {
     src = inputs.alacritty-sixel;
     cargoDeps = old-alacritty.cargoDeps.overrideAttrs (prev.lib.const {
       inherit src;

system/media-packages.nix

@@ -12,7 +12,7 @@ in {
       obs-studio
       imagemagick
       mpc-cli
-      pkgs.unstable.helvum
+      helvum
       gimp
       inkscape
       kdenlive

system/nix.nix

@@ -25,7 +25,6 @@
         "wegank.cachix.org-1:xHignps7GtkPP/gYK5LvA/6UFyz98+sgaxBSy7qK0Vs="
       ];
     };
-    package = pkgs.unstable.nixFlakes; # or versioned attributes like nixVersions.nix_2_8
     extraOptions = ''
       experimental-features = nix-command flakes
     '';

user/helix.nix

@@ -7,7 +7,6 @@ in
   config = {
     programs.helix = {
       enable = true;
-      package = pkgs.unstable.helix;
       settings = {
         theme = "my-theme";
         editor = {

user/home.nix

@@ -83,7 +83,7 @@
     # steam # It's enabled in the system config
     tlauncher
     gamescope
-    unstable.amdgpu_top
+    amdgpu_top
     glxinfo
     vulkan-tools