From 03fbb438c3b3296295f0129a322e3170445da757 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Sun, 17 Dec 2023 18:32:56 +0000
Subject: [PATCH] Swap btop/htop for btm

---
 home/default.nix                 | 12 ------------
 home/hyprland/config.nix         | 13 +++++++++----
 home/hyprland/waybar/default.nix |  8 +++++---
 system/default.nix               |  6 ++----
 4 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/home/default.nix b/home/default.nix
index 775bea63..047bafc3 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -68,18 +68,6 @@
         set completion-ignore-case On
       '';
     };
-    btop = {
-      enable = true;
-      settings = {
-        color_theme = "tokyo-night";
-        theme_background = false;
-        graph_symbol = "braille";
-        update_ms = 1000;
-        proc_tree = true;
-        proc_colors = true;
-        proc_gradient = true;
-      };
-    };
     direnv = {
       enable = true;
       nix-direnv.enable = true;
diff --git a/home/hyprland/config.nix b/home/hyprland/config.nix
index 738cc100..1ddf9e30 100644
--- a/home/hyprland/config.nix
+++ b/home/hyprland/config.nix
@@ -193,10 +193,15 @@ in ''
   bind = SUPER ALT, W, exec, [workspace name:web] nyxt
   windowrule = workspace name:web, (firefox|chromium-browser)
 
-  bind = SUPER, T, moveworkspacetomonitor, name:top current
-  bind = SUPER, T, workspace, name:top
-  bind = SUPER SHIFT, T, movetoworkspace, name:top
-  bind = SUPER ALT, T, exec, [workspace name:top] alacritty -e btop
+  bind = SUPER, B, moveworkspacetomonitor, name:btm current
+  bind = SUPER, B, workspace, name:btm
+  bind = SUPER SHIFT, B, movetoworkspace, name:btm
+  bind = SUPER ALT, B, exec, [workspace name:btm] alacritty -e btm --battery
+
+  bind = SUPER, T, moveworkspacetomonitor, name:term current
+  bind = SUPER, T, workspace, name:term
+  bind = SUPER SHIFT, T, movetoworkspace, name:term
+  bind = SUPER ALT, T, exec, [workspace name:term] alacritty -e zellij
 
   bind = SUPER, A, moveworkspacetomonitor, name:apps current
   bind = SUPER, A, workspace, name:apps
diff --git a/home/hyprland/waybar/default.nix b/home/hyprland/waybar/default.nix
index 13210a17..a739cbb9 100644
--- a/home/hyprland/waybar/default.nix
+++ b/home/hyprland/waybar/default.nix
@@ -41,7 +41,8 @@
           "files" = "󰝰";
           "steam" = "󰓓";
           "apps" = "󰜫";
-          "top" = "";
+          "btm" = "";
+          "term" = "󰆍";
           "remote" = "󰢹";
           default = "󰋙";
           special = "󰁡";
@@ -51,10 +52,11 @@
       };
       "hyprland/window" = {
         rewrite = {
+          "Alacritty" = "󰆍";
           "(.*) - GNU Emacs(.*)" = " $1";
+          "Nyxt - (.*)" = "󰀹 $1";
           "(.*) — Mozilla Firefox" = "󰈹 $1";
           "(.*) - Chromium" = " $1";
-          "Nyxt - (.*)" = "󰀹 $1";
           "(.*) - Thunar" = "󰝰 $1";
           "(.*) - LibreOffice Writer" = "󰈙 $1";
           "(.*) - LibreOffice Calc" = "󰡱 $1";
@@ -62,13 +64,13 @@
           "(.*) - LibreOffice Base" = "󰆼 $1";
           "(.*) - LibreOffice Draw" = "󰽉 $1";
           "(.*) - LibreOffice Math" = "󰪚 $1";
+          "NoMachine - (.*)" = "󰢹 $1";
           "Microsoft Teams - (.*)" = "󰊻 $1";
           "Microsoft Teams classic" = "󰊻";
           "Microsoft 365 - (.*)" = "󰏆 $1";
           "Signal" = "󰒢";
           "whatsapp-for-linux" = "󰖣";
           "(.*)WebCord - (.*)" = "$1󰙯 $2";
-          "NoMachine - (.*)" = "󰢹 $1";
         };
         separate-outputs = true;
       };
diff --git a/system/default.nix b/system/default.nix
index 238e9e80..d7a21ede 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -18,14 +18,12 @@ in {
       dig
       du-dust
       nitch
+      bottom
     ];
     localBinInPath = true;
   };
   console.keyMap = "uk";
-  programs = {
-    htop.enable = true;
-    ssh.startAgent = true;
-  };
+  programs.ssh.startAgent = true;
   services = {
     upower.enable = true;
     power-profiles-daemon.enable = true;