flake.nix

@@ -53,33 +53,14 @@
             description = "All my NixoS machines";
             specialArgs = {
               inherit inputs outputs;
-              nodes = colmenaHive.nodes;
               pkgs-unstable = import nixpkgs-unstable { system = "x86_64-linux"; };
             };
             nixpkgs = import nixpkgs { system = "x86_64-linux"; };
           };
 
-          defaults = { lib, config, name, nodes, ... }: {
+          defaults = { lib, config, name, ... }: {
             imports = [ ./hosts/${name} ./profiles/base ];
 
-            options.cherrykitten = {
-              primaryIPv4 = lib.mkOption {
-                type = lib.types.nullOr lib.types.str;
-                default =
-                  if (config.networking.interfaces ? eth0) then
-                    (builtins.elemAt config.networking.interfaces.eth0.ipv4.addresses 0).address
-                  else null;
-              };
-              primaryIPv6 = lib.mkOption {
-                type = lib.types.nullOr lib.types.str;
-                default =
-                  if (config.networking.interfaces ? eth0) then
-                    (builtins.elemAt config.networking.interfaces.eth0.ipv6.addresses 0).address
-                  else null;
-              };
-            };
-
-            config = {
             networking.hostName = name;
             networking.domain = "cherrykitten.xyz";
 
@@ -88,7 +69,6 @@
               pkgs-unstable = import nixpkgs-unstable { system = "x86_64-linux"; };
             };
           };
-          };
         } // hosts;
 
       colmenaHive = inputs.colmena.lib.makeHive colmena;

modules/home/nvim/default.nix

@@ -19,7 +19,6 @@
       # misc
       nodePackages.prettier
       marksman
-      haskell-language-server
     ];
 
     plugins = with pkgs.vimPlugins; [

modules/home/nvim/lua/plugins/lsp.lua

@@ -69,7 +69,6 @@ return {
 						},
 					},
 				},
-        hls = {},
 			},
 		},
 	},