wsl fixes

modules/mail/himalaya.nix

@@ -75,11 +75,10 @@
             };
             mu.enable = false;
             notmuch.enable = false;
-            passwordCommand = ''
-              ${pkgs.age}/bin/age --decrypt \
-                --identity ${config.identityFile} \
-                ${builtins.toString ../../private/mailpass.age}
-            '';
+            passwordCommand =
+              "${pkgs.age}/bin/age --decrypt --identity ${config.identityFile} ${
+                builtins.toString ../../private/mailpass.age
+              }";
             smtp = {
               host = "smtp.purelymail.com";
               port = 465;

modules/neovim/lua/packer/lsp.lua

@@ -14,8 +14,7 @@ M.packer = function(use)
                 return vim.fn.executable(program) == 1
             end
 
-            local capabilities =
-                require("cmp_nvim_lsp").update_capabilities(vim.lsp.protocol.make_client_capabilities())
+            local capabilities = require("cmp_nvim_lsp").default_capabilities()
             if on_path("lua-language-server") then
                 require("lspconfig").sumneko_lua.setup({
                     capabilities = capabilities,

modules/services/secrets.nix

@@ -7,12 +7,6 @@
 
   options = {
 
-    identityFile = lib.mkOption {
-      type = lib.types.str;
-      description = "Path to existing identity file.";
-      default = "/etc/ssh/ssh_host_ed25519_key";
-    };
-
     secretsDirectory = lib.mkOption {
       type = lib.types.str;
       description = "Default path to place secrets.";