Fix invalid Home Manager options in tmux, shell, and git modules

home/modules/git.nix

@@ -3,19 +3,18 @@
 {
   programs.git = {
     enable = true;
-    userName = "Elias Kohout";
-    userEmail = "elias@kohout.de";
 
-    extraConfig = {
+    settings = {
+      user.name = "Elias Kohout";
+      user.email = "elias@kohout.de";
       init.defaultBranch = "main";
       pull.rebase = true;
       rebase.autoStash = true;
-    };
-
-    aliases = {
-      unstage = "reset HEAD --";
-      last = "log -1 HEAD";
-      visual = "log --graph --oneline --all";
+      alias = {
+        unstage = "reset HEAD --";
+        last = "log -1 HEAD";
+        visual = "log --graph --oneline --all";
+      };
     };
   };
 

home/modules/shell.nix

@@ -4,7 +4,7 @@
 
   programs.zsh = {
     enable = true;
-    dotDir = ".config/zsh";
+    dotDir = "${config.xdg.configHome}/zsh";
     autosuggestion.enable = true;
     syntaxHighlighting.enable = true;
 
@@ -17,9 +17,7 @@
     initExtra = ''
       bindkey '^R' history-incremental-search-backward
       bindkey '^S' history-incremental-search-forward
-    '';
 
-    promptInit = ''
       autoload -Uz vcs_info
       precmd() { vcs_info }
       zstyle ':vcs_info:git:*' formats '%b'

home/modules/tmux.nix

@@ -4,98 +4,59 @@
   programs.tmux = {
     enable = true;
 
-    # Shell and terminal
     shell = "${pkgs.zsh}/bin/zsh";
     terminal = "tmux-256color";
-    terminalOverrides = [ "*256col*:Tc" ];
-
-    # Indexing
     baseIndex = 1;
-    paneBaseIndex = 1;
-    renumberWindows = true;
-
-    # Mouse and clipboard
-    mouse = false;
-    setClipboard = true;
-
-    # History
     historyLimit = 50000;
+    mouse = false;
+    keyMode = "vi";
+    clock24 = true;
+    focusEvents = true;
 
-    # Status bar
-    statusInterval = 1;
-    statusPosition = "top";
-    statusJustify = "left";
-    statusStyle = "bg=black,fg=brightwhite";
-    statusLeft = "#[bg=colour236,fg=brightwhite]#{?session_path, #(basename #{session_path}) ,}";
-    statusRight = "#[bg=colour236,fg=brightwhite] #H #[bg=colour235,fg=brightwhite] %H:%M:%S ";
-    statusLeftLength = 100;
-    statusRightLength = 100;
-
-    # Window styling
-    windowStatusFormat = " #[fg=white]#I:#[fg=white]#W#{?window_flags,#F,} ";
-    windowStatusCurrentFormat = "#[bg=colour235,fg=brightred,bold] #I:#W#{?window_flags,#F,} ";
-    windowStatusSeparator = "";
-
-    # Pane styling
-    paneActiveBorderStyle = "fg=brightred";
-    paneBorderStyle = "fg=colour238";
-
-    # Message styling
-    messageStyle = "bg=colour236,fg=brightwhite";
-    messageCommandStyle = "bg=colour236,fg=brightwhite";
-
-    # Mode and clock
-    modeStyle = "bg=brightred,fg=black";
-    clockModeColour = "brightred";
-    clockModeStyle = 24;
-
-    # Copy mode
-    copyMode = {
-      vi = true;
-    };
-
-    # Keybindings
-    keyBindings = [
-      {
-        key = "y";
-        command = "copy-mode";
-      }
-      {
-        key = "h";
-        command = "select-pane -L";
-        options = { repeat = true; };
-      }
-      {
-        key = "j";
-        command = "select-pane -D";
-        options = { repeat = true; };
-      }
-      {
-        key = "k";
-        command = "select-pane -U";
-        options = { repeat = true; };
-      }
-      {
-        key = "l";
-        command = "select-pane -R";
-        options = { repeat = true; };
-      }
-      {
-        key = "r";
-        command = "source-file ~/.config/tmux/tmux.conf \\; display-message \"tmux.conf reloaded\"";
-        options = { repeat = true; };
-      }
-      {
-        key = "q";
-        command = "display-popup -E -w 60% -h 60% -d '#{session_path}' 'nvim quicknote.md'";
-      }
-    ];
-
-    # Additional settings via extraConfig
     extraConfig = ''
+      # Indexing
+      set -g pane-base-index 1
+      set -g renumber-windows on
+
+      # Terminal overrides
       set -ga terminal-overrides ",*256col*:Tc"
-      set -g focus-events on
+
+      # Pane borders
       set -g pane-border-lines heavy
+      set -g pane-active-border-style fg=brightred
+      set -g pane-border-style fg=colour238
+
+      # Status bar
+      set -g status-interval 1
+      set -g status-position top
+      set -g status-justify left
+      set -g status-style bg=black,fg=brightwhite
+      set -g status-left "#[bg=colour236,fg=brightwhite]#{?session_path, #(basename #{session_path}) ,}"
+      set -g status-right "#[bg=colour236,fg=brightwhite] #H #[bg=colour235,fg=brightwhite] %H:%M:%S "
+      set -g status-left-length 100
+      set -g status-right-length 100
+
+      # Window styling
+      set -g window-status-format " #[fg=white]#I:#[fg=white]#W#{?window_flags,#F,} "
+      set -g window-status-current-format "#[bg=colour235,fg=brightred,bold] #I:#W#{?window_flags,#F,} "
+      set -g window-status-separator ""
+
+      # Message styling
+      set -g message-style bg=colour236,fg=brightwhite
+      set -g message-command-style bg=colour236,fg=brightwhite
+
+      # Mode styling
+      set -g mode-style bg=brightred,fg=black
+      set -g clock-mode-colour brightred
+
+      # Keybindings
+      bind y copy-mode
+      bind -r h select-pane -L
+      bind -r j select-pane -D
+      bind -r k select-pane -U
+      bind -r l select-pane -R
+      bind -r r source-file ~/.config/tmux/tmux.conf \; display-message "tmux.conf reloaded"
+      bind q display-popup -E -w 60% -h 60% -d '#{session_path}' 'nvim quicknote.md'
     '';
   };
 }