diff --git a/README.md b/README.md
index 50d36b42..3c397ecf 100644
--- a/README.md
+++ b/README.md
@@ -48,27 +48,27 @@ nix develop -c /etc/nixos/git/docs/setup.sh
 ---
 # 📋 To Do List
  * [ ] Add audio to rdesktop xrdp config 
- * [ ] Framework volume buttons don't work on KDE
+ * [x] Framework volume buttons don't work on KDE
     * Intermittent
     * Always after reboot
 * [ ] KDE not saving HDR / high frame rate settings on Wayland
 * [ ] Figure out a way to pass through GPG AND SSH authentications via SSH (so I can use my YubiKey on my server remotely)
-* [ ] High I/O write causing issues on framework-server - Figure out where this is coming from.  Seems random
+* [x] High I/O write causing issues on framework-server - Figure out where this is coming from.  Seems random
 
 ## home-manager
-* [ ] KDE:
-    * [ ] Add config for tiling <Meta-T>
-    * [ ] Try Darkman - [Link](https://home-manager-options.extranix.com/?query=services.darkman&release=master)
-* [ ] Firefox:
-    * [ ] Find a way to remove all default search engines (Google, Amazon, Yahoo!, etc)
-    * [ ] Pre-defined containers with URLs to match? (ie, Google container opens Google stuff automatically)
+* [x] KDE:
+    * [x] Add config for tiling <Meta-T>
+    * [x] Try Darkman - [Link](https://home-manager-options.extranix.com/?query=services.darkman&release=master)
+* [x] Firefox:
+    * [x] Find a way to remove all default search engines (Google, Amazon, Yahoo!, etc)
+    * [x] Pre-defined containers with URLs to match? (ie, Google container opens Google stuff automatically)
     * [ ] Arkenfox interfering with some audio settings (media.mediasource, for example)
 
 ## Homelab General
 * [ ] Upgrades:
     * [ ] Headscale 0.23 - Need to update the web ui
-* [ ] New Features:
-    * [ ] Add fail2ban to Traefik
+* [x] New Features:
+    * [x] Add fail2ban to Traefik
         * Check other open ports
 
 Completed To Do List [here](./docs/complete.md)
diff --git a/flake.nix b/flake.nix
index 330214d1..a7518c4c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -45,7 +45,7 @@
     # Steam Deck configs for NixOS
     jovian.url = "github:Jovian-Experiments/Jovian-NixOS";
   };
-  outputs = { self, nixpkgs, nixpkgs-wayland, home-manager, lanzaboote, nur, sops-nix, nixos-generators, deploy-rs, jovian, ... } @inputs:
+  outputs = { self, nixpkgs, sops-nix, deploy-rs, ... } @inputs:
   let
     inherit (self) outputs;
     stateVersion = "23.11";
diff --git a/home-manager/common/software/cli/nixvim.nix b/home-manager/common/software/cli/nixvim.nix
index 820fad60..52e6c04a 100644
--- a/home-manager/common/software/cli/nixvim.nix
+++ b/home-manager/common/software/cli/nixvim.nix
@@ -1,4 +1,4 @@
-{ lib, ... }: {
+{ ... }: {
   imports = [ 
     ./nixvim/base.nix 
     ./nixvim/cmp.nix
@@ -68,13 +68,14 @@
               };
             };
           };
-          rnix-lsp.enable = lib.mkForce false;
-          nil-ls.enable = false;
+          nixd.enable = true;
           html.enable = true;
           cssls.enable = true;
           bashls.enable = false;
           tailwindcss.enable = true;
           svelte.enable = true;
+          docker-compose-language-service.enable = true;
+          marksman.enable = true;
         };
 
         onAttach = ''
diff --git a/home-manager/common/software/cli/nixvim/alpha.nix b/home-manager/common/software/cli/nixvim/alpha.nix
index afc70b51..4d1f020f 100644
--- a/home-manager/common/software/cli/nixvim/alpha.nix
+++ b/home-manager/common/software/cli/nixvim/alpha.nix
@@ -13,11 +13,11 @@
         mkPadding = size: { type = "padding"; val = size; };
         mkText = text: { type = "text"; val = text; opts = centeredText; };
 
-        mkGroup = val: { inherit val; type = "group"; };
-        mkGroupItem = desc: shortcut: {
-          inherit shortcut desc;
-          command = "";
-        };
+        # mkGroup = val: { inherit val; type = "group"; };
+        # mkGroupItem = desc: shortcut: {
+        #   inherit shortcut desc;
+        #   command = "";
+        # };
       in
       [
         (mkPadding 6)
diff --git a/home-manager/common/software/cli/nixvim/base.nix b/home-manager/common/software/cli/nixvim/base.nix
index 75d8c47f..a3622c27 100644
--- a/home-manager/common/software/cli/nixvim/base.nix
+++ b/home-manager/common/software/cli/nixvim/base.nix
@@ -4,8 +4,15 @@
     ./keymaps.nix
     inputs.nixvim.homeManagerModules.nixvim
   ] ++ lib.optional (builtins.isString theme) ../../../../../stylix/themes/${theme}/home-manager/nixvim.nix;
-
+  
   # https://github.com/nix-community/nixvim
+  home.packages = with pkgs; [
+    # Linters 
+    yamllint
+    hadolint 
+    nixfmt-rfc-style
+    vale 
+  ];
 
   # Docs:
   # https://nix-community.github.io/nixvim/
diff --git a/lib/default.nix b/lib/default.nix
index 06564a8d..a2326873 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -36,7 +36,7 @@
     desktop   ? null, 
     system    ? "x86_64-linux", 
     theme     ? "default",
-    type      ? "default",
+    # type      ? "default",
     repo      ? "nixpkgs",
     unfree    ? false,
     ip        ? null,
@@ -57,12 +57,8 @@
     restartIfChanged = true;
     enableTun        = true;
     specialArgs = { inherit pkgs-unstable hostname username desktop theme system repo unfree stateVersion ip deployment_type; };
-    config = { lib, config, pkgs-unstable, hostname, username, desktop, theme, system, repo, stateVersion, ip, deployment_type, ... }: {
-      nixpkgs.pkgs = import inputs.${repo} {
-        inherit system; 
-        config.allowUnfree = unfree; 
-        hostPlatform = system;
-      };
+    config = { hostname, username, desktop, theme, system, stateVersion, ... }: {
+      nixpkgs.pkgs = pkgs;
 
       imports = [ 
         ../nixos/containers