diff --git a/home-manager/bash/default.nix b/home-manager/bash/default.nix
index 5922a86..a4342bd 100644
--- a/home-manager/bash/default.nix
+++ b/home-manager/bash/default.nix
@@ -1,5 +1,3 @@
-{ config, pkgs, ... }:
-
 {
   programs.bash = {
     enable = true;
@@ -17,5 +15,4 @@
       fastfetch
     '';
   };
-
 }
diff --git a/home-manager/direnv/default.nix b/home-manager/direnv/default.nix
index ab3fe04..2b51c9d 100644
--- a/home-manager/direnv/default.nix
+++ b/home-manager/direnv/default.nix
@@ -1,5 +1,3 @@
-{ config, pkgs, ... }:
-
 {
   programs.direnv = {
     enable = true;
diff --git a/home-manager/fastfetch/default.nix b/home-manager/fastfetch/default.nix
index b640aac..68bcfb8 100644
--- a/home-manager/fastfetch/default.nix
+++ b/home-manager/fastfetch/default.nix
@@ -1,4 +1,3 @@
-{ config, pkgs, ... }:
 {
   xdg.configFile = {
     "fastfetch/config.jsonc" = {
diff --git a/home-manager/ghostty/default.nix b/home-manager/ghostty/default.nix
index dbee0e2..c59774f 100644
--- a/home-manager/ghostty/default.nix
+++ b/home-manager/ghostty/default.nix
@@ -1,4 +1,3 @@
-{ config, pkgs, ... }:
 {
   xdg.configFile = {
     "ghostty/config" = {
diff --git a/home-manager/git/default.nix b/home-manager/git/default.nix
index 0a99b82..0581c06 100644
--- a/home-manager/git/default.nix
+++ b/home-manager/git/default.nix
@@ -1,5 +1,3 @@
-{ config, pkgs, ... }:
-
 {
   programs.git = {
     enable = true;
@@ -32,13 +30,11 @@
     };
   };
 
+  # Copy Configuration
   xdg.configFile = {
-
-    # Copy Configuration
     git = {
       source = ./config;
       recursive = true;
     };
-
   };
 }
diff --git a/home-manager/home.nix b/home-manager/home.nix
index ee068d6..7c7c85f 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -1,6 +1,6 @@
-{ config, lib, pkgs, ... }:
+{ pkgs, ... }:
 let
-  inherit (pkgs.lib) mkIf optionals;
+  inherit (pkgs.lib) optionals;
   inherit (pkgs.stdenv) isLinux isDarwin;
 in
 {
diff --git a/home-manager/htop/default.nix b/home-manager/htop/default.nix
index 1191125..1602282 100644
--- a/home-manager/htop/default.nix
+++ b/home-manager/htop/default.nix
@@ -1,5 +1,3 @@
-{ config, pkgs, ... }:
-
 {
   xdg.configFile."htop/htoprc" = {
     source = ./config/htoprc;
diff --git a/home-manager/nvim/config/lua/lsp-config.lua b/home-manager/nvim/config/lua/lsp-config.lua
index d495287..87ca89e 100644
--- a/home-manager/nvim/config/lua/lsp-config.lua
+++ b/home-manager/nvim/config/lua/lsp-config.lua
@@ -137,6 +137,13 @@ nvim_lsp.templ.setup({
 	capabilities = capabilities,
 })
 
+-- Nix LSP Configuration
+nvim_lsp.nil_ls.setup({
+	on_attach = on_attach,
+	flags = lsp_flags,
+	capabilities = capabilities,
+})
+
 -- Go LSP Configuration
 nvim_lsp.gopls.setup({
 	on_attach = function(client, bufnr)
diff --git a/home-manager/nvim/default.nix b/home-manager/nvim/default.nix
index c248230..bfd4648 100644
--- a/home-manager/nvim/default.nix
+++ b/home-manager/nvim/default.nix
@@ -1,6 +1,5 @@
-{ config, pkgs, ... }:
+{ pkgs, ... }:
 let
-  inherit (pkgs.lib.lists) subtractLists;
   unstable = import <nixpkgs-unstable> { };
 in
 {
@@ -151,6 +150,7 @@ in
       golangci-lint-langserver
       gopls
       lua-language-server
+      nil
       nodePackages.eslint
       nodePackages.svelte-language-server
       nodePackages.typescript
diff --git a/home-manager/powerline/default.nix b/home-manager/powerline/default.nix
index 667b891..363ec58 100644
--- a/home-manager/powerline/default.nix
+++ b/home-manager/powerline/default.nix
@@ -1,5 +1,3 @@
-{ config, pkgs, ... }:
-
 {
   programs.powerline-go = {
     enable = true;
diff --git a/home-manager/readline/default.nix b/home-manager/readline/default.nix
index e3f2580..fb38452 100644
--- a/home-manager/readline/default.nix
+++ b/home-manager/readline/default.nix
@@ -1,5 +1,3 @@
-{ config, pkgs, ... }:
-
 {
   programs.readline = {
     enable = true;
@@ -9,5 +7,4 @@
       set vi-cmd-mode-string \1\e[01;38;5;22;48;5;148m\2 C \1\e[38;5;148;48;5;238m\2\1\e[0m\2
     '';
   };
-
 }