some things

1 files changed, 35 insertions, 36 deletions

diff --git a/linux/tmux.conf b/linux/tmux.conf.m4
index c750770..d47c78e 100644
--- a/linux/tmux.conf
+++ b/linux/tmux.conf.m4
@@ -1,3 +1,4 @@
+m4_include(`system.m4')m4_dnl
 # -- general -------------------------------------------------------------------
 #set -g default-terminal "screen-256color"
 #set -g default-terminal "screen-256color-bce"
@@ -22,7 +23,7 @@ set -g display-time 1000      # slightly longer status messages display time
 set -g status-interval 10     # redraw status linebg every 10 seconds
 set-option -g history-limit 5000
 
-set-option -g default-shell /usr/bin/zsh
+set-option -g default-shell DEFAULT_SHELL
 
 # -- navigation ----------------------------------------------------------------
 
@@ -30,14 +31,11 @@ set-option -g default-shell /usr/bin/zsh
 setw -g monitor-activity on
 set -g visual-activity off
 
+m4_ifelse(DOTFILES_TYPE, `local', `m4_dnl
 unbind C-b
 set -g prefix C-a
 bind C-a send-prefix
-
-bind -n C-M-h resize-pane -L 2
-bind -n C-M-j resize-pane -D 2
-bind -n C-M-k resize-pane -U 2
-bind -n C-M-l resize-pane -R 2
+')m4_dnl
 
 # Set copying settings
 setw -g mode-keys vi
@@ -51,12 +49,6 @@ bind-key -T copy-mode-vi Enter send-keys -X copy-pipe-and-cancel 'xclip -se c -i
 #bind-key -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-pipe-and-cancel 'xclip -se c -ind-key -T copy-mode-vi Enter send-keys -X copy-pipe-and-cancel 'xclip -se c -i'
 #bind-key -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-pipe-and-cancel 'xclip -se c -i''
 
-bind-key S-Left swap-window -t -1
-bind-key S-Right swap-window -t +1
-
-bind -n End send-key C-e
-bind -n Home send-key C-a
-
 # Bells
 set -g visual-bell on
 set -g bell-action any
@@ -71,28 +63,29 @@ set -g mouse on
 bind-key = set-window-option synchronize-panes
 
 # -- macros --------------------------------------------------------------------
-bind-key s send-keys \"jakob.stendahl\ <jakob.stendahl@infomedia.dk>\"
+bind-key s send-keys "GIT_USER <GIT_EMAIL>"
 
 # -- vim-tmux-navigator --------------------------------------------------------
 # Smart pane switching with awareness of Vim splits.
+# this doesn't work, haven't checked why. chaning from vim to neovim could be it
 # See: https://github.com/christoomey/vim-tmux-navigator
-is_vim="ps -o state= -o comm= -t '#{pane_tty}' \
-    | grep -iqE '^[^TXZ ]+ +(\\S+\\/)?g?(view|n?vim?x?)(diff)?$'"
-bind-key -n 'C-h' if-shell "$is_vim" 'send-keys C-h'  'select-pane -L'
-bind-key -n 'C-j' if-shell "$is_vim" 'send-keys C-j'  'select-pane -D'
-bind-key -n 'C-k' if-shell "$is_vim" 'send-keys C-k'  'select-pane -U'
-bind-key -n 'C-l' if-shell "$is_vim" 'send-keys C-l'  'select-pane -R'
-tmux_version='$(tmux -V | sed -En "s/^tmux ([0-9]+(.[0-9]+)?).*/\1/p")'
-if-shell -b '[ "$(echo "$tmux_version < 3.0" | bc)" = 1 ]' \
-    "bind-key -n 'C-\\' if-shell \"$is_vim\" 'send-keys C-\\'  'select-pane -l'"
-if-shell -b '[ "$(echo "$tmux_version >= 3.0" | bc)" = 1 ]' \
-    "bind-key -n 'C-\\' if-shell \"$is_vim\" 'send-keys C-\\\\'  'select-pane -l'"
-
-bind-key -T copy-mode-vi 'C-h' select-pane -L
-bind-key -T copy-mode-vi 'C-j' select-pane -D
-bind-key -T copy-mode-vi 'C-k' select-pane -U
-bind-key -T copy-mode-vi 'C-l' select-pane -R
-bind-key -T copy-mode-vi 'C-\' select-pane -l
+# is_vim="ps -o state= -o comm= -t '#{pane_tty}' \
+#     | grep -iqE '^[^TXZ ]+ +(\\S+\\/)?g?(view|n?vim?x?)(diff)?$'"
+# bind-key -n 'C-h' if-shell "$is_vim" 'send-keys C-h'  'select-pane -L'
+# bind-key -n 'C-j' if-shell "$is_vim" 'send-keys C-j'  'select-pane -D'
+# bind-key -n 'C-k' if-shell "$is_vim" 'send-keys C-k'  'select-pane -U'
+# bind-key -n 'C-l' if-shell "$is_vim" 'send-keys C-l'  'select-pane -R'
+# tmux_version='$(tmux -V | sed -En "s/^tmux ([0-9]+(.[0-9]+)?).*/\1/p")'
+# if-shell -b '[ "$(echo "$tmux_version < 3.0" | bc)" = 1 ]' \
+#     "bind-key -n 'C-\\' if-shell \"$is_vim\" 'send-keys C-\\'  'select-pane -l'"
+# if-shell -b '[ "$(echo "$tmux_version >= 3.0" | bc)" = 1 ]' \
+#     "bind-key -n 'C-\\' if-shell \"$is_vim\" 'send-keys C-\\\\'  'select-pane -l'"
+# 
+# bind-key -T copy-mode-vi 'C-h' select-pane -L
+# bind-key -T copy-mode-vi 'C-j' select-pane -D
+# bind-key -T copy-mode-vi 'C-k' select-pane -U
+# bind-key -T copy-mode-vi 'C-l' select-pane -R
+# bind-key -T copy-mode-vi 'C-\' select-pane -l
 
 # -- Utility ------------------------------------------------------------------
 bind-key r source-file ~/.tmux.conf
@@ -102,24 +95,30 @@ bind -n M-C-w display-popup -E "nvim -c VimwikiMakeDiaryNote -c Calendar -c 'win
 bind -n M-C-i display-popup -E "nvim -c 'e ~/Nextcloud/wiki/I45/Hendelser.md' -c 'call append(1, strftime(\"- **%d.%m.%Y (%T)** - **\"))' -c 'call append(2, \"\")' -c 'execute \"normal! 2GA\"'"
 
 # -- Theme --------------------------------------------------------------------
+m4_ifelse(DOTFILES_TYPE, `local', `m4_dnl
 set -g status-justify left
 set -g status-interval 2
 set -g status-position bottom
-#set -g status-bg '#f8f8f8'
-set -g status-bg '#F2EEDE'
+#set -g status-bg "#f8f8f8"
+set -g status-bg "#F2EEDE"
 set -g status-fg colour16
 
-set -g status-left '#[fg=colour232,bg=colour3,bold]#{?client_prefix,C-a,}#[default] #[fg=colour0,bg=colour7,bold][#S]#[default] '
+set -g status-left "#[fg=colour232,bg=colour3,bold]#{?client_prefix,C-a,}#[default] #[fg=colour0,bg=colour7,bold][#S]#[default] "
 set -g status-left-length 20
 
-set -g status-right '#[fg=colour0,bg=colour7,bold] #(hostname) #[default] #[fg=colour0,bg=colour7,bold] %d/%m/%y #[default] #[fg=colour0,bg=colour7,bold] %H:%M:%S #[default] #[bg=colour7,bold] #(cat /sys/class/power_supply/BAT0/capacity)% #[default] '
+set -g status-right "#[fg=colour0,bg=colour7,bold] #(hostname) #[default] #[fg=colour0,bg=colour7,bold] %d/%m/%y #[default] #[fg=colour0,bg=colour7,bold] %H:%M:%S #[default] #[bg=colour7,bold] #(cat /sys/class/power_supply/BAT0/capacity)% #[default] "
 set -g status-right-length 50
 
-setw -g window-status-format ' #I:#W#F '
-setw -g window-status-current-format ' #I:#W#F '
+setw -g window-status-format " #I:#W#F "
+setw -g window-status-current-format " #I:#W#F "
 
 setw -g window-status-current-style "bg=colour0,fg=colour15"
 setw -g window-status-style "bg=colour7,fg=colour0"
 setw -g window-status-bell-style "bg=colour23,fg=colour15"
 #setw -g window-status-activity-style "bg=colour23,fg=colour15"
 setw -g window-status-activity-style "bg=colour243,fg=colour15"
+')m4_dnl
+m4_ifelse(DOTFILES_TYPE, `remote', `m4_dnl
+set -g status-bg "purple"
+set -g status-fg "white"
+')m4_dnl