diff --git a/modules/services/ssh.nix b/modules/services/ssh.nix index bca460c..248d54b 100644 --- a/modules/services/ssh.nix +++ b/modules/services/ssh.nix @@ -3,11 +3,10 @@ in { options.modules.programs.ssh.enable = mkEnableOption "ssh"; config = { + # set the ssh socket globally. This alows all applications and shells to use + # the ssh-agent. + environment.sessionVariables.SSH_AUTH_SOCK = "/run/user/1000/ssh-agent"; programs.ssh.startAgent = true; - # programs.ssh.pubkeyAcceptedKeyTypes = [ - # "ssh-rsa" - # "ecdsa-sha2-nistp521" - # ]; services.openssh = { enable = true; diff --git a/packages/helix.nix b/packages/helix.nix index 46d8f11..eb91eb6 100644 --- a/packages/helix.nix +++ b/packages/helix.nix @@ -263,7 +263,7 @@ basedpyright.command = "${basedpyright}/bin/basedpyright-langserver"; vscode-css-language-server = { - command = "${vscode-langservers-extracted}/bin/vscode-css-languageserver"; + command = "${vscode-langservers-extracted}/bin/vscode-css-language-server"; args = ["--stdio"]; config = { provideFormatter = true; diff --git a/packages/shell/default.nix b/packages/shell/default.nix index 6408291..94dbc91 100644 --- a/packages/shell/default.nix +++ b/packages/shell/default.nix @@ -28,7 +28,6 @@ in buildInputs = [pkgs.makeWrapper]; postBuild = '' wrapProgram $out/bin/fish --set STARSHIP_CONFIG "${toml.generate "starship.toml" starship-config}" \ - --set SSH_AUTH_SOCK /run/user/1000/ssh-agent \ ''; }) .overrideAttrs (_: {