diff --git a/flake.lock b/flake.lock
index a211aea..288f5fb 100644
--- a/flake.lock
+++ b/flake.lock
@@ -83,22 +83,6 @@
         "type": "github"
       }
     },
-    "bufferline-nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1684703438,
-        "narHash": "sha256-WM8/dHqiEykuw0qEQtenM5Rcv/Jr3Jxj5vulC/IKfAE=",
-        "owner": "akinsho",
-        "repo": "bufferline.nvim",
-        "rev": "32d74d5d044f7cc89892d4781a83d55ee4ed552a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "akinsho",
-        "repo": "bufferline.nvim",
-        "type": "github"
-      }
-    },
     "cmp-async-path": {
       "flake": false,
       "locked": {
@@ -115,22 +99,6 @@
         "type": "github"
       }
     },
-    "comment-box-nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1678772374,
-        "narHash": "sha256-hD9eCcrDsispi+Nvwjy/MlNW0UmFfSbh8arQpCjeneM=",
-        "owner": "LudoPinelli",
-        "repo": "comment-box.nvim",
-        "rev": "6672213bd5d2625a666a297b66307967effa50bc",
-        "type": "github"
-      },
-      "original": {
-        "owner": "LudoPinelli",
-        "repo": "comment-box.nvim",
-        "type": "github"
-      }
-    },
     "copilot-lua": {
       "flake": false,
       "locked": {
@@ -263,6 +231,22 @@
         "type": "github"
       }
     },
+    "flake-compat_5": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1673956053,
+        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": [
@@ -411,22 +395,6 @@
         "type": "github"
       }
     },
-    "gitignore-nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1680653909,
-        "narHash": "sha256-H6IXZTskIAOmp3U57NIT4Of45xXqrX/6VRm1s28S89Y=",
-        "owner": "wintermute-cell",
-        "repo": "gitignore.nvim",
-        "rev": "b61e4a50b78f9a3702a4ed168ab6c9ceba5f6299",
-        "type": "github"
-      },
-      "original": {
-        "owner": "wintermute-cell",
-        "repo": "gitignore.nvim",
-        "type": "github"
-      }
-    },
     "gitignore_2": {
       "inputs": {
         "nixpkgs": [
@@ -627,6 +595,22 @@
         "type": "github"
       }
     },
+    "lowdown-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1633514407,
+        "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=",
+        "owner": "kristapsdz",
+        "repo": "lowdown",
+        "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "kristapsdz",
+        "repo": "lowdown",
+        "type": "github"
+      }
+    },
     "lspsaga-nvim": {
       "flake": false,
       "locked": {
@@ -751,6 +735,30 @@
         "type": "github"
       }
     },
+    "nix-super": {
+      "inputs": {
+        "flake-compat": "flake-compat_4",
+        "lowdown-src": "lowdown-src",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "nixpkgs-regression": "nixpkgs-regression"
+      },
+      "locked": {
+        "lastModified": 1683240066,
+        "narHash": "sha256-XXTB64SAMukIt2suhoPP87QDKX9vB2ByXXuE7l2Vyxw=",
+        "owner": "privatevoid-net",
+        "repo": "nix-super",
+        "rev": "aaba1f91e7eba8ce029fa6bfa81ad9e14a13708d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "privatevoid-net",
+        "repo": "nix-super",
+        "rev": "aaba1f91e7eba8ce029fa6bfa81ad9e14a13708d",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1658161305,
@@ -785,6 +793,22 @@
         "type": "github"
       }
     },
+    "nixpkgs-regression": {
+      "locked": {
+        "lastModified": 1643052045,
+        "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
+        "type": "github"
+      }
+    },
     "nixpkgs-stable": {
       "locked": {
         "lastModified": 1673800717,
@@ -931,7 +955,7 @@
     },
     "pre-commit-hooks": {
       "inputs": {
-        "flake-compat": "flake-compat_4",
+        "flake-compat": "flake-compat_5",
         "flake-utils": "flake-utils_4",
         "gitignore": "gitignore_2",
         "nixpkgs": "nixpkgs_7",
@@ -978,18 +1002,32 @@
         "type": "github"
       }
     },
+    "rofi-wayland": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1679493688,
+        "narHash": "sha256-8Hu9k84LNi+Gz8zJNE7AxYxmv8XXQz3cG7CFhv31fz4=",
+        "owner": "lbonn",
+        "repo": "rofi",
+        "rev": "d06095b5ed40e5d28236b7b7b575ca867696d847",
+        "type": "github"
+      },
+      "original": {
+        "owner": "lbonn",
+        "ref": "wayland",
+        "repo": "rofi",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "agenix": "agenix",
         "arkenfox-userjs": "arkenfox-userjs",
         "asus-touchpad-numpad-driver": "asus-touchpad-numpad-driver",
         "attic": "attic",
-        "bufferline-nvim": "bufferline-nvim",
         "cmp-async-path": "cmp-async-path",
-        "comment-box-nvim": "comment-box-nvim",
         "copilot-lua": "copilot-lua",
         "flake-utils": "flake-utils",
-        "gitignore-nvim": "gitignore-nvim",
         "home-manager": "home-manager_2",
         "hypr-contrib": "hypr-contrib",
         "hyprland": "hyprland",
@@ -998,9 +1036,11 @@
         "master": "master",
         "neovim-nightly-overlay": "neovim-nightly-overlay",
         "nil": "nil",
+        "nix-super": "nix-super",
         "nixpkgs": "nixpkgs_6",
         "nvim-treesitter-textsubjects": "nvim-treesitter-textsubjects",
         "pre-commit-hooks": "pre-commit-hooks",
+        "rofi-wayland": "rofi-wayland",
         "smartcolumn-nvim": "smartcolumn-nvim",
         "stable": "stable"
       }
diff --git a/flake.nix b/flake.nix
index a40219e..d6d2b93 100644
--- a/flake.nix
+++ b/flake.nix
@@ -31,6 +31,9 @@
 
     pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix";
 
+    nix-super.url = "github:privatevoid-net/nix-super/aaba1f91e7eba8ce029fa6bfa81ad9e14a13708d";
+    nix-super.inputs.nixpkgs.follows = "nixpkgs";
+
     # Neovim
     neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
 
diff --git a/modules/programs/nix.nix b/modules/programs/nix.nix
index dbbf277..309e2ed 100644
--- a/modules/programs/nix.nix
+++ b/modules/programs/nix.nix
@@ -2,6 +2,7 @@
 , lib
 , inputs
 , self
+, pkgs
 , ...
 }:
 
@@ -23,7 +24,7 @@ in
   };
 
   config.nix = {
-    extraOptions = "experimental-features = nix-command flakes";
+    package = pkgs.nix-super;
 
     gc = {
       automatic = cfg.gc.enable;
@@ -46,6 +47,7 @@ in
       nixpkgs.flake = inputs.nixpkgs;
       stable.flake = inputs.stable;
       dotfiles.flake = self;
+      default.flake = self;
     };
 
     settings = {
diff --git a/overlays/packages.nix b/overlays/packages.nix
index 01c938a..7412ab4 100644
--- a/overlays/packages.nix
+++ b/overlays/packages.nix
@@ -6,4 +6,5 @@ _: prev:
   attic = inputs.attic.packages.${prev.system}.default;
   hyprpaper = inputs.hyprpaper.packages.${prev.system}.default;
   nil = inputs.nil.packages.${prev.system}.default;
+  nix-super = inputs.nix-super.packages.${prev.system}.default;
 }