diff --git a/flake.lock b/flake.lock
index 8719c3c..1c6d191 100644
--- a/flake.lock
+++ b/flake.lock
@@ -282,11 +282,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1708939976,
-        "narHash": "sha256-O5+nFozxz2Vubpdl1YZtPrilcIXPcRAjqNdNE8oCRoA=",
+        "lastModified": 1710156081,
+        "narHash": "sha256-4PMY6aumJi5dLFjBzF5O4flKXmadMNq3AGUHKYfchh0=",
         "owner": "numtide",
         "repo": "devshell",
-        "rev": "5ddecd67edbd568ebe0a55905273e56cc82aabe3",
+        "rev": "bc68b058dc7e6d4d6befc4ec6c60082b6e844b7d",
         "type": "github"
       },
       "original": {
@@ -317,6 +317,28 @@
         "type": "github"
       }
     },
+    "devshell_4": {
+      "inputs": {
+        "flake-utils": "flake-utils_6",
+        "nixpkgs": [
+          "nixvim",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1710156081,
+        "narHash": "sha256-4PMY6aumJi5dLFjBzF5O4flKXmadMNq3AGUHKYfchh0=",
+        "owner": "numtide",
+        "repo": "devshell",
+        "rev": "bc68b058dc7e6d4d6befc4ec6c60082b6e844b7d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "devshell",
+        "type": "github"
+      }
+    },
     "disko": {
       "inputs": {
         "nixpkgs": [
@@ -324,11 +346,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1709286488,
-        "narHash": "sha256-RDpTZ72zLu05djvXRzK76Ysqp9zSdh84ax/edEaJucs=",
+        "lastModified": 1710169806,
+        "narHash": "sha256-HeWFrRuHpnAiPmIr26OKl2g142HuGerwoO/XtW53pcI=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "bde7dd352c07d43bd5b8245e6c39074a391fdd46",
+        "rev": "fe064a639319ed61cdf12b8f6eded9523abcc498",
         "type": "github"
       },
       "original": {
@@ -513,11 +535,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1706830856,
-        "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=",
+        "lastModified": 1709336216,
+        "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f",
+        "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2",
         "type": "github"
       },
       "original": {
@@ -531,11 +553,11 @@
         "nixpkgs-lib": "nixpkgs-lib_2"
       },
       "locked": {
-        "lastModified": 1706830856,
-        "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=",
+        "lastModified": 1709336216,
+        "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f",
+        "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2",
         "type": "github"
       },
       "original": {
@@ -569,11 +591,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1709126324,
-        "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "d465f4819400de7c8d874d50b982301f28a84605",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
         "type": "github"
       },
       "original": {
@@ -623,11 +645,11 @@
         "systems": "systems_7"
       },
       "locked": {
-        "lastModified": 1709126324,
-        "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "d465f4819400de7c8d874d50b982301f28a84605",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
         "type": "github"
       },
       "original": {
@@ -658,6 +680,24 @@
       "inputs": {
         "systems": "systems_9"
       },
+      "locked": {
+        "lastModified": 1701680307,
+        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_8": {
+      "inputs": {
+        "systems": "systems_10"
+      },
       "locked": {
         "lastModified": 1685518550,
         "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
@@ -672,9 +712,9 @@
         "type": "github"
       }
     },
-    "flake-utils_8": {
+    "flake-utils_9": {
       "inputs": {
-        "systems": "systems_11"
+        "systems": "systems_12"
       },
       "locked": {
         "lastModified": 1705309234,
@@ -839,11 +879,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1709204054,
-        "narHash": "sha256-U1idK0JHs1XOfSI1APYuXi4AEADf+B+ZU4Wifc0pBHk=",
+        "lastModified": 1710273215,
+        "narHash": "sha256-AfVYEQIhOK6vaYVndgqFV4Vb5REXG9R0ylv83QInsT0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "2f3367769a93b226c467551315e9e270c3f78b15",
+        "rev": "a500de54b2e3067201a40cefa5f210f719423ddf",
         "type": "github"
       },
       "original": {
@@ -860,11 +900,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1708988456,
-        "narHash": "sha256-RCz7Xe64tN2zgWk+MVHkzg224znwqknJ1RnB7rVqUWw=",
+        "lastModified": 1710062421,
+        "narHash": "sha256-FiCNRfyUgJOLYIokLiFsfI7B+Zn9HDnOzFR3uVr5qsQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "1d085ea4444d26aa52297758b333b449b2aa6fca",
+        "rev": "36f873dfc8e2b6b89936ff3e2b74803d50447e0a",
         "type": "github"
       },
       "original": {
@@ -942,11 +982,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1709208631,
-        "narHash": "sha256-n+SCii/GQR3zjaZzjhGAjrQQlF+xjaGEjWdpDb4wJ3U=",
+        "lastModified": 1710184940,
+        "narHash": "sha256-FzYm4td3FJfzOAuEkCXt3KdUgZuA072OAQXqIq+IAMo=",
         "owner": "nix-community",
         "repo": "lib-aggregate",
-        "rev": "1f03ac8dc3a54f68f55d36b5e7fc65afc302a3d7",
+        "rev": "45b75bf534592c0c1c881a1c447f7fdb37a87eaf",
         "type": "github"
       },
       "original": {
@@ -979,11 +1019,11 @@
         "spectrum": "spectrum"
       },
       "locked": {
-        "lastModified": 1709297667,
-        "narHash": "sha256-5JUaHyRFKDPqyeTlbMFS6VixAWRkO5uCRTS8asEjiyo=",
+        "lastModified": 1710080963,
+        "narHash": "sha256-E1qvw0/ZfJfVDMysc5EN7g8wD/0j2uF3a1efVxz7pWk=",
         "owner": "astro",
         "repo": "microvm.nix",
-        "rev": "7f93206b22131aac8fa46d787696ea58460aecab",
+        "rev": "30e577e95ba469ba0d0c08e64e81604b1d097f9c",
         "type": "github"
       },
       "original": {
@@ -1020,11 +1060,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1709001452,
-        "narHash": "sha256-FnZ54wkil54hKvr1irdKic1TE27lHQI9dKQmOJRrtlU=",
+        "lastModified": 1709771483,
+        "narHash": "sha256-Hjzu9nCknHLQvhdaRFfCEprH0o15KcaNu1QDr3J88DI=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "6c06334f0843c7300d1678726bb607ce526f6b36",
+        "rev": "550340062c16d7ef8c2cc20a3d2b97bcd3c6b6f6",
         "type": "github"
       },
       "original": {
@@ -1083,11 +1123,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1708830466,
-        "narHash": "sha256-nGKe3Y1/jkLR2eh1aRSVBtKadMBNv8kOnB52UXqRy6A=",
+        "lastModified": 1710120787,
+        "narHash": "sha256-tlLuB73OCOKtU2j83bQzSYFyzjJo3rjpITZE5MoofG8=",
         "owner": "nix-community",
         "repo": "nix-index-database",
-        "rev": "f070c7eeec3bde8c8c8baa9c02b6d3d5e114d73b",
+        "rev": "e76ff2df6bfd2abe06abd8e7b9f217df941c1b07",
         "type": "github"
       },
       "original": {
@@ -1098,11 +1138,11 @@
     },
     "nixlib": {
       "locked": {
-        "lastModified": 1708821942,
-        "narHash": "sha256-jd+E1SD59qty65pwqad2mftzkT6vW5nNFWVuvayh4Zw=",
+        "lastModified": 1709426687,
+        "narHash": "sha256-jLBZmwXf0WYHzLkmEMq33bqhX55YtT5edvluFr0RcSA=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "479831ed8b3c9c7b80533999f880c7d0bf6a491b",
+        "rev": "7873d84a89ae6e4841528ff7f5697ddcb5bdfe6c",
         "type": "github"
       },
       "original": {
@@ -1143,11 +1183,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1709226763,
-        "narHash": "sha256-GlJ7g2srrtx6s5P2uswZ6Zcpy2u90tomIx+Gstlk97s=",
+        "lastModified": 1710164763,
+        "narHash": "sha256-6p7yebSjzrL8qK4Q0gx2RnsxaudGUQcgkSxFG/J265Y=",
         "owner": "nix-community",
         "repo": "nixos-generators",
-        "rev": "2c9562e7624fa1b50983fc18d504bf86202bef49",
+        "rev": "1d9c8cd24eba7942955f92fdcefba5a6a7543bc6",
         "type": "github"
       },
       "original": {
@@ -1158,11 +1198,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1709147990,
-        "narHash": "sha256-vpXMWoaCtMYJ7lisJedCRhQG9BSsInEyZnnG5GfY9tQ=",
+        "lastModified": 1710123225,
+        "narHash": "sha256-j3oWlxRZxB7cFsgEntpH3rosjFHRkAo/dhX9H3OfxtY=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "33a97b5814d36ddd65ad678ad07ce43b1a67f159",
+        "rev": "ad2fd7b978d5e462048729a6c635c45d3d33c9ba",
         "type": "github"
       },
       "original": {
@@ -1173,11 +1213,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1709237383,
-        "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=",
+        "lastModified": 1709961763,
+        "narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8",
+        "rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34",
         "type": "github"
       },
       "original": {
@@ -1189,11 +1229,11 @@
     },
     "nixpkgs-lib": {
       "locked": {
-        "lastModified": 1708821942,
-        "narHash": "sha256-jd+E1SD59qty65pwqad2mftzkT6vW5nNFWVuvayh4Zw=",
+        "lastModified": 1710031547,
+        "narHash": "sha256-pkUg3hOKuGWMGF9WEMPPN/G4pqqdbNGJQ54yhyQYDVY=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "479831ed8b3c9c7b80533999f880c7d0bf6a491b",
+        "rev": "630ebdc047ca96d8126e16bb664c7730dc52f6e6",
         "type": "github"
       },
       "original": {
@@ -1205,11 +1245,11 @@
     "nixpkgs-lib_2": {
       "locked": {
         "dir": "lib",
-        "lastModified": 1706550542,
-        "narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=",
+        "lastModified": 1709237383,
+        "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "97b17f32362e475016f942bbdfda4a4a72a8a652",
+        "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8",
         "type": "github"
       },
       "original": {
@@ -1294,11 +1334,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1709382297,
-        "narHash": "sha256-BN13D32lFRKMFVGwTDPo2d5Z8xQkbiXLtsZ3UdQVpeA=",
+        "lastModified": 1710267575,
+        "narHash": "sha256-V7/a60H/HYw2ttlRcw5OhmnVXw1e+Ch0yQzCt6zO900=",
         "owner": "nix-community",
         "repo": "nixpkgs-wayland",
-        "rev": "405a09242dfff6a32466411d3e3c9861dd566e59",
+        "rev": "1c91c11927e5186e3a1b6ad5fe0e404af62d9490",
         "type": "github"
       },
       "original": {
@@ -1373,6 +1413,7 @@
     },
     "nixvim": {
       "inputs": {
+        "devshell": "devshell_4",
         "flake-compat": "flake-compat_5",
         "flake-parts": "flake-parts_3",
         "home-manager": "home-manager_2",
@@ -1383,11 +1424,11 @@
         "pre-commit-hooks": "pre-commit-hooks_3"
       },
       "locked": {
-        "lastModified": 1709383745,
-        "narHash": "sha256-o9BfJjVeyANmRfLjZxVMeDxhbGHhQDrMeq4TRy8An5o=",
+        "lastModified": 1710279873,
+        "narHash": "sha256-9Nm0hN20IpaY7z6HuhjU9O7d6fhFp65rOfww9sh7C5A=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "d8432ef9c1ced362aeb0a0bfd62f9855977f93ad",
+        "rev": "35eddf61d1fc628d04845046ece1882ebcf375d4",
         "type": "github"
       },
       "original": {
@@ -1486,7 +1527,7 @@
     "pre-commit-hooks_3": {
       "inputs": {
         "flake-compat": "flake-compat_6",
-        "flake-utils": "flake-utils_6",
+        "flake-utils": "flake-utils_7",
         "gitignore": "gitignore_4",
         "nixpkgs": [
           "nixvim",
@@ -1559,7 +1600,7 @@
         "pre-commit-hooks": "pre-commit-hooks_4",
         "spicetify-nix": "spicetify-nix",
         "stylix": "stylix",
-        "systems": "systems_10",
+        "systems": "systems_11",
         "wired-notify": "wired-notify"
       }
     },
@@ -1590,15 +1631,15 @@
     },
     "rust-overlay_2": {
       "inputs": {
-        "flake-utils": "flake-utils_8",
+        "flake-utils": "flake-utils_9",
         "nixpkgs": "nixpkgs_5"
       },
       "locked": {
-        "lastModified": 1708740535,
-        "narHash": "sha256-NCTw235XwSDbeTAtAwg/hOeNOgwYhVq7JjDdbkOgBeA=",
+        "lastModified": 1709345349,
+        "narHash": "sha256-E2tsnkM97cGuzHKOqdkUXfmI+K1wS4dNTJJu5QH2Vuk=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "9b24383d77f598716fa0cbb8b48c97249f5ee1af",
+        "rev": "6e6fde31711e699be2e7fb67aae1c7e23ef606e0",
         "type": "github"
       },
       "original": {
@@ -1625,7 +1666,7 @@
     },
     "spicetify-nix": {
       "inputs": {
-        "flake-utils": "flake-utils_7",
+        "flake-utils": "flake-utils_8",
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
@@ -1659,11 +1700,11 @@
         "nixpkgs": "nixpkgs_4"
       },
       "locked": {
-        "lastModified": 1708896938,
-        "narHash": "sha256-oMjkMjeNhDUEpKIofo9+9RdUnmmZ4h0sm+kf6XKdy6k=",
+        "lastModified": 1710193282,
+        "narHash": "sha256-cwyXYYxkp+OaUKjfth2ASZvRcvZhAMy0hjl6TSvXW1g=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "fcff15ac5ffbe81f1c66e352f3167c270d79cdab",
+        "rev": "32a796929226869542b29c0031848f6dc392a3bd",
         "type": "github"
       },
       "original": {
@@ -1717,6 +1758,21 @@
         "type": "github"
       }
     },
+    "systems_12": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "systems_2": {
       "locked": {
         "lastModified": 1681028828,
@@ -1868,11 +1924,11 @@
         "rust-overlay": "rust-overlay_2"
       },
       "locked": {
-        "lastModified": 1709189262,
-        "narHash": "sha256-2R2kyALSgZYi2r9Kk3Bn5ToW3mRClK8y4tDKRrniuyk=",
+        "lastModified": 1709550686,
+        "narHash": "sha256-/VOrApTUWVYdYvCLBRA8Zz1qCC5IaUHLGYMsEe5FAZ8=",
         "owner": "Toqozz",
         "repo": "wired-notify",
-        "rev": "6bf4ed31cb87b0f4564c1c8858fd3bff64b2aaf9",
+        "rev": "228ef2c919cb38595a55ef6e487a3675533c34b9",
         "type": "github"
       },
       "original": {
diff --git a/hosts/desktopnix/default.nix b/hosts/desktopnix/default.nix
index da58748..16951da 100644
--- a/hosts/desktopnix/default.nix
+++ b/hosts/desktopnix/default.nix
@@ -1,4 +1,8 @@
-{inputs, ...}: {
+{
+  inputs,
+  lib,
+  ...
+}: {
   imports = [
     inputs.nixos-hardware.nixosModules.common-gpu-nvidia-nonprime
     inputs.nixos-hardware.nixosModules.common-cpu-intel
@@ -50,4 +54,7 @@
   '';
   boot.binfmt.emulatedSystems = ["aarch64-linux" "riscv64-linux"];
   nix.settings.system-features = ["kvm" "nixos-test"];
+  nixpkgs.config.permittedInsecurePackages = lib.trace "remove when possible" [
+    "nix-2.16.2"
+  ];
 }
diff --git a/hosts/elisabeth/default.nix b/hosts/elisabeth/default.nix
index b1048cf..d470e78 100644
--- a/hosts/elisabeth/default.nix
+++ b/hosts/elisabeth/default.nix
@@ -31,4 +31,7 @@
       variant = "bone";
     };
   };
+  nixpkgs.config.permittedInsecurePackages = lib.trace "remove when possible" [
+    "nix-2.16.2"
+  ];
 }
diff --git a/hosts/gojo/default.nix b/hosts/gojo/default.nix
index 08c8907..08c7b05 100644
--- a/hosts/gojo/default.nix
+++ b/hosts/gojo/default.nix
@@ -43,4 +43,7 @@
       };
     };
   };
+  nixpkgs.config.permittedInsecurePackages = lib.trace "remove when possible" [
+    "nix-2.16.2"
+  ];
 }
diff --git a/hosts/maddy/default.nix b/hosts/maddy/default.nix
index 711c119..cd040ad 100644
--- a/hosts/maddy/default.nix
+++ b/hosts/maddy/default.nix
@@ -22,4 +22,7 @@
   };
   boot.mode = "bios";
   boot.initrd.availableKernelModules = ["virtio_pci" "virtio_net" "virtio_scsi" "virtio_blk"];
+  nixpkgs.config.permittedInsecurePackages = lib.trace "remove when possible" [
+    "nix-2.16.2"
+  ];
 }
diff --git a/hosts/patricknix/default.nix b/hosts/patricknix/default.nix
index 5b85a60..254bd99 100644
--- a/hosts/patricknix/default.nix
+++ b/hosts/patricknix/default.nix
@@ -51,4 +51,7 @@
   system.activationScripts.decryptKey.text = ''
     ln -f -s ${../../keys/PatC.key} /run/decrypt.key.pub
   '';
+  nixpkgs.config.permittedInsecurePackages = lib.trace "remove when possible" [
+    "nix-2.16.2"
+  ];
 }
diff --git a/users/common/default.nix b/users/common/default.nix
index 44a030d..48e0f5b 100644
--- a/users/common/default.nix
+++ b/users/common/default.nix
@@ -5,7 +5,6 @@
     ./shells/pager.nix
 
     ./programs/gpg.nix
-    ./programs/nvim
     ./programs/htop.nix
   ];
 
diff --git a/users/common/programs/nvim/nixvim/plugins/cmp.nix b/users/common/programs/nvim/nixvim/plugins/cmp.nix
index 1baaa53..c2674f0 100644
--- a/users/common/programs/nvim/nixvim/plugins/cmp.nix
+++ b/users/common/programs/nvim/nixvim/plugins/cmp.nix
@@ -19,98 +19,121 @@
     cmp-nvim-lsp.enable = true;
     cmp-nvim-lsp-document-symbol.enable = true;
     cmp-nvim-lsp-signature-help.enable = true;
-    nvim-cmp = {
+    cmp = {
       enable = true;
-      sources = [
-        {name = "luasnip";}
-        {name = "nvim_lsp_signature_help";}
-        {name = "nvim_lsp";}
-        {name = "buffer";}
-        {name = "path";}
-        {name = "calc";}
-        {name = "emoji";}
-        {name = "nvim_lua";}
-      ];
-      snippet.expand = "luasnip";
-      formatting.fields = ["abbr" "kind" "menu"];
-      formatting.format = ''
-        function(_, vim_item)
-        local icons = {
-          Namespace = "󰌗",
-          Text = "󰉿",
-          Method = "󰆧",
-          Function = "󰆧",
-          Constructor = "",
-          Field = "󰜢",
-          Variable = "󰀫",
-          Class = "󰠱",
-          Interface = "",
-          Module = "",
-          Property = "󰜢",
-          Unit = "󰑭",
-          Value = "󰎠",
-          Enum = "",
-          Keyword = "󰌋",
-          Snippet = "",
-          Color = "󰏘",
-          File = "󰈚",
-          Reference = "󰈇",
-          Folder = "󰉋",
-          EnumMember = "",
-          Constant = "󰏿",
-          Struct = "󰙅",
-          Event = "",
-          Operator = "󰆕",
-          TypeParameter = "󰊄",
-          Table = "",
-          Object = "󰅩",
-          Tag = "",
-          Array = "󰅪",
-          Boolean = "",
-          Number = "",
-          Null = "󰟢",
-          String = "󰉿",
-          Calendar = "",
-          Watch = "󰥔",
-          Package = "",
-          Copilot = "",
-          Codeium = "",
-          TabNine = "",
-        }
-        vim_item.kind = string.format("%s %s", icons[vim_item.kind], vim_item.kind)
-        return vim_item
-        end
-      '';
-      mapping = {
-        "<CR>" = "cmp.mapping.confirm({ select = false })";
-        "<C-Space>" = "cmp.mapping(cmp.mapping.complete(), { \"i\", \"c\" })";
-        "<Tab>".action = ''
-          function(fallback)
-          	if cmp.visible() then
-          		cmp.select_next_item()
-          	elseif require("luasnip").expand_or_jumpable() then
-          		vim.fn.feedkeys(
-          			vim.api.nvim_replace_termcodes("<Plug>luasnip-expand-or-jump", true, true, true),
-          			""
-          		)
-          	else
-          		fallback()
-          	end
-          end
-        '';
-        "<S-Tab>".action = ''          function(fallback)
-          						if cmp.visible() then
-          							cmp.select_prev_item()
-          						elseif require("luasnip").jumpable(-1) then
-          							vim.fn.feedkeys(
-          								vim.api.nvim_replace_termcodes("<Plug>luasnip-jump-prev", true, true, true),
-          								""
-          							)
-          						else
-          							fallback()
-          						end
-          					end
-        '';
+      settings = {
+        sources = [
+          {name = "luasnip";}
+          {name = "nvim_lsp_signature_help";}
+          {name = "nvim_lsp";}
+          {name = "buffer";}
+          {name = "path";}
+          {name = "calc";}
+          {name = "emoji";}
+          {name = "nvim_lua";}
+        ];
+        snippet.expand =
+          /*
+          lua
+          */
+          ''
+            function(args)
+              require('luasnip').lsp_expand(args.body)
+            end
+          '';
+        formatting.fields = ["abbr" "kind" "menu"];
+        formatting.format =
+          /*
+          lua
+          */
+          ''
+            function(_, vim_item)
+            local icons = {
+              Namespace = "󰌗",
+              Text = "󰉿",
+              Method = "󰆧",
+              Function = "󰆧",
+              Constructor = "",
+              Field = "󰜢",
+              Variable = "󰀫",
+              Class = "󰠱",
+              Interface = "",
+              Module = "",
+              Property = "󰜢",
+              Unit = "󰑭",
+              Value = "󰎠",
+              Enum = "",
+              Keyword = "󰌋",
+              Snippet = "",
+              Color = "󰏘",
+              File = "󰈚",
+              Reference = "󰈇",
+              Folder = "󰉋",
+              EnumMember = "",
+              Constant = "󰏿",
+              Struct = "󰙅",
+              Event = "",
+              Operator = "󰆕",
+              TypeParameter = "󰊄",
+              Table = "",
+              Object = "󰅩",
+              Tag = "",
+              Array = "󰅪",
+              Boolean = "",
+              Number = "",
+              Null = "󰟢",
+              String = "󰉿",
+              Calendar = "",
+              Watch = "󰥔",
+              Package = "",
+              Copilot = "",
+              Codeium = "",
+              TabNine = "",
+            }
+            vim_item.kind = string.format("%s %s", icons[vim_item.kind], vim_item.kind)
+            return vim_item
+            end
+          '';
+        mapping = {
+          "<CR>" = "cmp.mapping.confirm({ select = false })";
+          "<C-Space>" = "cmp.mapping(cmp.mapping.complete(), { \"i\", \"c\" })";
+          "<Tab>" =
+            /*
+            lua
+            */
+            ''
+              function(fallback)
+              	if cmp.visible() then
+              		cmp.select_next_item()
+              	elseif require("luasnip").expand_or_jumpable() then
+              		vim.fn.feedkeys(
+              			vim.api.nvim_replace_termcodes("<Plug>luasnip-expand-or-jump", true, true, true),
+              			""
+              		)
+              	else
+              		fallback()
+              	end
+              end
+            '';
+          "<S-Tab>" =
+            /*
+            lua
+            */
+            ''
+              function(fallback)
+              	if cmp.visible() then
+              		cmp.select_prev_item()
+              	elseif require("luasnip").jumpable(-1) then
+              		vim.fn.feedkeys(
+              			vim.api.nvim_replace_termcodes("<Plug>luasnip-jump-prev", true, true, true),
+              			""
+              		)
+              	else
+              		fallback()
+              	end
+              end
+            '';
+        };
       };
     };
   };
diff --git a/users/common/programs/nvim/nixvim/plugins/lsp.nix b/users/common/programs/nvim/nixvim/plugins/lsp.nix
index 7f76943..d0e62c8 100644
--- a/users/common/programs/nvim/nixvim/plugins/lsp.nix
+++ b/users/common/programs/nvim/nixvim/plugins/lsp.nix
@@ -9,7 +9,6 @@
       sources = {
         code_actions = {
           # gitsigns.enable = true;
-          shellcheck.enable = true;
         };
         diagnostics = {
           deadnix.enable = true;
diff --git a/users/patrick/default.nix b/users/patrick/default.nix
index 37572c9..3cb5efb 100644
--- a/users/patrick/default.nix
+++ b/users/patrick/default.nix
@@ -67,6 +67,7 @@ lib.optionalAttrs (!minimal) {
         ../common/programs/git.nix
         ../common/programs/kitty.nix
         ../common/programs/minecraft.nix
+        ../common/programs/nvim
         ../common/programs/openttd.nix
         ../common/programs/poe.nix
         ../common/programs/spicetify.nix