Update tmux config to use PATH for gitmux

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "tmux/.tmux/plugins/tpm"]
+	path = tmux/.tmux/plugins/tpm
+	url = https://github.com/tmux-plugins/tpm

README.md

@@ -0,0 +1,10 @@
+# EyeDevelop Dotfiles (v2)
+
+Dotfiles which are to be installed using GNU stow.
+
+## Requirements
+* [A nice nerd font](https://github.com/ryanoasis/nerd-fonts/releases/)
+* tmux
+  * golang
+    * `go install github.com/arl/gitmux@latest`
+* nvim

git/.gitconfig

@@ -3,7 +3,7 @@
 # Please adapt and uncomment the following lines:
 	name = Hans Goor
 	email = me@eyedevelop.org
-	signingkey = D414A7FA58C29568EF4E05CD7E05BC839785EAF6
+	signingkey = ~/.ssh/id_ed25519.pub
 [commit]
 	gpgsign = true
 [pull]
@@ -14,3 +14,5 @@
 	ff = no
 [init]
 	defaultBranch = main
+[gpg]
+	format = ssh

ssh/.ssh/config

@@ -1,36 +1,61 @@
 ## --- Jupiter ---
 # -- Physical servers --
-Host pps-jupiter-thebe
+Host jupiter-thebe
   HostName 10.1.0.1
   User eyedevelop
   Port 22
 
+Host jupiter-thebe-remote
+  HostName jupiter.eyedevelop.org
+  User hgoor
+  Port 15623
+
 # -- Virtual servers --
-Host pvm-jupiter-www
+Host jupiter-www
   HostName 10.1.0.2
   User eyedevelop
   Port 15622
 
-Host pvm-jupiter-gitlab
+Host jupiter-gitlab
   HostName 10.1.0.3
   User eyedevelop
   Port 15622
 
-Host pvm-jupiter-coder
+Host jupiter-coder
   HostName 10.1.0.4
   User eyedevelop
   Port 15622
 
 ## --- Uranus ---
 # -- Physical servers --
-Host pps-uranus-oberon
+Host uranus-oberon
   HostName 10.1.2.1
   User eyedevelop
   Port 15622
 
-Host pps-uranus-perdita
+Host uranus-oberon-remote
-  HostName 10.1.2.2
+  HostName uranus.eyedevelop.org
   User eyedevelop
   Port 15622
 
+Host uranus-perdita
+  HostName 10.1.2.2
+  User root
+  Port 22
+
+Host uranus-titania
+  HostName 172.16.2.253
+  User eyedevelop
+  Port 15622
+
+## --- Cloud ---
 # -- Virtual machines --
+Host europa
+  HostName europa.eyedevelop.org
+  User eyedevelop
+  Port 15622
+
+Host europa-emergency
+  HostName 62.171.185.39
+  User eyedevelop
+  Port 15622

tmux/.tmux.conf

@@ -1,17 +1,18 @@
 set -g mouse on
 
-# Open new windows with the same directory
+# Plugins
-unbind c
+set -g @plugin 'tmux-plugins/tpm'
-bind c new-window -c "#{pane_current_path}"
+set -g @plugin 'rose-pine/tmux'
+set -g @plugin 'ofirgall/tmux-window-name'
 
-# Binds
+# Plugin config
-unbind '"'
+source $HOME/.tmux/plugin-configs/rose-pine.conf
-unbind %
-bind | split-window -h -c "#{pane_current_path}"
-bind - split-window -v "#{pane_current_path}"
 
-# Alt-arrow switching
+# General config
-bind -n M-Left select-pane -L
+source $HOME/.tmux/globals.conf
-bind -n M-Right select-pane -R
+
-bind -n M-Up select-pane -U
+# Keybindings
-bind -n M-Down select-pane -D
+source $HOME/.tmux/bindings.conf
+
+# Initialise tmux plugin manager.
+run $HOME/.tmux/plugins/tpm/tpm

tmux/.tmux/.gitignore

@@ -0,0 +1 @@
+plugins/

tmux/.tmux/bindings.conf

@@ -0,0 +1,17 @@
+set -g mouse on
+
+# Open new windows with the same directory
+unbind c
+bind c new-window -c "#{pane_current_path}"
+
+# Binds
+unbind '"'
+unbind %
+bind | split-window -h -c "#{pane_current_path}"
+bind - split-window -v "#{pane_current_path}"
+
+# Alt-arrow switching
+bind -n M-Left select-pane -L
+bind -n M-Right select-pane -R
+bind -n M-Up select-pane -U
+bind -n M-Down select-pane -D

tmux/.tmux/gitmux.conf

@@ -0,0 +1,85 @@
+tmux:
+    # The symbols section defines the symbols printed before specific elements
+    # of Git status displayed in tmux status string.
+    symbols:
+        # current branch name.
+        branch: "⎇ "
+        # Git SHA1 hash (in 'detached' state).
+        hashprefix: ":"
+        # 'ahead count' when local and remote branch diverged.
+        ahead: ↑·
+        # 'behind count' when local and remote branch diverged.
+        behind: ↓·
+        # count of files in the staging area.
+        staged: "● "
+        # count of files in conflicts.
+        conflict: "✖ "
+        # count of modified files.
+        modified: "✚ "
+        # count of untracked files.
+        untracked: "… "
+        # count of stash entries.
+        stashed: "⚑ "
+        # count of inserted lines (stats section).
+        insertions: Σ
+        # count of deleted lines (stats section).
+        deletions: Δ
+        # Shown when the working tree is clean.
+        clean: ✔
+
+    # Styles are tmux format strings used to specify text colors and attributes
+    # of Git status elements. See the STYLES section of tmux man page.
+    # https://man7.org/linux/man-pages/man1/tmux.1.html#STYLES.
+    styles:
+        # Clear previous style.
+        clear: "#[none]"
+        # Special tree state strings such as [rebase], [merge], etc.
+        state: "#[fg=red,bold]"
+        # Local branch name
+        branch: "#[fg=white,bold]"
+        # Remote branch name
+        remote: "#[fg=cyan]"
+        # 'divergence' counts
+        divergence: "#[fg=yellow]"
+        # 'staged' count
+        staged: "#[fg=green,bold]"
+        # 'conflicts' count
+        conflict: "#[fg=red,bold]"
+        # 'modified' count
+        modified: "#[fg=red,bold]"
+        # 'untracked' count
+        untracked: "#[fg=magenta,bold]"
+        # 'stash' count
+        stashed: "#[fg=cyan,bold]"
+        # 'insertions' count
+        insertions: "#[fg=green]"
+        # 'deletions' count
+        deletions: "#[fg=red]"
+        # 'clean' symbol
+        clean: "#[fg=green,bold]"
+
+    # The layout section defines what components gitmux shows and the order in
+    # which they appear on tmux status bar.
+    #
+    # Allowed components:
+    #  - branch:            local branch name. Examples: `⎇ main`, `⎇ :345e7a0` or `[rebase]`
+    #  - remote-branch:     remote branch name, for example: `origin/main`.
+    #  - divergence:        divergence between local and remote branch, if any. Example: `↓·2↑·1`
+    #  - remote:            alias for `remote-branch` followed by `divergence`, for example: `origin/main ↓·2↑·1`
+    #  - flags:             symbols representing the working tree state, for example `✚ 1 ⚑ 1 … 2`
+    #  - stats:             insertions/deletions (lines), for example`Σ56 Δ21`
+    #  - some string `foo`: any other character of string is directly shown, for example `foo` or `|`
+    layout: [branch, remote-branch, divergence, " - ", flags]
+
+    # Additional configuration options.
+    options:
+        # Maximum displayed length for local and remote branch names.
+        branch_max_len: 0
+        # Trim left or right end of the branch (`right` or `left`).
+        branch_trim: right
+        # Character indicating whether and where a branch was truncated.
+        ellipsis: …
+        # Hides the clean flag
+        hide_clean: false
+        # Swaps order of behind & ahead upstream counts - "↓·1↑·1" -> "↑·1↓·1"
+        swap_divergence: false

tmux/.tmux/globals.conf

@@ -0,0 +1,3 @@
+set -g status-interval 2
+set -g default-command "${SHELL}"
+set -g update-environment "PATH"

tmux/.tmux/plugin-configs/rose-pine.conf

@@ -0,0 +1,14 @@
+# Config for rose-pine theme
+set -g @rose_pine_variant 'main'
+set -g @rose_pine_host 'off'
+set -g @rose_pine_date_time '%H:%M'
+set -g @rose_pine_user 'on'
+set -g @rose_pine_directory 'off'
+set -g @rose_pine_bar_bg_disable 'on'
+set -g @rose_pine_only_windows 'off'
+set -g @rose_pine_disable_active_window_menu 'on'
+set -g @rose_pine_show_current_program 'off'
+set -g @rose_pine_show_pane_directory 'off'
+
+set -g @rose_pine_status_left_prepend_section "#(gitmux -cfg ~/.tmux/gitmux.conf '#{pane_current_path}')"
+

tmux/.tmux/plugins/tpm

@@ -0,0 +1 @@
+Subproject commit 99469c4a9b1ccf77fade25842dc7bafbc8ce9946