wsl fixes

hosts/common.nix

@@ -21,6 +21,11 @@
           if pkgs.stdenv.isDarwin then "$HOME/Downloads" else "$HOME/downloads";
       };
     };
+    identityFile = lib.mkOption {
+      type = lib.types.str;
+      description = "Path to existing identity file.";
+      default = "/etc/ssh/ssh_host_ed25519_key";
+    };
     gui = {
       enable = mkEnableOption {
         description = "Enable graphics";
@@ -39,6 +44,7 @@
       else
         "/home/${config.user}");
     };
+
     dotfilesPath = mkOption {
       type = types.path;
       description = "Path of dotfiles repository.";
@@ -55,10 +61,8 @@
     };
   };
 
-  config =
-    let stateVersion = "22.11";
-    in
-    {
+  config = let stateVersion = "22.11";
+  in {
 
     # Enable features in Nix commands
     nix.extraOptions = "experimental-features = nix-command flakes";

hosts/desktop/default.nix

@@ -12,6 +12,7 @@ nixpkgs.lib.nixosSystem {
       nixpkgs.overlays = [ nur.overlay ];
       # Set registry to flake packages, used for nix X commands
       nix.registry.nixpkgs.flake = nixpkgs;
+      identityFile = "/home/${globals.user}/.ssh/id_ed25519";
       gaming.steam = true;
       gaming.leagueoflegends = true;
       gaming.legendary = true;

hosts/macbook/default.nix

@@ -12,6 +12,7 @@ darwin.lib.darwinSystem {
     })
     home-manager.darwinModules.home-manager
     {
+      identityFile = "/home/${globals.user}/.ssh/id_ed25519";
       gui.enable = true;
       colorscheme = (import ../../modules/colorscheme/gruvbox);
       mailUser = globals.user;

hosts/wsl/default.nix

@@ -12,6 +12,7 @@ nixpkgs.lib.nixosSystem {
       networking.hostName = "wsl";
       # Set registry to flake packages, used for nix X commands
       nix.registry.nixpkgs.flake = nixpkgs;
+      identityFile = "/home/${globals.user}/.ssh/id_ed25519";
       gui.enable = false;
       colorscheme = (import ../../modules/colorscheme/gruvbox);
       passwordHash =

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.";