From a6d1f611c0c342f3c12ab61aaabce543efdbdbc2 Mon Sep 17 00:00:00 2001
From: Jeffrey Serio <hyperreal@moonshadow.dev>
Date: Mon, 9 Sep 2024 21:34:01 -0500
Subject: [PATCH] Tidy up

---
 home.nix | 44 +++++++++++++++++---------------------------
 1 file changed, 17 insertions(+), 27 deletions(-)

diff --git a/home.nix b/home.nix
index a4ff651..03a4dc9 100644
--- a/home.nix
+++ b/home.nix
@@ -17,26 +17,19 @@
   # environment.
   home.packages = with pkgs; [
     arp-scan
-    bat
     diskonaut
     doggo
     dust
-    emacs28
-    fd
-    glances
     glow
     gum
-    html-tidy
     hyfetch
     hyperfine
     just
-    lsd
     nixfmt-rfc-style
-    parallel
     starship
-    tealdeer
     vivid
     wthrr
+    yazi
     zellij
   ];
 
@@ -87,40 +80,37 @@
   # ssh config
   programs.ssh.enable = true;
   programs.ssh.matchBlocks = {
-    "nixos.tail7dd4a.ts.net" = {
-      hostname = "nixos.tail7dd4a.ts.net";
+    "auxnc-8g" = {
+      hostname = "auxnc-8g.lyrebird-marlin.ts.net";
       user = "jas";
-      identityFile = "~/.ssh/id_ed25519";
     };
-    "thedas.tail7dd4a.ts.net" = {
-      hostname = "thedas.tail7dd4a.ts.net";
+    "auxnc-96g" = {
+      hostname = "auxnc-96g.lyrebird-marlin.ts.net";
       user = "jas";
-      identityFile = "~/.ssh/id_ed25519";
-    };
-    "aux-vm" = {
-      hostname = "10.0.0.26";
-      user = "jas";
-      identityFile = "~/.ssh/id_ed25519";
     };
     "bttracker.nirn.quest" = {
       hostname = "bttracker.nirn.quest";
       user = "jas";
-      identityFile = "~/.ssh/id_ed25519";
+    };
+    "desktop" = {
+      hostname = "desktop.lyrebird-marlin.ts.net";
+      user = "jas";
     };
     "hyperreal.coffee" = {
       hostname = "hyperreal.coffee";
       user = "jas";
-      identityFile = "~/.ssh/id_ed25519";
     };
-    "qbittorrent" = {
-      hostname = "10.0.0.82";
+    "laptop" = {
+      hostname = "laptop.lyrebird-marlin.ts.net";
       user = "jas";
-      identityFile = "~/.ssh/id_ed25519";
     };
-    "truenas" = {
-      hostname = "10.0.0.81";
+    "nas-vm" = {
+      hostname = "nas-vm.lyrebird-marlin.ts.net";
+      user = "jas";
+    };
+    "nas" = {
+      hostname = "nas.lyrebird-marlin.ts.net";
       user = "admin";
-      identityFile = "~/.ssh/id_ed25519";
     };
   };