diff --git a/flake.lock b/flake.lock
index 478e8efc..36e934e4 100644
--- a/flake.lock
+++ b/flake.lock
@@ -166,27 +166,27 @@
         ]
       },
       "locked": {
-        "lastModified": 1712386041,
-        "narHash": "sha256-dA82pOMQNnCJMAsPG7AXG35VmCSMZsJHTFlTHizpKWQ=",
+        "lastModified": 1713391096,
+        "narHash": "sha256-5xkzsy+ILgQlmvDDipL5xqAehnjWBenAQXV4/NLg2dE=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d6bb9f934f2870e5cbc5b94c79e9db22246141ff",
+        "rev": "f46814ec7cbef9c2aef18ca1cbe89f2bb1e8c394",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-23.11",
+        "ref": "master",
         "repo": "home-manager",
         "type": "github"
       }
     },
     "master": {
       "locked": {
-        "lastModified": 1713124637,
-        "narHash": "sha256-RU0SoHGn2aYXYcnjCBg4/1S+zMZx9tA1dPUE+P2IH9g=",
+        "lastModified": 1713276496,
+        "narHash": "sha256-qhImB8hRIRh2eMLqBSlUPKb870s4N8WJNqGfJfhSfMg=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "ec2cb66cbeac92550b324009773b83401a9e2477",
+        "rev": "e2ce6703871b62a77f5939d5967833b43c928ed0",
         "type": "github"
       },
       "original": {
@@ -265,16 +265,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1713013257,
-        "narHash": "sha256-ZEfGB3YCBVggvk0BQIqVY7J8XF/9jxQ68fCca6nib+8=",
+        "lastModified": 1713248628,
+        "narHash": "sha256-NLznXB5AOnniUtZsyy/aPWOk8ussTuePp2acb9U+ISA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "90055d5e616bd943795d38808c94dbf0dd35abe8",
+        "rev": "5672bc9dbf9d88246ddab5ac454e82318d094bb8",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-23.11",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -329,7 +329,6 @@
         "nixpkgs": "nixpkgs",
         "triton-vmtools": "triton-vmtools",
         "tritonshell": "tritonshell",
-        "unstable": "unstable",
         "wayland-pipewire-idle-inhibit": "wayland-pipewire-idle-inhibit"
       }
     },
@@ -400,7 +399,7 @@
       "inputs": {
         "flake-utils": "flake-utils",
         "nixpkgs": [
-          "unstable"
+          "nixpkgs"
         ]
       },
       "locked": {
@@ -425,7 +424,7 @@
         "devshell": "devshell",
         "flake-utils": "flake-utils_2",
         "nixpkgs": [
-          "unstable"
+          "nixpkgs"
         ]
       },
       "locked": {
@@ -443,22 +442,6 @@
         "url": "https://git.pub.solar/teutat3s/tritonshell"
       }
     },
-    "unstable": {
-      "locked": {
-        "lastModified": 1712963716,
-        "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "utils": {
       "inputs": {
         "systems": "systems_2"
diff --git a/flake.nix b/flake.nix
index 1a74d64c..38c9c5b7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,8 +6,8 @@
   inputs = {
     # Track channels with commits tested and built by hydra
     nixos-22-05.url = "github:nixos/nixpkgs/nixos-22.05";
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
-    unstable.url = "github:nixos/nixpkgs/nixos-unstable";
+    #nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     master.url = "github:nixos/nixpkgs/master";
 
     fork.url = "github:teutat3s/nixpkgs/fix-element-desktop-screen-sharing-23.11";
@@ -18,7 +18,7 @@
     nix-darwin.url = "github:lnl7/nix-darwin/master";
     nix-darwin.inputs.nixpkgs.follows = "nixpkgs";
 
-    home-manager.url = "github:nix-community/home-manager/release-23.11";
+    home-manager.url = "github:nix-community/home-manager/master";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
 
     flake-parts.url = "github:hercules-ci/flake-parts";
@@ -37,10 +37,10 @@
 
     # PubSolarOS additions
     triton-vmtools.url = "git+https://git.pub.solar/pub-solar/infra-vintage?ref=main&dir=vmtools";
-    triton-vmtools.inputs.nixpkgs.follows = "unstable";
+    triton-vmtools.inputs.nixpkgs.follows = "nixpkgs";
 
     tritonshell.url = "git+https://git.pub.solar/teutat3s/tritonshell?ref=main";
-    tritonshell.inputs.nixpkgs.follows = "unstable";
+    tritonshell.inputs.nixpkgs.follows = "nixpkgs";
 
     wayland-pipewire-idle-inhibit.url = "github:rafaelrc7/wayland-pipewire-idle-inhibit";
     wayland-pipewire-idle-inhibit.inputs.nixpkgs.follows = "nixpkgs";
diff --git a/overlays/default.nix b/overlays/default.nix
index 20b946fa..b555ed44 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -26,14 +26,7 @@
             };
           in
           {
-            direnv = unstable.direnv;
             element-desktop = fork.element-desktop;
-            nixVersions = prev.nixVersions // {inherit (unstable.nixVersions) nix_2_20;};
-            nix-direnv = unstable.nix-direnv;
-            _1password = unstable._1password;
-            _1password-cli = unstable._1password-cli;
-            wayland-pipewire-idle-inhibit = unstable.wayland-pipewire-idle-inhibit;
-            wlvncc = unstable.wlvncc;
             #vimPlugins = prev.vimPlugins // {inherit (unstable.vimPlugins) nvim-lspconfig;};
           })
           (import ../pkgs)