chore(polybar): ollama is now --user systemd unit

dot_config/git/config.tmpl

@@ -47,6 +47,7 @@
 	fe = fetch
 	fa = fetch --all
 	co = checkout
+	cob = checkout -b
 	cm = commit -m
 	cma = commit -am
 	emp = commit --allow-empty -m
@@ -56,6 +57,8 @@
 	l = log -p --ext-diff
 	ls = log --graph --decorate --oneline --date=iso
 	delete-merged-branch = "!git branch -l --merged main | rg -v \"(HEAD|main|\\*)\" | xargs -I % git branch -d %"
+    mg  = merge
+    mgf = merge --ff-only
 
 ; vim: noet ft=gitconfig
 ; -*- indent-tabs-mode: t; tab-width: 4 -*-

dot_config/i3/config.tmpl

@@ -53,9 +53,9 @@ set $ws_media  "8"
 set $ws_util   "9"
 set $ws_game   "10"
 
-set $ws_browser "21"
-set $ws_console "22"
-set $ws_emacs   "23"
+set $ws_browser "1"
+set $ws_console "2"
+set $ws_emacs   "3"
 
 {{- if eq .chezmoi.hostname "arch" }}
 set $DELL "primary"
@@ -63,8 +63,8 @@ set $BenQ "HDMI-0"
 
 workspace $ws0  output $BenQ
 workspace $ws1  output $BenQ
-workspace $ws2  output $BenQ
-workspace $ws3  output $BenQ
+workspace $ws2  output $DELL
+workspace $ws3  output $DELL
 workspace $ws4  output $DELL
 workspace $ws5  output $DELL
 workspace $ws6  output $DELL
@@ -242,7 +242,7 @@ bindsym $m+$a+slash   exec --no-startup-id nowplaying
 # Browser
 bindsym $m+m     exec --no-startup-id open-zen
 bindsym $m+$s+m  exec --no-startup-id open-zen-private
-bindsym $m+n     exec --no-startup-id toggl
+bindsym $m+n     exec --no-startup-id chatgpt
 
 # Emacs
 bindsym $m+period exec --no-startup-id open-emacs

dot_config/polybar/scripts/executable_ollama.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/dash
-if systemctl is-active ollama >/dev/null; then
+if systemctl --user is-active ollama >/dev/null; then
     echo 'ol'
 else
     echo ''

dot_config/private_fish/abbreviations.fish.tmpl

@@ -120,13 +120,13 @@ abbr ....   'cd ../../..'
 abbr .....  'cd ../../../..'
 abbr D      'cd ~/dl'
 abbr M      'fuzzy-find -t d --exec /run/media/inkch/ 3'
-abbr srv    'fuzzy-find -t d --exec /srv 3'
-abbr jelly  'fuzzy-find -t d --exec /srv/jellyfin 3'
 abbr hdd    'fuzzy-find -t d --exec /mnt/hdd 3'
-abbr hdd2    'fuzzy-find -t d --exec /mnt/hdd2 3'
-abbr BK     'fuzzy-find -t d --exec /mnt/hdd/bk 3'
-abbr R      'fuzzy-find -t d --exec /mnt/rpi4 2'
+abbr hdd2   'fuzzy-find -t d --exec /mnt/hdd2 3'
+{{- if eq .chezmoi.hostname "arch" }}
+abbr T      'cd /mnt/hdd/torrent'
+{{- else if eq .chezmoi.hostname "buzz" }}
 abbr T      'cd ~/dl/torrent'
+{{- end }}
 abbr cdw    'fuzzy-find -t d --exec ~/ws'
 abbr f.     'fuzzy-find -t d --exec . 5'
 abbr f..    'bd'
@@ -161,8 +161,6 @@ abbr e.   "fuzzy-find -t f --exec $PWD 5"
 abbr e~   "fuzzy-find -t f --exec $HOME 7"
 abbr ec   "fuzzy-find -t f --exec $XDG_CONFIG_HOME 4"
 abbr em   "$EDITOR $XDG_DOCUMENTS_DIR/morningnote/(date +%Y-%m-%d).md"
-abbr eci  "$EDITOR $XDG_CONFIG_HOME/i3/config"
-abbr ecp  "$EDITOR $XDG_CONFIG_HOME/polybar/config"
 abbr ew   "fuzzy-find -t f --exec $XDG_DOCUMENTS_DIR/vimwiki"
 # Edit fish-shell config/func/abbr
 abbr ef   "fuzzy-find -t f --exec $XDG_CONFIG_HOME/fish 2"
@@ -192,11 +190,13 @@ abbr gcma 'git commit -am'
 abbr gbr  'git branch'
 abbr gbra 'git branch -a'
 abbr gd   'git diff'
