moved to unstable, will need to fix nixvim

modules/home/apps/cli-apps/fish/default.nix

@@ -26,6 +26,7 @@ in {
           shellInit = "
 	zoxide init fish | source
 	starship init fish | source
+	direnv hook fish | source
 	source ~/.config/op/plugins.sh
 	";
           shellAliases = {

modules/nixos/apps/cli-apps/nixvim/default.nix

@@ -128,36 +128,10 @@ in {
           };
         };
 
-        nvim-cmp = {
+        cmp = {
           enable = true;
-          autoEnableSources = true;
-          sources = [
-            {
-              name = "nvim_lsp";
-            }
-            {
-              name = "luasnip";
-            }
-            {
-              name = "path";
-            }
-            {
-              name = "buffer";
-            }
-          ];
-          mapping = {
-            "<C-Space>" = "cmp.mapping.complete()";
-            "<C-e>" = "cmp.mapping.close()";
-            "<Tab>" = {
-              modes = ["i" "s"];
-              action = "cmp.mapping.select_next_item()";
-            };
-            "<S-Tab>" = {
-              modes = ["i" "s"];
-              action = "cmp.mapping.select_prev_item()";
-            };
-            "<CR>" = "cmp.mapping.confirm({ select = true })";
-          };
+	  settings = {
+          	  };
         };
 
         rainbow-delimiters = {

modules/nixos/system/xkb/default.nix

@@ -17,7 +17,7 @@ in {
     services.xserver = {
       xkb.layout = "us";
       xkb.variant = "";
-      xkbOptions = "caps:escape";
+      xkb.options = "caps:escape";
     };
   };
 }