diff options
Diffstat (limited to 'hosts')
| -rw-r--r-- | hosts/mercury/config.nix | 2 | ||||
| -rw-r--r-- | hosts/mercury/hjem.nix | 2 | ||||
| -rw-r--r-- | hosts/mercury/nixos.nix | 18 |
3 files changed, 12 insertions, 10 deletions
diff --git a/hosts/mercury/config.nix b/hosts/mercury/config.nix index e5e0b17..b122e5e 100644 --- a/hosts/mercury/config.nix +++ b/hosts/mercury/config.nix @@ -62,7 +62,7 @@ tmux.enable = true; lazygit.enable = true; - nh.enable = true; + # nh.enable = true; git = { enable = true; userName = "Collin Williams"; diff --git a/hosts/mercury/hjem.nix b/hosts/mercury/hjem.nix index 72026c5..cc6034d 100644 --- a/hosts/mercury/hjem.nix +++ b/hosts/mercury/hjem.nix @@ -22,6 +22,8 @@ captive-browser # https://words.filippo.io/captive-browser inputs.glide-browser.packages."x86_64-linux".default + + (pkgs.callPackage ../../pkgs/yoshi.nix {inherit inputs;}) ]; files.".config/captive-browser.toml".text = '' diff --git a/hosts/mercury/nixos.nix b/hosts/mercury/nixos.nix index 6d269fe..da8b647 100644 --- a/hosts/mercury/nixos.nix +++ b/hosts/mercury/nixos.nix @@ -33,21 +33,21 @@ programs.ssh.extraConfig = '' Host ganymede - HostName williamsfam.us.com - User collin - IdentityFile /home/collin/.ssh/id_ed25519 LocalForward 8010 127.0.0.1:8010 + + Match host ganymede !exec "nc -z -w1 192.168.50.2 2222" + HostName williamsfam.us.com + Port 22 DynamicForward 9090 - Host ganymede-deploy - HostName 192.168.0.2 - User root - IdentityFile /home/collin/.ssh/id_ed25519 + Match host ganymede exec "nc -z -w1 192.168.50.2 2222" + HostName 192.168.50.2 + Port 2222 Host io Hostname 192.168.50.3 - User admin - IdentityFile /home/collin/.ssh/id_ed25519 + + Match host io !exec "nc -z -w1 192.168.50.3 22" ProxyJump ganymede ''; } |