+abbr gdd  'git diff --no-ext-dff'
 abbr gl   'git log -p --ext-diff'
 abbr glg  'git log --graph --decorate --oneline --date=iso'
 abbr gemp 'git commit --allow-empty -m'
 abbr gps  "git remote | fzf -1 | xargs -I'{}' git push {}"
 abbr gpl  "git remote | fzf -1 | xargs -I'{}' git pull {}"
+abbr gdel "git delete-merged-branch"
 
 ## Use interactive option all time
 abbr rm  'rm -i'

dot_config/private_fish/env.fish.tmpl

@@ -90,6 +90,7 @@ set -x PATH $PATH $CARGO_HOME/bin
 
 # Nim
 set -ax PATH $HOME/.nimble/bin
+
 # Parallel
 set -x PARALLEL_HOME $XDG_CACHE_HOME/parallel
 

dot_config/private_fish/functions/encrypted_batexa.fish.age

@@ -1,10 +1,10 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBRVlBFdDZsRDROL0FmNUxh
-ak8xYm5DdlZVWDYybldGeFBiZ1QybzRKaFEwCkJUVWdRSDBNSG5sSmo5TzJjdHh1
-aUw1Mkt6VGxWUEVjSFRvZ0RLbU4xcW8KLS0tIDhVV1orQlUrbmkwVVk2eG54Q3Y3
-U2RhWk9XZGcwMXBNTFowVHFQTWFrVk0KQqirA7nr+wmlZ7BEpJfwPsutFdatfBGU
-EjalgcokWmMmcaUosSbKOIHZdToHVNJrJn09fCcMSjULX4KY2xt9QkFL0he52E26
-Dt0m+XZT4xYHqwrfMVUT2IvCy13IYEFgWgJ5qSXBYQ1dI3ZjfarvnzbpWeoVMHY1
-pfIz51xV9BahSdMIgaSxvQCfs9qmqnoGuZ0COsZmAH41A8ZTi0205Ayn0LKQkLvn
-vTg/TPHpT8nova7g3r9w8OzA5zmg5+ZIV+NqkB66/qc60vNdUwBeXLHLtZLm2Q==
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB2TVUya24zb1pQNnVwaXlQ
+ZTNyKzhHckhqbDRSaFpJVkpEVURFcVkzN3lvCnlyRk0wSlFUelU1bndwWVVITEVR
+SzMzNlJ3UUxmdDF5RFpXeFhqSkxVNjQKLS0tIC9Gd09kQ3JhcFVhdnlvbWpQWW9m
+RTZNRWRqdFFoQTVORjI1KzdqdXZpQnMKlBY4Wi/oFtonpYZKVSVx07So0GxnaZwA
+HiOl9bS4IWrlhiUzywfFoGBTkFtFG+/8MPWbGeWMRwPjEhJS7ukzSfQmMDF55rGl
+5R7g5ybqblyQsqKuchJ/svLXW9Dazuc/p6/KsPqououJ+vkQ4w00zMT0nue0z8Y6
+OyW1dZuS7fyrvU5xtHJBmplaQDK4sdpbvBRfoO07M9qzoNDID4lCBD8/6cRvwBfh
+TE8b0eRlZQqv77d23+2LBgRmcrbn3KJRyBPN7bEvj+iqnd8OnR6RUyOOaknRCg==
 -----END AGE ENCRYPTED FILE-----

dot_config/tmux/tmux.conf.tmpl

@@ -30,15 +30,29 @@ bind r source-file $XDG_CONFIG_HOME/tmux/tmux.conf \; display-message "Config Re
 bind C-l split-window -h -c '#{pane_current_path}'
 bind C-j split-window -v -c '#{pane_current_path}'
 
+# Switch vertical and horizontal
+bind C-v run-shell 'tmux break-pane\; last-window\; join-pane -s "!" -v'
+bind C-h run-shell 'tmux break-pane\; last-window\; join-pane -s "!" -h'
+
+# Break pane
+bind ! break-pane
+
+# Pane layout
+bind g run-shell 'tmux select-layout even-vertical\; break-pane\; last-window\; join-pane -s "!" -v'
+bind 1 select-layout even-horizontal
+bind 2 select-layout even-vertical
+bind 3 select-layout main-horizontal
+bind 4 select-layout main-vertical
+bind 5 select-layout tiled
+bind 6 select-layout main-horizontal-mirrored
+bind 7 select-layout main-vertical-mirrored
+
 # Session control
 bind C-c new-session
 bind C-t run "tmuxsh          >/dev/null"
 bind C-y run "tmuxsh remote   >/dev/null"
 bind C-u run "tmuxsh dev      >/dev/null"
 {{- if eq .chezmoi.hostname "arch" }}
-bind 0   run "tmuxsh wiki     >/dev/null"
-bind 1   run "tmuxsh blog     >/dev/null"
-bind 3   run "tmuxsh tessoku  >/dev/null"
 bind 8   run "tmuxsh music    >/dev/null"
 bind 9   run "tmuxsh util     >/dev/null"
 {{- end }}