diff --git a/flake.lock b/flake.lock
index 7153715..38db2b0 100644
--- a/flake.lock
+++ b/flake.lock
@@ -3,7 +3,7 @@
     "darwin": {
       "inputs": {
         "nixpkgs": [
-          "nixpkgs-unstable"
+          "nixpkgs"
         ]
       },
       "locked": {
@@ -113,11 +113,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1682419509,
-        "narHash": "sha256-+/HI3RbJcEKQ5+55dECzh8geginsbabsA0R3ORKi2Us=",
+        "lastModified": 1682535786,
+        "narHash": "sha256-NH2a8yB8V25cglvcHDrvaTLvohzMgGLLZ4vnXQn4vOw=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "6142193635ecdafb9a231bd7d1880b9b7b210d19",
+        "rev": "d82c9af8175878a461a0fdf914e67cc446664570",
         "type": "github"
       },
       "original": {
@@ -212,7 +212,7 @@
         "type": "github"
       }
     },
-    "nixpkgs-unstable": {
+    "nixpkgs_2": {
       "locked": {
         "lastModified": 1682109806,
         "narHash": "sha256-d9g7RKNShMLboTWwukM+RObDWWpHKaqTYXB48clBWXI=",
@@ -228,22 +228,6 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1682303062,
-        "narHash": "sha256-x+KAADp27lbxeoPXLUMxKcRsUUHDlg+qVjt5PjgBw9A=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "f5364316e314436f6b9c8fd50592b18920ab18f9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-22.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs_3": {
       "locked": {
         "lastModified": 1681303793,
@@ -294,11 +278,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1682469450,
-        "narHash": "sha256-3p5eZJyLomaFjz718SWV9anj0uezvotHZArU9wuE1so=",
+        "lastModified": 1682576338,
+        "narHash": "sha256-+I4oXCpugPSaZ7SKI35OLSF/hy+rlZ/iNOGvcjqM2h4=",
         "owner": "nix-community",
         "repo": "nur",
-        "rev": "f21610e763905caad115f26d6c4e1e09ca6a5158",
+        "rev": "342c8e2c9e72b2c3f6bd18f491e5b8bf7d5fcd9a",
         "type": "github"
       },
       "original": {
@@ -337,7 +321,6 @@
         "nekowinston-nur": "nekowinston-nur",
         "nix-index-database": "nix-index-database",
         "nixpkgs": "nixpkgs_2",
-        "nixpkgs-unstable": "nixpkgs-unstable",
         "nur": "nur",
         "pre-commit-hooks": "pre-commit-hooks",
         "sops": "sops",
@@ -350,11 +333,11 @@
         "nixpkgs-stable": "nixpkgs-stable_2"
       },
       "locked": {
-        "lastModified": 1682338428,
-        "narHash": "sha256-T7AL/Us6ecxowjMAlO77GETTQO2SO+1XX2+Y/OSfHk8=",
+        "lastModified": 1682539132,
+        "narHash": "sha256-djX/Vp1snR1XHyk400HKCfwWVoLBE8uiQalTXMH7Kj0=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "7c8e9727a2ecf9994d4a63d577ad5327e933b6a4",
+        "rev": "4a330ead6a990365c9bb48f30523ac048fb6d8ae",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 142cf33..4cc48d5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,12 +2,10 @@
   description = "nekowinston's hm flake";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-22.11";
-    nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
-
+    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
     darwin = {
       url = "github:lnl7/nix-darwin";
-      inputs.nixpkgs.follows = "nixpkgs-unstable";
+      inputs.nixpkgs.follows = "nixpkgs";
     };
     home-manager = {
       url = "github:nix-community/home-manager";
@@ -34,7 +32,6 @@
     nekowinston-nur,
     nix-index-database,
     nixpkgs,
-    nixpkgs-unstable,
     nur,
     pre-commit-hooks,
     sops,
@@ -42,16 +39,12 @@
     ...
   }: let
     overlays = final: prev: {
-      unstable = import nixpkgs-unstable {
-        system = prev.system;
-        config.allowUnfree = true;
-      };
       nur = import nur {
         nurpkgs = prev;
         pkgs = prev;
         repoOverrides = {
           nekowinston = import nekowinston-nur {
-            pkgs = import nixpkgs-unstable {system = prev.system;};
+            pkgs = import nixpkgs {system = prev.system;};
           };
         };
       };
@@ -129,7 +122,7 @@
       };
       homeConfigurations.winston = let
         system = "aarch64-linux";
-        pkgs = import nixpkgs-unstable {
+        pkgs = import nixpkgs {
           inherit system;
           config.allowUnfree = true;
         };
diff --git a/home/apps/gpg.nix b/home/apps/gpg.nix
index 35c8d22..568ad4a 100644
--- a/home/apps/gpg.nix
+++ b/home/apps/gpg.nix
@@ -9,7 +9,7 @@
   mailvelopeConfig = builtins.toJSON {
     name = "gpgmejson";
     description = "JavaScript binding for GnuPG";
-    path = pkgs.unstable.gpgme.dev + /bin/gpgme-json;
+    path = pkgs.gpgme.dev + /bin/gpgme-json;
     type = "stdio";
     allowed_extensions = ["jid1-AQqSMBYb0a8ADg@jetpack"];
   };
@@ -18,9 +18,9 @@ in {
     gnupg-pkcs11-scd
     pcsclite
     pinentry
-    unstable.git-credential-gopass
-    unstable.gopass
-    unstable.gopass-jsonapi
+    git-credential-gopass
+    gopass
+    gopass-jsonapi
     yubikey-personalization
   ];
 
diff --git a/home/apps/i3.nix b/home/apps/i3.nix
index 673fdae..86623a8 100644
--- a/home/apps/i3.nix
+++ b/home/apps/i3.nix
@@ -41,7 +41,7 @@
       modFocus = "${mod}+Ctrl";
       hyper = "Mod4+Mod1+Shift+Ctrl";
 
-      gopass = lib.getExe pkgs.unstable.gopass;
+      gopass = lib.getExe pkgs.gopass;
       rofi = lib.getExe config.programs.rofi.package;
       thunar = lib.getExe pkgs.xfce.thunar;
       xargs = "${lib.getExe pkgs.findutils}/bin/xargs";
@@ -442,7 +442,7 @@ in {
     scriptPath = "${config.xdg.cacheHome}/X11/xsession";
     windowManager.i3 = {
       enable = true;
-      package = pkgs.unstable.i3;
+      package = pkgs.i3;
       config =
         commonConfig {wayland = false;}
         // {
diff --git a/home/apps/kubernetes.nix b/home/apps/kubernetes.nix
index 8582a0f..d9752d9 100644
--- a/home/apps/kubernetes.nix
+++ b/home/apps/kubernetes.nix
@@ -3,7 +3,7 @@
   pkgs,
   ...
 }: {
-  home.packages = with pkgs.unstable; [
+  home.packages = with pkgs; [
     cmctl
     dyff
     gojq
diff --git a/home/apps/music.nix b/home/apps/music.nix
index ac35cf1..e077181 100644
--- a/home/apps/music.nix
+++ b/home/apps/music.nix
@@ -66,7 +66,7 @@ in {
         }
       '');
     in {
-      ProgramArguments = ["${pkgs.unstable.mpd}/bin/mpd" "--no-daemon" "${mpdConf}"];
+      ProgramArguments = ["${pkgs.mpd}/bin/mpd" "--no-daemon" "${mpdConf}"];
       KeepAlive = true;
       RunAtLoad = true;
       StandardErrorPath = "${config.xdg.cacheHome}/mpd.log";
@@ -74,7 +74,7 @@ in {
     };
   };
 
-  #home.packages = lib.mkIf isLinux [pkgs.unstable.cider];
+  #home.packages = lib.mkIf isLinux [pkgs.cider];
 
   launchd.agents.discord-applemusic-rich-presence = {
     enable = true;
diff --git a/home/apps/neovim.nix b/home/apps/neovim.nix
index f729e0c..7f3dedc 100644
--- a/home/apps/neovim.nix
+++ b/home/apps/neovim.nix
@@ -14,7 +14,7 @@
 
     withNodeJs = true;
 
-    extraPackages = with pkgs.unstable; [
+    extraPackages = with pkgs; [
       # external deps
       fd
       ripgrep
diff --git a/home/apps/rice.nix b/home/apps/rice.nix
index 1a13fc6..2295a38 100644
--- a/home/apps/rice.nix
+++ b/home/apps/rice.nix
@@ -18,7 +18,7 @@ in {
     };
     theme = {
       name = "Catppuccin-Mocha-Standard-Pink-Dark";
-      package = pkgs.unstable.catppuccin-gtk.override {
+      package = pkgs.catppuccin-gtk.override {
         accents = ["pink"];
         variant = "mocha";
       };
diff --git a/home/apps/vscode.nix b/home/apps/vscode.nix
index b72fb99..b3366b5 100644
--- a/home/apps/vscode.nix
+++ b/home/apps/vscode.nix
@@ -9,8 +9,8 @@
 in {
   programs.vscode = {
     enable = true;
-    package = pkgs.unstable.vscode;
-    extensions = with pkgs.unstable.vscode-extensions; [
+    package = pkgs.vscode;
+    extensions = with pkgs.vscode-extensions; [
       jnoortheen.nix-ide
       matklad.rust-analyzer
       mkhl.direnv
diff --git a/home/apps/wayland.nix b/home/apps/wayland.nix
index 343f157..aaa7286 100644
--- a/home/apps/wayland.nix
+++ b/home/apps/wayland.nix
@@ -14,7 +14,7 @@ in {
 
   programs.waybar = lib.mkIf isLinux {
     enable = true;
-    package = pkgs.unstable.waybar;
+    package = pkgs.waybar;
     settings = [
       {
         layer = "top";
diff --git a/home/apps/zsh.nix b/home/apps/zsh.nix
index 21af137..e046b7f 100644
--- a/home/apps/zsh.nix
+++ b/home/apps/zsh.nix
@@ -38,7 +38,7 @@ in {
 
     starship = {
       enable = true;
-      package = pkgs.unstable.starship;
+      package = pkgs.starship;
     };
 
     tealdeer = {
diff --git a/home/default.nix b/home/default.nix
index c3d615b..bd843d3 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -50,29 +50,29 @@ in {
         mosh
 
         nur.repos.nekowinston.org-stats
-        (unstable.nerdfonts.override {fonts = ["NerdFontsSymbolsOnly"];})
+        (nerdfonts.override {fonts = ["NerdFontsSymbolsOnly"];})
         victor-mono
         ibm-plex
         xkcd-font
         wezterm
 
-        unstable.podman
-        unstable.podman-compose
-        unstable.qemu
+        podman
+        podman-compose
+        qemu
       ]
       ++ lib.optionals isLinux [
         _1password-gui
         #insomnia
         #mattermost-desktop
         neovide
-        #unstable.jetbrains.webstorm
+        #jetbrains.webstorm
         #gnome.gnome-boxes
       ]
       ++ lib.optionals (isLinux && machine.personal) [
         nur.repos.nekowinston.discover-overlay
-        (unstable.discord.override {withOpenASAR = true;})
-        unstable.lutris
-        unstable.heroic
+        (discord.override {withOpenASAR = true;})
+        lutris
+        heroic
       ]);
 
     sessionVariables = lib.mkIf isDarwin {
@@ -89,7 +89,7 @@ in {
     taskwarrior.enable = true;
     mangohud = {
       enable = isLinux && machine.personal;
-      package = pkgs.unstable.mangohud;
+      package = pkgs.mangohud;
     };
     zathura.enable = true;
   };
diff --git a/machines/bento/hardware.nix b/machines/bento/hardware.nix
index 34c14e3..c47f075 100644
--- a/machines/bento/hardware.nix
+++ b/machines/bento/hardware.nix
@@ -64,6 +64,4 @@
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-  # high-resolution display
-  hardware.video.hidpi.enable = lib.mkDefault true;
 }
diff --git a/machines/common/linux/default.nix b/machines/common/linux/default.nix
index 5af771d..c8a9416 100644
--- a/machines/common/linux/default.nix
+++ b/machines/common/linux/default.nix
@@ -35,4 +35,6 @@
     "94e2d5"
     "94e2d5"
   ];
+
+  programs.zsh.enable = true;
 }
diff --git a/machines/common/linux/xsession.nix b/machines/common/linux/xsession.nix
index f985b71..37186c2 100644
--- a/machines/common/linux/xsession.nix
+++ b/machines/common/linux/xsession.nix
@@ -50,7 +50,7 @@
 
     kanata = {
       enable = true;
-      package = pkgs.unstable.kanata;
+      package = pkgs.kanata;
       keyboards.keychron-k6 = {
         devices = ["/dev/input/by-id/usb-Keychron_Keychron_K6-event-kbd"];
         config = ''
@@ -81,7 +81,7 @@
       libinput.enable = true;
       windowManager.i3 = {
         enable = true;
-        package = pkgs.unstable.i3;
+        package = pkgs.i3;
       };
       xkbOptions = "caps:ctrl_modifier";
     };
diff --git a/machines/futomaki/default.nix b/machines/futomaki/default.nix
index cbd06ed..9eb42dc 100644
--- a/machines/futomaki/default.nix
+++ b/machines/futomaki/default.nix
@@ -49,7 +49,7 @@ in {
   programs = {
     steam = {
       enable = true;
-      package = pkgs.unstable.steam.override {
+      package = pkgs.steam.override {
         extraPkgs = pkgs: with pkgs; [gamemode mangohud];
         extraLibraries = pkgs:
           with config.hardware.opengl;
diff --git a/machines/futomaki/hardware.nix b/machines/futomaki/hardware.nix
index bdf5578..3fa4ae0 100644
--- a/machines/futomaki/hardware.nix
+++ b/machines/futomaki/hardware.nix
@@ -61,8 +61,6 @@
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-  # high-resolution display
-  hardware.video.hidpi.enable = lib.mkDefault true;
   hardware.opengl = {
     enable = true;
     extraPackages = with pkgs; [