Compare commits

2 Commits

Author SHA1 Message Date
John Lancaster
6cd0bf2f93 fixed default ssh block warning 2025-12-07 10:27:31 -06:00
John Lancaster
1cc9ace520 added nixGL options to ghostty config 2025-12-07 10:27:05 -06:00
2 changed files with 24 additions and 3 deletions

View File

@@ -16,7 +16,7 @@
enableZshIntegration = true; enableZshIntegration = true;
package = config.lib.nixGL.wrap pkgs.ghostty; package = config.lib.nixGL.wrap pkgs.ghostty;
settings = { settings = {
# command = "TERM=xterm-256color /usr/bin/bash"; command = "TERM=xterm-256color /usr/bin/bash";
font-size = 12; font-size = 12;
font-family = "Source Code Pro"; font-family = "Source Code Pro";
# theme = "idleToes"; # theme = "idleToes";
@@ -58,7 +58,7 @@
name = "Ghostty"; name = "Ghostty";
type = "Application"; type = "Application";
comment = "A terminal emulator"; comment = "A terminal emulator";
exec = "ghostty"; exec = "nixGL ghostty";
icon = "com.mitchellh.ghostty"; icon = "com.mitchellh.ghostty";
terminal = false; terminal = false;
startupNotify = true; startupNotify = true;
@@ -75,7 +75,7 @@
actions = { actions = {
new-window = { new-window = {
name = "New Window"; name = "New Window";
exec = "ghostty"; exec = "nixGL ghostty";
}; };
}; };
}; };

View File

@@ -2,16 +2,29 @@
{ {
programs.ssh = lib.mkIf config.ssh { programs.ssh = lib.mkIf config.ssh {
enable = true; enable = true;
enableDefaultConfig = false;
extraConfig = '' extraConfig = ''
SetEnv TERM="xterm-256color" SetEnv TERM="xterm-256color"
${lib.optionalString config._1password "IdentityAgent ~/.1password/agent.sock"} ${lib.optionalString config._1password "IdentityAgent ~/.1password/agent.sock"}
''; '';
matchBlocks = lib.mkMerge [ matchBlocks = lib.mkMerge [
{
"*" = {
user = "john";
forwardAgent = true;
serverAliveInterval = 60;
serverAliveCountMax = 2;
};
}
(lib.mkIf (config.profile == "personal") { (lib.mkIf (config.profile == "personal") {
"ad-nix" = { "ad-nix" = {
hostname = "192.168.1.201"; hostname = "192.168.1.201";
user = "appdaemon"; user = "appdaemon";
}; };
"appdaemon" = {
hostname = "192.168.1.242";
user = "appdaemon";
};
"docs" = { "docs" = {
hostname = "192.168.1.110"; hostname = "192.168.1.110";
user = "root"; user = "root";
@@ -28,6 +41,10 @@
hostname = "192.168.1.107"; hostname = "192.168.1.107";
user = "root"; user = "root";
}; };
"platform-caddy" = {
hostname = "192.168.1.65";
user = "root";
};
"pve5070" = { "pve5070" = {
hostname = "192.168.1.130"; hostname = "192.168.1.130";
user = "root"; user = "root";
@@ -36,6 +53,10 @@
hostname = "192.168.1.36"; hostname = "192.168.1.36";
user = "john"; user = "john";
}; };
"z2m-nix" = {
hostname = "192.168.1.129";
user = "root";
};
}) })
(lib.mkIf (config.profile == "work") { (lib.mkIf (config.profile == "work") {
"ubuntu-nvidia" = { "ubuntu-nvidia" = {