john/dendritic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: john/dendritic:6e27e92f89e7f1d900f1d282968951c3b9248c47
Branches Tags
john/dendritic:main john/dendritic:omen john/dendritic:wrappers john/dendritic:forgejo
...
compare: john/dendritic:bcd07532db37025458d30ba2b2c99b257bdfe1d1
Branches Tags
john/dendritic:omen john/dendritic:wrappers john/dendritic:main john/dendritic:forgejo

2 Commits
6e27e92f89 ... bcd07532db

Author SHA1 Message Date
John Lancaster bcd07532db flake.lock update 2026-06-13 10:06:46 -05:00
John Lancaster 2861c460c2 ssh updates 2026-06-13 10:05:50 -05:00
2 changed files with 45 additions and 53 deletions
Expand all files Collapse all files
flake.lock
Generated
+3 -3
View File
@@ -518,11 +518,11 @@
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1781348802, "lastModified": 1781362949,
"narHash": "sha256-XUHOqeWwU9CbUhNKBoA/Vjm5wIcpB2cF7Ll1eQrGtts=", "narHash": "sha256-kgSfxqUoV3i4LUOAg2yrusFtaT90ZA610U4Vj2tUMFo=",
"owner": "notashelf", "owner": "notashelf",
"repo": "nvf", "repo": "nvf",
"rev": "40c37ff2f79089f1cc8fcd35d3c837e2401521cf", "rev": "4d990efc21ab10d83bffc78d6645f7f32fa46491",
"type": "github" "type": "github"
}, },
"original": { "original": {
modules/services/ssh.nix
+42 -50
View File
@@ -126,98 +126,90 @@ in
SetEnv TERM="xterm-256color" SetEnv TERM="xterm-256color"
''; '';
matchBlocks = lib.mkMerge [ settings = lib.mkMerge [
{ {
"john-pc-ubuntu" = { "john-pc-ubuntu" = {
hostname = "192.168.1.85"; HostName = "192.168.1.85";
}; };
"*" = lib.mkMerge [ "*" = lib.mkMerge [
{ {
user = "john"; User = "john";
identityAgent = "${config.home.homeDirectory}/.1password/agent.sock"; IdentityAgent = "${config.home.homeDirectory}/.1password/agent.sock";
compression = false; Compression = false;
serverAliveInterval = 0; ServerAliveInterval = 0;
serverAliveCountMax = 3; ServerAliveCountMax = 3;
identitiesOnly = true; IdentitiesOnly = true;
inherit identityFile; IdentityFile = identityFile;
hashKnownHosts = false; HashKnownHosts = false;
userKnownHostsFile = cfg.knownHostsFile; UserKnownHostsFile = cfg.knownHostsFile;
addKeysToAgent = "yes"; AddKeysToAgent = "yes";
forwardAgent = false; ForwardAgent = false;
} }
(lib.mkIf cfg.certificates.enable { inherit certificateFile; }) (lib.mkIf cfg.certificates.enable { CertificateFile = certificateFile; })
]; ];
} }
(lib.mkIf cfg.matchSets.appdaemon { (lib.mkIf cfg.matchSets.appdaemon {
"appdaemon" = { "appdaemon" = {
hostname = "192.168.1.242"; HostName = "192.168.1.242";
user = "appdaemon"; User = "appdaemon";
}; };
"ad-nix" = { "ad-nix" = {
hostname = "192.168.1.201"; HostName = "192.168.1.201";
user = "appdaemon"; User = "appdaemon";
}; };
}) })
(lib.mkIf cfg.matchSets.certs { (lib.mkIf cfg.matchSets.certs {
"janus" = { "janus" = {
hostname = "janus.john-stream.com"; HostName = "janus.john-stream.com";
user = "root"; User = "root";
}; };
"soteria" = { "soteria" = {
hostname = "soteria.john-stream.com"; HostName = "soteria.john-stream.com";
user = "john"; User = "john";
}; };
}) })
(lib.mkIf cfg.matchSets.homelab { (lib.mkIf cfg.matchSets.homelab {
"docs" = { "docs" = {
hostname = "192.168.1.110"; HostName = "192.168.1.110";
user = "root"; User = "root";
extraOptions = { RequestTTY = "force";
RequestTTY = "force"; RemoteCommand = "~/.nix-profile/bin/jsl-zsh";
RemoteCommand = "~/.nix-profile/bin/jsl-zsh";
};
}; };
"gitea" = { "gitea" = {
hostname = "192.168.1.104"; HostName = "192.168.1.104";
user = "john"; User = "john";
}; };
"hermes" = { "hermes" = {
hostname = "192.168.1.150"; HostName = "192.168.1.150";
user = "root"; User = "root";
# Enabling this breaks the ability of Zed to install its remote stuff # Enabling this breaks the ability of Zed to install its remote stuff
# extraOptions = { # RequestTTY = "force";
# RequestTTY = "force"; # RemoteCommand = "/root/.nix-profile/bin/jsl-zsh";
# RemoteCommand = "/root/.nix-profile/bin/jsl-zsh";
# };
}; };
"panoptes" = { "panoptes" = {
hostname = "192.168.1.107"; HostName = "192.168.1.107";
user = "panoptes"; User = "panoptes";
}; };
}) })
(lib.mkIf cfg.matchSets.dev { (lib.mkIf cfg.matchSets.dev {
"test-nix" = { "test-nix" = {
hostname = "fded:fb16:653e:25da:be24:11ff:fea0:753f"; HostName = "fded:fb16:653e:25da:be24:11ff:fea0:753f";
user = "john"; User = "john";
extraOptions = { RequestTTY = "auto";
RequestTTY = "auto"; # RemoteCommand = "/run/current-system/sw/bin/jsl-zsh";
# RemoteCommand = "/run/current-system/sw/bin/jsl-zsh";
};
}; };
}) })
(lib.mkIf cfg.matchSets.tailscale { (lib.mkIf cfg.matchSets.tailscale {
"jdl-docker" = { "jdl-docker" = {
hostname = "jdl-docker.tailcf205.ts.net"; HostName = "jdl-docker.tailcf205.ts.net";
user = "john"; User = "john";
extraOptions = { RequestTTY = "auto";
RequestTTY = "auto"; # RemoteCommand = "~/.nix-profile/bin/jsl-zsh";
# RemoteCommand = "~/.nix-profile/bin/jsl-zsh";
};
}; };
}) })
]; ];