3 files changed, 32 insertions, 30 deletions
diff --git a/modules/terminal/hjem/programs/broot.nix b/modules/terminal/hjem/programs/broot.nix
index 59f16aa..cd425bd 100644
--- a/modules/terminal/hjem/programs/broot.nix
+++ b/modules/terminal/hjem/programs/broot.nix
@@ -7,9 +7,10 @@
   cfg = config.collinux.terminal.programs.broot;
 
   conf = {
-    imports = [
-      "skins/catppuccin-mocha.hjson"
-    ];
+    imports =
+      if config.collinux.theme == "catppuccin"
+      then ["skins/catppuccin-mocha.hjson"]
+      else ["skins/dark-gruvbox.hjson"];
 
     default_flags = "-g";
     icon_theme = "nerdfont";
diff --git a/modules/terminal/hjem/programs/git.nix b/modules/terminal/hjem/programs/git.nix
index 918381c..85db4ab 100644
--- a/modules/terminal/hjem/programs/git.nix
+++ b/modules/terminal/hjem/programs/git.nix
@@ -8,15 +8,16 @@
 
   git_config = lib.mkMerge [
     {
+      user = {
+        email = cfg.userEmail;
+        name = cfg.userName;
+      };
       alias = {
         stage = "add";
         unstage = "restore --staged";
       };
       init.defaultBranch = "main";
-      user = {
-        email = cfg.userEmail;
-        name = cfg.userName;
-      };
+      push.autoSetupRemote = true;
     }
     (lib.mkIf cfg.installKey {
       # commit signing
diff --git a/modules/terminal/hjem/programs/tmux.nix b/modules/terminal/hjem/programs/tmux.nix
index 2c87212..2d7155e 100644
--- a/modules/terminal/hjem/programs/tmux.nix
+++ b/modules/terminal/hjem/programs/tmux.nix
@@ -7,30 +7,30 @@
 }: let
   cfg = config.collinux.terminal.programs.tmux;
 in {
-  imports = [
-    inputs.tmux-tsunami.hjemModules.tsunami
-  ];
+  # imports = [
+  #   inputs.tmux-tsunami.hjemModules.tsunami
+  # ];
 
-  config = lib.mkIf cfg.enable {
-    tsunami = {
-      enable = true;
+  # config = lib.mkIf cfg.enable {
+  #   tsunami = {
+  #     enable = true;
 
-      theme = {
-        bg = "#${config.collinux.palette.base00}";
-        bg_dark = "#${config.collinux.palette.base01}";
-      };
+  #     theme = {
+  #       bg = "#${config.collinux.palette.base00}";
+  #       bg_dark = "#${config.collinux.palette.base01}";
+  #     };
 
-      keys.leader = [
-        {
-          name = "Lazygit";
-          key = "C-g";
-          exec = "display-popup -E -w 80% -h 80% -x C -y C -d '#{?@default-path,#{@default-path},#{pane_current_path}}' ${lib.getExe pkgs.lazygit}";
-        }
-      ];
-      confs."main" = ''
-        set -g mouse on
-        set-window-option -g mode-keys vi
-      '';
-    };
-  };
+  #     keys.leader = [
+  #       {
+  #         name = "Lazygit";
+  #         key = "C-g";
+  #         exec = "display-popup -E -w 80% -h 80% -x C -y C -d '#{?@default-path,#{@default-path},#{pane_current_path}}' ${lib.getExe pkgs.lazygit}";
+  #       }
+  #     ];
+  #     confs."main" = ''
+  #       set -g mouse on
+  #       set-window-option -g mode-keys vi
+  #     '';
+  #   };
+  # };
 }