diff --git a/home/btop/default.nix b/home/btop/default.nix
new file mode 100644
index 0000000..20fed9e
--- /dev/null
+++ b/home/btop/default.nix
@@ -0,0 +1,13 @@
+{
+  # https://github.com/catppuccin/btop/blob/main/themes/catppuccin_mocha.theme
+  xdg.configFile."btop/themes".source = ./themes;
+
+  # replacement of htop/nmon
+  programs.btop = {
+    enable = true;
+    settings = {
+      color_theme = "catppuccin_mocha";
+      theme_background = true;
+    };
+  };
+}
\ No newline at end of file
diff --git a/home/btop/themes/catppuccin_mocha.theme b/home/btop/themes/catppuccin_mocha.theme
new file mode 100644
index 0000000..560b5a1
--- /dev/null
+++ b/home/btop/themes/catppuccin_mocha.theme
@@ -0,0 +1,83 @@
+# Main background, empty for terminal default, need to be empty if you want transparent background
+theme[main_bg]="#1e1e2e"
+
+# Main text color
+theme[main_fg]="#cdd6f4"
+
+# Title color for boxes
+theme[title]="#cdd6f4"
+
+# Highlight color for keyboard shortcuts
+theme[hi_fg]="#89b4fa"
+
+# Background color of selected item in processes box
+theme[selected_bg]="#45475a"
+
+# Foreground color of selected item in processes box
+theme[selected_fg]="#89b4fa"
+
+# Color of inactive/disabled text
+theme[inactive_fg]="#7f849c"
+
+# Color of text appearing on top of graphs, i.e uptime and current network graph scaling
+theme[graph_text]="#f5e0dc"
+
+# Background color of the percentage meters
+theme[meter_bg]="#45475a"
+
+# Misc colors for processes box including mini cpu graphs, details memory graph and details status text
+theme[proc_misc]="#f5e0dc"
+
+# CPU, Memory, Network, Proc box outline colors
+theme[cpu_box]="#cba6f7" #Mauve
+theme[mem_box]="#a6e3a1" #Green
+theme[net_box]="#eba0ac" #Maroon
+theme[proc_box]="#89b4fa" #Blue
+
+# Box divider line and small boxes line color
+theme[div_line]="#6c7086"
+
+# Temperature graph color (Green -> Yellow -> Red)
+theme[temp_start]="#a6e3a1"
+theme[temp_mid]="#f9e2af"
+theme[temp_end]="#f38ba8"
+
+# CPU graph colors (Teal -> Lavender)
+theme[cpu_start]="#94e2d5"
+theme[cpu_mid]="#74c7ec"
+theme[cpu_end]="#b4befe"
+
+# Mem/Disk free meter (Mauve -> Lavender -> Blue)
+theme[free_start]="#cba6f7"
+theme[free_mid]="#b4befe"
+theme[free_end]="#89b4fa"
+
+# Mem/Disk cached meter (Sapphire -> Lavender)
+theme[cached_start]="#74c7ec"
+theme[cached_mid]="#89b4fa"
+theme[cached_end]="#b4befe"
+
+# Mem/Disk available meter (Peach -> Red)
+theme[available_start]="#fab387"
+theme[available_mid]="#eba0ac"
+theme[available_end]="#f38ba8"
+
+# Mem/Disk used meter (Green -> Sky)
+theme[used_start]="#a6e3a1"
+theme[used_mid]="#94e2d5"
+theme[used_end]="#89dceb"
+
+# Download graph colors (Peach -> Red)
+theme[download_start]="#fab387"
+theme[download_mid]="#eba0ac"
+theme[download_end]="#f38ba8"
+
+# Upload graph colors (Green -> Sky)
+theme[upload_start]="#a6e3a1"
+theme[upload_mid]="#94e2d5"
+theme[upload_end]="#89dceb"
+
+# Process box color gradient for threads, mem and cpu usage (Sapphire -> Mauve)
+theme[process_start]="#74c7ec"
+theme[process_mid]="#b4befe"
+theme[process_end]="#cba6f7"
\ No newline at end of file
diff --git a/home/default.nix b/home/default.nix
index fc9569c..c579e9c 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -29,6 +29,7 @@
         ./hyprland.nix
         ./git.nix
         ./waybar
+        ./btop
         ./dunst.nix
         ./wofi.nix
         ./swaylock.nix
diff --git a/home/git.nix b/home/git.nix
index fb898c8..8c7d3ad 100644
--- a/home/git.nix
+++ b/home/git.nix
@@ -3,5 +3,9 @@
     enable = true;
     userName = "EinEtwas";
     userEmail = "ein@etwas.me";
+
+    extraConfig = {
+      push.autoSetupRemote = true;
+    };
   };
 }
diff --git a/home/packages.nix b/home/packages.nix
index e0c0017..5801dbb 100644
--- a/home/packages.nix
+++ b/home/packages.nix
@@ -6,6 +6,7 @@
     polkit_gnome
     gh # github
     easyeffects
+    hyfetch
 
     # For Hyprland hotkeys:
     brightnessctl