From b646675328666b3f7856040b5327439c74e85852 Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Tue, 25 Feb 2025 14:03:03 +1000 Subject: [PATCH] ssh host changes for lolcathost and hyrule --- homes/me/default.nix | 21 ++++++++++----------- homes/subspace/default.nix | 19 +++++++++++++++++-- hosts/hyrule/default.nix | 3 +-- hosts/lolcathost/default.nix | 1 + hosts/myputer/default.nix | 1 + 5 files changed, 30 insertions(+), 15 deletions(-) diff --git a/homes/me/default.nix b/homes/me/default.nix index 2636693..b469574 100755 --- a/homes/me/default.nix +++ b/homes/me/default.nix @@ -11,7 +11,6 @@ }; imports = [ - #inputs.hyprpanel.packages.homeManagerModules.hyprpanel ../modules/git.nix ../modules/bat.nix ../modules/fish.nix @@ -23,7 +22,7 @@ ../modules/nixcord.nix #../modules/hypr/hypridle.nix - #../modules/hypr/hyprlock.nix + ../modules/hypr/hyprlock.nix ../modules/kanshi.nix ../modules/ags ]; @@ -126,6 +125,15 @@ port = 22; identityFile = "~/.ssh/id_subspace"; }; + dead = { + hostname = "deadlyserver.com"; + user = "emile"; + port = 29843; + identityFile = "~/.ssh/id_deadlyserver"; + setEnv = { + TERM = "xterm-256color"; + }; + }; youcue = { hostname = "moss.labs.eait.uq.edu.au"; user = "s4740056"; @@ -135,15 +143,6 @@ TERM = "xterm-256color"; }; }; - deadlyserver = { - hostname = "deadlyserver.com"; - user = "emile"; - port = 29843; - identityFile = "~/.ssh/id_deadlyserver"; - setEnv = { - TERM = "xterm-256color"; - }; - }; }; }; diff --git a/homes/subspace/default.nix b/homes/subspace/default.nix index 6b1c0fa..4cda2a2 100644 --- a/homes/subspace/default.nix +++ b/homes/subspace/default.nix @@ -35,18 +35,33 @@ forwardAgent = true; addKeysToAgent = "yes"; - matchBlocks = { + machBlocks = { hyrule = { hostname = "imbored.dev"; user = "ae"; port = 22; identityFile = "~/.ssh/id_hyrule"; + setEnv = { + TERM = "linux"; + }; }; - YearnForTheMines = { + dead = { hostname = "deadlyserver.com"; user = "emile"; port = 29843; identityFile = "~/.ssh/id_deadlyserver"; + setEnv = { + TERM = "xterm-256color"; + }; + }; + youcue = { + hostname = "moss.labs.eait.uq.edu.au"; + user = "s4740056"; + port = 22; + identityFile = "~/.ssh/id_youcue"; + setEnv = { + TERM = "xterm-256color"; + }; }; }; }; diff --git a/hosts/hyrule/default.nix b/hosts/hyrule/default.nix index 11048b6..c2c0461 100755 --- a/hosts/hyrule/default.nix +++ b/hosts/hyrule/default.nix @@ -450,10 +450,9 @@ in { }; environment.systemPackages = with pkgs; [ + git vim helix - - #wishlist ]; programs = { diff --git a/hosts/lolcathost/default.nix b/hosts/lolcathost/default.nix index c06299d..b348b47 100755 --- a/hosts/lolcathost/default.nix +++ b/hosts/lolcathost/default.nix @@ -229,6 +229,7 @@ in { acpi vim powertop + gcc # Unix Commands wget diff --git a/hosts/myputer/default.nix b/hosts/myputer/default.nix index 117cfee..7e8c5ce 100755 --- a/hosts/myputer/default.nix +++ b/hosts/myputer/default.nix @@ -213,6 +213,7 @@ in { acpi vim nix-prefetch-git + gcc # Unix Commands wget