diff --git a/flake.nix b/flake.nix
index 7795410..716a179 100644
--- a/flake.nix
+++ b/flake.nix
@@ -72,7 +72,11 @@ in {
         system = "x86_64-linux";
         specialArgs = {
           inherit stateVersion inputs;
-          
+          hostname = "luci";
+          username = "ephase";
+          hostConfig = {
+            desktop = true;
+          };
         };
         modules = [
           ./nixos/default.nix
@@ -95,20 +99,6 @@ in {
           ./home-manager/default.nix
         ];
       };
-      work = home-manager.lib.homeManagerConfiguration {
-        pkgs = import nixpkgs {
-          system = "x86_64-linux";
-          overlays = [ nixgl.overlay ];
-        };
-        extraSpecialArgs = {
-          inherit stateVersion inputs;
-          hostname = "yorick-Latitude-7320";
-          username = "yorick";
-        };
-        modules = [
-          ./home-manager/default.nix
-        ];
-      };
     };
   };
 }
diff --git a/home-manager/default.nix b/home-manager/default.nix
index 50f33fa..d3b9cbc 100644
--- a/home-manager/default.nix
+++ b/home-manager/default.nix
@@ -15,4 +15,5 @@
   ]++ lib.optional (
         builtins.pathExists ../hosts/${hostname}/includes/home-manager.nix
         ) ../hosts/${hostname}/includes/home-manager.nix;
+
 }
diff --git a/hosts/yorick-Latitude-7320/home-config.nix b/hosts/yorick-Latitude-7320/home-config.nix
deleted file mode 100644
index 6059fb3..0000000
--- a/hosts/yorick-Latitude-7320/home-config.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ ... }: {
-  config.modules = {
-    application = {
-      zathura.enable = true;
-      foot.enable = true;
-    };
-    audio.cmus.enable = true;
-    cli = {
-      direnv.enable = true;
-      ghq.enable = true;
-      git = {
-        enable = true;
-        userEmail = "ybarbanneau@sellsy.com";
-      };
-      neovim.enable = true;
-      starship.enable = true;
-      utils.enable = true;
-      vifm.enable = true;
-      zsh.enable = true;
-    };
-    web.firefox = {
-      enable = true;
-      enableNixGL = true;
-    };
-  };
-}
diff --git a/hosts/yorick-Latitude-7320/includes/home-manager.nix b/hosts/yorick-Latitude-7320/includes/home-manager.nix
deleted file mode 100644
index 0a17bd4..0000000
--- a/hosts/yorick-Latitude-7320/includes/home-manager.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ pkgs, ... }:
-{ 
-    home.packages = with pkgs; [
-      dejavu_fonts
-      font-awesome
-      lato
-      liberation_ttf
-      libertine
-      libnotify
-      (nerdfonts.override {
-        fonts = [
-          "FiraCode"
-        ];
-      })
-      noto-fonts-emoji
-      noto-fonts-cjk
-      slurp
-      wl-clipboard
-    ];
-}
diff --git a/modules/home-manager/cli/neovim/default.nix b/modules/home-manager/cli/neovim/default.nix
index 19d8962..998b326 100644
--- a/modules/home-manager/cli/neovim/default.nix
+++ b/modules/home-manager/cli/neovim/default.nix
@@ -28,17 +28,13 @@ in
         # LSP Servers
         clang-tools
         hadolint
-        helm-ls
         lua-language-server
         marksman
         nil
         nodePackages.bash-language-server
         python3Packages.python-lsp-server
         shellcheck
-
-        terraform-lsp
-        tflint
-        yaml-language-server
+        # yaml-language-server
 
         # Formatters
         nixfmt-rfc-style
@@ -119,15 +115,12 @@ in
               p.cpp
               p.cmake 
               p.dockerfile 
-              p.hcl
-              p.helm
               p.latex 
               p.lua
               p.llvm
               p.markdown
               p.markdown_inline 
               p.python 
-              p.terraform
               p.vim 
               p.yaml 
             ])
@@ -165,7 +158,6 @@ in
           type = "lua";
           config = ( builtins.readFile ./files/whichkey.lua );
         }
-        vim-helm
       ];
     };
   };
diff --git a/modules/home-manager/cli/neovim/files/lspconfig.lua b/modules/home-manager/cli/neovim/files/lspconfig.lua
index 84fb126..6ddfddf 100644
--- a/modules/home-manager/cli/neovim/files/lspconfig.lua
+++ b/modules/home-manager/cli/neovim/files/lspconfig.lua
@@ -2,21 +2,6 @@ local lspconfig = require('lspconfig')
 
 lspconfig.bashls.setup {}
 lspconfig.clangd.setup {}
-lspconfig.helm_ls.setup{
-    settings = {
-        ['helm-ls'] = {
-            logLevel = "info",
-            valuesFiles = {
-                mainValuesFile = "values.yaml",
-                lintOverlayValuesFile = "values.lint.yaml",
-                additionalValuesFilesGlobPattern = "values*.yaml"
-            }
-        },
-        yamlls = {
-            enabled = false,
-        }
-    }
-}
 lspconfig.lua_ls.setup {
   single_file_support = true,
   flags = {
@@ -29,25 +14,14 @@ lspconfig.pylsp.setup {
     settings = {
         pylsp = {
             plugins = {
-                pylint = {
+                pylint = { 
                     enabled = true
                 }
             }
         }
     }
 }
-lspconfig.terraformls.setup{}
-lspconfig.tflint.setup{}
-lspconfig.yamlls.setup{
-	settings = {
-		yaml = {
-			schemas = {
-				["https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.30.0/all.json"] = {"k8s/**/*.yaml", "cluster/**/*.yaml",},
-				["https://taskfile.dev/schema.json"] = {"**/Taskfile.*", "**/taskfile.*",},
-			},
-		},
-	},
-}
+lspconfig.yamlls.setup{}
 
 vim.api.nvim_create_autocmd('LspAttach', {
   desc = 'LSP actions',