From 680e0a37a9fc3b6b152945e775ee2e4ea6c1d76b Mon Sep 17 00:00:00 2001
From: Don Harper <duck@duckland.org>
Date: Thu, 2 May 2024 06:15:09 -0500
Subject: [PATCH] updates from makefile

---
 flake.lock                          | 24 ++++++++++++------------
 home/common/default.nix             |  2 +-
 home/common/files/bash/bash_aliases |  1 +
 home/common/tmux.nix                |  6 +++---
 4 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/flake.lock b/flake.lock
index 9a950ee..f80eadd 100644
--- a/flake.lock
+++ b/flake.lock
@@ -77,11 +77,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1714203603,
-        "narHash": "sha256-eT7DENhYy7EPLOqHI9zkIMD9RvMCXcqh6gGqOK5BWYQ=",
+        "lastModified": 1714515075,
+        "narHash": "sha256-azMK7aWH0eUc3IqU4Fg5rwZdB9WZBvimOGG3piqvtsY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "c1609d584a6b5e9e6a02010f51bd368cb4782f8e",
+        "rev": "6d3b6dc9222c12b951169becdf4b0592ee9576ef",
         "type": "github"
       },
       "original": {
@@ -117,11 +117,11 @@
         "pre-commit-hooks": "pre-commit-hooks"
       },
       "locked": {
-        "lastModified": 1714168167,
-        "narHash": "sha256-4AwaLB/gTRgvZG4FmFY6OY52yeLAnj0a6rtJCz7TRXA=",
+        "lastModified": 1714573981,
+        "narHash": "sha256-ymiQ5wVKMD3YuHpAmBDXHJJm2e3o9A5tVYsPlhC6UWg=",
         "owner": "NixOS",
         "repo": "nix",
-        "rev": "2f678331d59451dd6f1d9512cb6d92e4ecb9750f",
+        "rev": "e17aad23d64fb53879ec20c060db4a33378a86b3",
         "type": "github"
       },
       "original": {
@@ -131,11 +131,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1714201532,
-        "narHash": "sha256-nk0W4rH7xYdDeS7k1SqqNtBaNrcgIBYNmOVc8P2puEY=",
+        "lastModified": 1714465198,
+        "narHash": "sha256-ySkEJvS0gPz2UhXm0H3P181T8fUxvDVcoUyGn0Kc5AI=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "53db5e1070d07e750030bf65f1b9963df8f0c678",
+        "rev": "68d680c1b7c0e67a9b2144d6776583ee83664ef4",
         "type": "github"
       },
       "original": {
@@ -295,11 +295,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1712274476,
-        "narHash": "sha256-REwWVCN4VQB1XrxSk2nsggIw82OILzsU4Mq5FYXIIOU=",
+        "lastModified": 1714516127,
+        "narHash": "sha256-Bw41y7mnlp6ZCYKKHtqVZtV6naydifdZPXVTTyxUyOA=",
         "owner": "rafaelrc7",
         "repo": "wayland-pipewire-idle-inhibit",
-        "rev": "5b8c23f28c1e4c2fde8477a1783d997d83f38f1d",
+        "rev": "9a0d1994f4252e45222f7a99ebf125d06541975c",
         "type": "github"
       },
       "original": {
diff --git a/home/common/default.nix b/home/common/default.nix
index 2558bfd..483d9bd 100644
--- a/home/common/default.nix
+++ b/home/common/default.nix
@@ -27,6 +27,7 @@
     cargo
     diff-so-fancy
     exiftool
+    fastfetch
     fbterm
     ffmpeg
     figlet
@@ -56,7 +57,6 @@
     mosh
     mutt-ics
     ncdu
-    neofetch
     neomutt
     nmap
     #nodejs_21
diff --git a/home/common/files/bash/bash_aliases b/home/common/files/bash/bash_aliases
index 9f61af8..398b7a2 100755
--- a/home/common/files/bash/bash_aliases
+++ b/home/common/files/bash/bash_aliases
@@ -7,6 +7,7 @@ alias ls="ls -hCF"
 alias l="ls -l"
 alias df="df -h -x squashfs"
 alias du="du -h" 
+alias neofetch="fastfetch"
 if [ -x /home/don/.local/bin/dotdrop ]
 then
 	alias dotdrop="/home/don/.local/bin/dotdrop -c ~/.dotfiles/config.yaml"
diff --git a/home/common/tmux.nix b/home/common/tmux.nix
index e55346e..df1dde0 100644
--- a/home/common/tmux.nix
+++ b/home/common/tmux.nix
@@ -135,9 +135,9 @@
         local:-sc harper.tail -sc mini.tail -sc display.tail -sc harper2.tail -sc pihole.tail -sc fred.tail
         server:-cs vps -cs local
         laptop:-sc loki.tail -sc dragon.tail
-        arch:-sc harper.tail -sc pocket2.tail -sc pihole.tail -sc nuwww.tail -sc display.tail -sc fred.tail
-        nix:-sc loki.tail  -sc eve.tail -sc dragon.tail -sc smaug.tail
-        nix-all:-sc loki.tail  -sc eve.tail -sc dragon.tail -sc smaug.tail -sc ace.tail -sc pocket2.tail
+        arch:-sc harper.tail -sc pihole.tail -sc nuwww.tail -sc display.tail 
+        nix:-sc loki.tail  -sc eve.tail -sc smaug.tail
+        nix-all:-sc loki.tail  -sc eve.tail -sc dragon.tail -sc smaug.tail -sc ace.tail -sc pocket2.tail -sc fred.tail
         ubuntu:-sc mini.tail -sc www.tail -sc harper2.tail
         vm:-sc vm1 -sc vm2
         all-laptop:-cs laptop -sc smaug.tail -sc dragon.tail -sc pocket2.tail -sc ace.tail -sc eve.tail