diff --git a/nix/home-manager/flake.lock b/nix/home-manager/flake.lock
index b74c584..016b8cd 100644
--- a/nix/home-manager/flake.lock
+++ b/nix/home-manager/flake.lock
@@ -144,24 +144,6 @@
         "type": "github"
       }
     },
-    "flake-utils_3": {
-      "inputs": {
-        "systems": "systems_3"
-      },
-      "locked": {
-        "lastModified": 1726560853,
-        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "freetype2": {
       "flake": false,
       "locked": {
@@ -357,8 +339,12 @@
     "nixneovimplugins": {
       "inputs": {
         "flake-compat": "flake-compat",
-        "flake-utils": "flake-utils_2",
-        "nixpkgs": "nixpkgs"
+        "flake-utils": [
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1731259323,
@@ -375,22 +361,6 @@
       }
     },
     "nixpkgs": {
-      "locked": {
-        "lastModified": 1730831018,
-        "narHash": "sha256-2S0HwIFRxYp+afuoFORcZA9TjryAf512GmE0MTfEOPU=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "8c4dc69b9732f6bbe826b5fbb32184987520ff26",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
       "locked": {
         "lastModified": 1731261838,
         "narHash": "sha256-J6t1AxapM1ukQtC+6EJoDJGp+RUlAI7mlLZhhrKZXeA=",
@@ -406,7 +376,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_3": {
+    "nixpkgs_2": {
       "locked": {
         "lastModified": 1729265718,
         "narHash": "sha256-4HQI+6LsO3kpWTYuVGIzhJs1cetFcwT7quWCk/6rqeo=",
@@ -439,11 +409,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1731155487,
-        "narHash": "sha256-+D57j7BcV5O3XH9za3c3XXVLHr+F+enThAN2EeF6H/M=",
+        "lastModified": 1731278238,
+        "narHash": "sha256-4TMb2HEJss0EABkB1O1IOEjxoxWtB0/ouRa/iFeHIjs=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "31364af1990067d5529846a2ebf17a42c5ab22ff",
+        "rev": "432af78ffd792257e601430f2f604c0d3e60cf8c",
         "type": "github"
       },
       "original": {
@@ -454,7 +424,7 @@
     },
     "nuschtosSearch": {
       "inputs": {
-        "flake-utils": "flake-utils_3",
+        "flake-utils": "flake-utils_2",
         "ixx": "ixx",
         "nixpkgs": [
           "nixvim",
@@ -482,7 +452,7 @@
         "home-manager": "home-manager",
         "nix-index-database": "nix-index-database",
         "nixneovimplugins": "nixneovimplugins",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs",
         "nixvim": "nixvim",
         "wezterm": "wezterm",
         "zjstatus": "zjstatus"
@@ -577,21 +547,6 @@
         "type": "github"
       }
     },
-    "systems_3": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "treefmt-nix": {
       "inputs": {
         "nixpkgs": [
@@ -621,7 +576,7 @@
         "freetype2": "freetype2",
         "harfbuzz": "harfbuzz",
         "libpng": "libpng",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_2",
         "rust-overlay": "rust-overlay",
         "zlib": "zlib"
       },
diff --git a/nix/home-manager/flake.nix b/nix/home-manager/flake.nix
index 17adedd..e363ca5 100644
--- a/nix/home-manager/flake.nix
+++ b/nix/home-manager/flake.nix
@@ -19,37 +19,19 @@
       url = "github:Mic92/nix-index-database";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    # nixneovim = {
-    #   url = "github:nixneovim/nixneovim/2ae81f2ed61ebf4ca4d4b36ea9e8eb5163380d44";
-    #   inputs = {
-    #     nixpkgs.follows = "nixpkgs";
-    #     home-manager.follows = "home-manager";
-    #     flake-utils.follows = "flake-utils";
-    #     nixneovimplugins.follows = "nixneovimplugins";
-    #   };
-    # };
-    # nixneovimplugins = {
-    #   url = "github:NixNeovim/NixNeovimPlugins";
-    #   inputs = {
-    #     nixpkgs.follows = "nixpkgs";
-    #     flake-utils.follows = "flake-utils";
-    #   };
-    # };
     nixvim = {
       url = "github:nix-community/nixvim";
       inputs = {
         nixpkgs.follows = "nixpkgs";
         home-manager.follows = "home-manager";
-        flake-utils.follows = "flake-utils";
       };
     };
     nixneovimplugins = {
       url = "github:m15a/flake-awesome-neovim-plugins";
-      # inputs = {
-      #     nixpkgs.follows = "nixpkgs";
-      #     home-manager.follows = "home-manager";
-      #     flake-utils.follows = "flake-utils";
-      # };
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        flake-utils.follows = "flake-utils";
+      };
     };
     zjstatus = {
       url = "github:dj95/zjstatus";
diff --git a/nix/home-manager/modules/packages/default.nix b/nix/home-manager/modules/packages/default.nix
index 774b64a..cfb6813 100644
--- a/nix/home-manager/modules/packages/default.nix
+++ b/nix/home-manager/modules/packages/default.nix
@@ -39,7 +39,7 @@ in {
       gnused
       gnutar
       gping
-      # gql
+      gql
       httpstat
       imagemagick
       inshellisense
diff --git a/nix/home-manager/modules/packages/neovim.nix b/nix/home-manager/modules/packages/neovim.nix
index 228bd10..4a39237 100644
--- a/nix/home-manager/modules/packages/neovim.nix
+++ b/nix/home-manager/modules/packages/neovim.nix
@@ -136,22 +136,8 @@
       };
       cmp = {
         enable = true;
+        autoEnableSources = true;
         settings = {
-          # formatting = {
-          #   format = ''
-          #     function(entry, vim_item)
-          #       vim_item.kind = string.format("%s %s", kind_icons[vim_item.kind], vim_item.kind)
-          #         vim_item.menu = ({
-          #         buffer = "[Buffer]",
-          #         nvim_lsp = "[LSP]",
-          #         luasnip = "[LuaSnip]",
-          #         nvim_lua = "[Lua]",
-          #         latex_symbols = "[LaTeX]",
-          #       })[entry.source.name]
-          #       return vim_item
-          #     end
-          #   '';
-          # };
           mapping = {
             "<CR>" = "cmp.mapping.confirm({ select = true})";
             "<C-Space>" = "cmp.mapping.complete()";
@@ -180,18 +166,6 @@
                 end, {"i", "s", "c"})
             '';
           };
-          # sources = {
-          #   cmdline = {
-          #     enable = true;
-          #   };
-          #   emoji.enable = true;
-          #   fuzzy_path.enable = true;
-          #   # luasnip.enable = true;
-          #   nvim_lsp.enable = true;
-          #   nvim_lsp_document_symbol.enable = true;
-          #   nvim_lsp_signature_help.enable = true;
-          #   treesitter.enable = true;
-          # };
           view = {
             entries.name = "custom";
           };
@@ -319,12 +293,6 @@
         telescope-egrepify-nvim
       ]);
     keymaps = [
-      # {
-      #   action = "vim.cmd.UndotreeToggle";
-      #   key = "<leader>u";
-      #   options.desc = "Toggle undotree";
-      #   mode = "n";
-      # }
       {
         action = "function() vim.api.nvim_command('wincmd h') end";
         key = "<leader>h";