fix(pkg): use bottom process/system monitor

natelandau · Sep 21, 2024 · 816f20e · 816f20e
1 parent c576f71
commit 816f20e
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 22 deletions.
diff --git a/dotfiles/.chezmoidata/binaries.toml b/dotfiles/.chezmoidata/binaries.toml
@@ -8,33 +8,44 @@
 #   required_architecture (optional): The architecture required for the binary. If the current architecture does not match, the binary will not be installed. Must match .chezmoi.arch.
 
 [binaries]
-    [binaries.rip2]
-        name                  = "rip"
-        repository            = "MilesCranmer/rip2"
-        required_architecture = ""
-        systems               = ["darwin", "linux"]
-        version_regex         = ""
-    [binaries.lazygit]
-        name                  = "lazygit"
-        repository            = "jesseduffield/lazygit"
+    [binaries.bottom]
+        name                  = "bottom"
+        repository            = "ClementTsang/bottom"
         required_architecture = ""
         systems               = ["linux"]
-        version_regex         = "version=(.*?),"
+        version_regex         = ""
+
     [binaries.git-delta]
         name                  = "delta"
         repository            = "dandavison/delta"
         required_architecture = ""
         systems               = ["linux"]
         version_regex         = ""
-    [binaries.zoxide]
-        name                  = "zoxide"
-        repository            = "ajeetdsouza/zoxide"
+
+    [binaries.lazygit]
+        name                  = "lazygit"
+        repository            = "jesseduffield/lazygit"
         required_architecture = ""
         systems               = ["linux"]
-        version_regex         = ""
+        version_regex         = "version=(.*?),"
+
     [binaries.otree]
         name                  = "otree"
         repository            = "fioncat/otree"
         required_architecture = "amd64"
         systems               = ["linux"]
         version_regex         = ""
+
+    [binaries.rip2]
+        name                  = "rip"
+        repository            = "MilesCranmer/rip2"
+        required_architecture = ""
+        systems               = ["darwin", "linux"]
+        version_regex         = ""
+
+    [binaries.zoxide]
+        name                  = "zoxide"
+        repository            = "ajeetdsouza/zoxide"
+        required_architecture = ""
+        systems               = ["linux"]
+        version_regex         = ""
diff --git a/dotfiles/.chezmoidata/packages.toml b/dotfiles/.chezmoidata/packages.toml
@@ -1,10 +1,9 @@
 [packages.apt]
-    to_remove = []
+    to_remove = ["btop", "htop"]
     [packages.apt.common]
         packages = [
             "apt-transport-https",
             "bat",                 # cat with syntax highlighting and Git integration
-            "btop",
             "curl",
             "dnsutils",
             "fd-find",
@@ -14,7 +13,6 @@
             "git-extras",
             "gnupg",
             "gpg",
-            "htop",
             "jq",
             "logrotate",
             "lolcat",
@@ -49,7 +47,7 @@
     [packages.python.personal_computer]
         packages = ["jdfile", "trash-cli", "vid-cleaner"]
 [packages.homebrew]
-    to_remove = ["istat-menus", "rocket", "shotrr"]
+    to_remove = ["btop", "htop", "istat-menus", "rocket", "shotrr"]
     [packages.homebrew.common]
         casks = [
             "1password",
@@ -73,7 +71,7 @@
             "bash",
             "bash-completion",
             "bat",             # cat with syntax highlighting and Git integration
-            "btop",            # top but better
+            "bottom",          # Process/system monitor for the terminal.
             "chezmoi",         # Dotfile manager
             "coreutils",
             "eza",             # ls replacement
@@ -88,7 +86,6 @@
             "gnutls",          # GNU Transport Layer Security (TLS) Library
             "gping",           # Ping, but with a graph
             "grep",
-            "htop",            # Improved top (interactive process viewer)
             "jq",              # Lightweight and flexible command-line JSON processor
             "mas",             # Mac App Store command-line interface
             "mc",              # Midnight Commander

diff --git a/dotfiles/dot_shell/sourced/070-better-defaults.sh.tmpl b/dotfiles/dot_shell/sourced/070-better-defaults.sh.tmpl
@@ -22,8 +22,8 @@ alias ping="gping"
 alias ping="prettyping --nolegend"
 {{- end }}
 
-{{- if lookPath "htop" }}
-alias top="htop" # Prefer `htop` over `top`
+{{- if lookPath "btm" }}
+alias top="btm" # Prefer `bottom` over `top`
 {{- end }}
 
 {{- if lookPath "bat" }}