Compare commits
2 commits
863eb41a1d
...
3a3dc55f01
Author | SHA1 | Date | |
---|---|---|---|
3a3dc55f01 | |||
09d2901003 |
3 changed files with 4 additions and 6 deletions
|
@ -3,11 +3,10 @@
|
||||||
in {
|
in {
|
||||||
options.modules.programs.ssh.enable = mkEnableOption "ssh";
|
options.modules.programs.ssh.enable = mkEnableOption "ssh";
|
||||||
config = {
|
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.startAgent = true;
|
||||||
# programs.ssh.pubkeyAcceptedKeyTypes = [
|
|
||||||
# "ssh-rsa"
|
|
||||||
# "ecdsa-sha2-nistp521"
|
|
||||||
# ];
|
|
||||||
|
|
||||||
services.openssh = {
|
services.openssh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
|
@ -263,7 +263,7 @@
|
||||||
basedpyright.command = "${basedpyright}/bin/basedpyright-langserver";
|
basedpyright.command = "${basedpyright}/bin/basedpyright-langserver";
|
||||||
|
|
||||||
vscode-css-language-server = {
|
vscode-css-language-server = {
|
||||||
command = "${vscode-langservers-extracted}/bin/vscode-css-languageserver";
|
command = "${vscode-langservers-extracted}/bin/vscode-css-language-server";
|
||||||
args = ["--stdio"];
|
args = ["--stdio"];
|
||||||
config = {
|
config = {
|
||||||
provideFormatter = true;
|
provideFormatter = true;
|
||||||
|
|
|
@ -28,7 +28,6 @@ in
|
||||||
buildInputs = [pkgs.makeWrapper];
|
buildInputs = [pkgs.makeWrapper];
|
||||||
postBuild = ''
|
postBuild = ''
|
||||||
wrapProgram $out/bin/fish --set STARSHIP_CONFIG "${toml.generate "starship.toml" starship-config}" \
|
wrapProgram $out/bin/fish --set STARSHIP_CONFIG "${toml.generate "starship.toml" starship-config}" \
|
||||||
--set SSH_AUTH_SOCK /run/user/1000/ssh-agent \
|
|
||||||
'';
|
'';
|
||||||
})
|
})
|
||||||
.overrideAttrs (_: {
|
.overrideAttrs (_: {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue