diff --git a/flake.lock b/flake.lock
index be25a7a8..e7386ef6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -82,16 +82,18 @@
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1732922729,
-        "narHash": "sha256-vp02vUhYVA2yECXTPXifUgb3YtEPYaerpD6lts99010=",
-        "rev": "e581215cbee1ccf67a08f478d3c49808bc93a523",
-        "revCount": 1531,
-        "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/chaotic-cx/nyx/0.1.1531%2Brev-e581215cbee1ccf67a08f478d3c49808bc93a523/01937a42-9657-7647-a534-f2c7fb2bf814/source.tar.gz?rev=e581215cbee1ccf67a08f478d3c49808bc93a523&revCount=1531"
+        "lastModified": 1733967201,
+        "narHash": "sha256-gfA/6BUhFmrfTMaTNToHm5Lm9c/snG7ED4W/x4vCGJs=",
+        "owner": "chaotic-cx",
+        "repo": "nyx",
+        "rev": "1559608a73a9211c7f78e7a0a8c13caca9f31006",
+        "type": "github"
       },
       "original": {
-        "type": "tarball",
-        "url": "https://flakehub.com/f/chaotic-cx/nyx/%2A.tar.gz"
+        "owner": "chaotic-cx",
+        "ref": "nyxpkgs-unstable",
+        "repo": "nyx",
+        "type": "github"
       }
     },
     "crane": {
@@ -843,35 +845,6 @@
         "type": "github"
       }
     },
-    "hyprsysteminfo": {
-      "inputs": {
-        "hyprutils": [
-          "hyprland",
-          "hyprutils"
-        ],
-        "nixpkgs": [
-          "hyprland",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1729184813,
-        "narHash": "sha256-ARrsIQPFCHWjVl9Sxh8tedIoEsvnV4nORaDmYCyK+kk=",
-        "owner": "hyprwm",
-        "repo": "hyprsysteminfo",
-        "rev": "8b271e2ba39a5a9299e4e7bb60245a71704f5a89",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprsysteminfo",
-        "type": "github"
-      }
-    },
     "hyprutils": {
       "inputs": {
         "nixpkgs": [
@@ -3441,7 +3414,6 @@
         "hyprland-contrib": "hyprland-contrib",
         "hyprlock": "hyprlock",
         "hyprpaper": "hyprpaper",
-        "hyprsysteminfo": "hyprsysteminfo",
         "lanzaboote": "lanzaboote",
         "microfetch": "microfetch",
         "nix-gaming": "nix-gaming",
diff --git a/flake.nix b/flake.nix
index 40edc3c8..3dba383d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -72,17 +72,8 @@
       };
     };
 
-    hyprsysteminfo = {
-      url = "github:hyprwm/hyprsysteminfo";
-      inputs = {
-        hyprutils.follows = "hyprland/hyprutils";
-        nixpkgs.follows = "hyprland/nixpkgs";
-        systems.follows = "hyprland/systems";
-      };
-    };
-
     # Chaotic
-    chaotic.url = "https://flakehub.com/f/chaotic-cx/nyx/*.tar.gz";
+    chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable";
 
     # Miscellaneous
     helix-flake.url = "github:helix-editor/helix";
diff --git a/modules/home/programs/nvf/default.nix b/modules/home/programs/nvf/default.nix
index d5f57ef5..28900e2f 100644
--- a/modules/home/programs/nvf/default.nix
+++ b/modules/home/programs/nvf/default.nix
@@ -32,7 +32,7 @@ in {
             logFile = "/tmp/nvim.log";
           };
           lsp = {
-            formatOnSave = false;
+            formatOnSave = true;
             lspkind.enable = false;
             lightbulb.enable = false;
             lspsaga.enable = false;
@@ -116,7 +116,9 @@ in {
           statusline = {
             lualine = {
               enable = true;
-              theme = "gruvbox";
+              setupOpts = {
+                options.theme = "gruvbox-material";
+              };
             };
           };
 
@@ -126,11 +128,13 @@ in {
           # vim.g.nvim_ghost_python_executable = 'python'
           # '';
 
-          theme = {
-            enable = true;
-            name = "gruvbox";
-            style = "dark";
-            transparent = false;
+          theme.enable = false;
+
+          extraPlugins = with pkgs.vimPlugins; {
+            gruvbox-material = {
+              package = gruvbox-material;
+              setup = "vim.cmd.colorscheme 'gruvbox-material'";
+            };
           };
 
           autopairs.nvim-autopairs.enable = true;
@@ -218,7 +222,7 @@ in {
 
           ui = {
             borders.enable = true;
-            noice.enable = true;
+            noice.enable = false;
             colorizer.enable = true;
             modes-nvim.enable = false; # the theme looks terrible with catppuccin
             illuminate.enable = true;
diff --git a/modules/home/services/polkit/default.nix b/modules/home/services/polkit/default.nix
index 58b23b37..9d5b37f9 100644
--- a/modules/home/services/polkit/default.nix
+++ b/modules/home/services/polkit/default.nix
@@ -16,8 +16,8 @@ in {
 
       Install = {
         WantedBy = ["graphical-session.target"];
-        Wants = ["graphical-session.target"];
-        After = ["graphical-session.target"];
+        # Wants = ["graphical-session.target"];
+        # After = ["graphical-session.target"];
       };
 
       Service = {