Merge branch 'main' of db:dotfiles

4 files changed, 55 insertions, 10 deletions

diff --git a/config/common/alacritty/alacritty.yml b/config/common/alacritty/alacritty.yml
index e5664f1..32fc95b 100644
--- a/config/common/alacritty/alacritty.yml
+++ b/config/common/alacritty/alacritty.yml
@@ -761,7 +761,7 @@ hints:
 #
 # If the same trigger is assigned to multiple actions, all of them are executed
 # in the order they were defined in.
-# key_bindings:
+key_bindings:
   #- { key: Paste,                                       action: Paste          }
   #- { key: Copy,                                        action: Copy           }
   #- { key: L,         mods: Control,                    action: ClearLogNotice }
@@ -871,6 +871,7 @@ hints:
   #- { key: F,              mods: Command|Control,            action: ToggleFullscreen      }
   #- { key: F,              mods: Command, mode: ~Search,     action: SearchForward         }
   #- { key: B,              mods: Command, mode: ~Search,     action: SearchBackward        }
+  - {key: F11, action: ToggleFullscreen}
 
 #debug:
   # Display the time it takes to redraw each frame.
diff --git a/config/common/mpv/mpv.conf b/config/common/mpv/mpv.conf
index 4f5e251..7d9d1fe 100755
--- a/config/common/mpv/mpv.conf
+++ b/config/common/mpv/mpv.conf
@@ -26,3 +26,5 @@ force-seekable=yes
 
 slang=eng, en, english
 alang=jpn
+
+screenshot-directory=~/pics/screenshots
diff --git a/config/common/ncmpcpp/bindings b/config/common/ncmpcpp/bindings
index d2a5eb6..b7921e7 100644
--- a/config/common/ncmpcpp/bindings
+++ b/config/common/ncmpcpp/bindings
@@ -194,9 +194,9 @@ def_key "p"
 def_key "P"
   play
 
-def_key "H"
+def_key "g"
 	move_home
-def_key "L"
+def_key "G"
 	move_end
 
 def_key "ctrl-u"
diff --git a/config/common/tmux/tmux.conf b/config/common/tmux/tmux.conf
index 409ad66..80ab9ca 100755
--- a/config/common/tmux/tmux.conf
+++ b/config/common/tmux/tmux.conf
@@ -1,9 +1,5 @@
-# By Nicholas Marriott. Public domain.
-# but -now- me.
+# Special thanks to Nicholas Marriott.
 
-# Some tweaks to the status line
-set -g status-right "%H:%M"
-set -g window-status-current-style "underscore"
 # Enable RGB color if running in xterm
 set-option -sa terminal-overrides ",xterm*:Tc"
 # Change the default $TERM to xterm-256color
@@ -26,7 +22,7 @@ set -g focus-events on
 
 # KEYBINDINGS 
 # Reload config file
-bind r source-file ~/.tmux.conf \; display "Reloaded ~/.tmux.conf"
+bind r source-file ~/.config/tmux/tmux.conf \; display "Reloaded ~/.tmux.conf"
 # Clipboard
 bind -T copy-mode-vi v send-keys -X begin-selection
 bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel "xclip -r -selection clipboard"
@@ -82,9 +78,55 @@ bind -n M-I switch-client -n
 bind n command-prompt "rename-window '%%'"
 bind N command-prompt "rename-session '%%'"
 # Starting new windows
-bind w new-window -c "#{pane_current_path}"
+bind w new-window -c "$HOME"
 bind W new-session -c "$HOME"
 # Show tree 
 bind S choose-tree -Z
 # Menu for mounting and ejecting devices.
 bind E display-menu -T "#[align=centre]#I:#W" -x W -y W '' Mount 0 "display-popup -E 'amount'"
+
+# Theme
+
+#+---------+
+#+ Options +
+#+---------+
+set -g status-interval 1
+set -g status on
+
+#+--------+
+#+ Status +
+#+--------+
+#+--- Layout ---+
+set -g set-titles-string "[#S:#I] #T"
+set -g set-titles on
+set -g status-position top
+set -g window-status-current-style "underscore"
+set -g status-justify left
+set -g status-left "#[fg=black,bg=blue,bold] #S #[fg=blue,bg=black,nobold,noitalics,nounderscore]"
+set -g status-right "#[fg=brightblack,bg=black,nobold,noitalics,nounderscore]#[fg=white,bg=brightblack] %H:%M #[fg=white,bg=brightblack,nobold,noitalics,nounderscore]#[fg=white,bg=brightblack] #{client_user} #[fg=cyan,bg=brightblack,nobold,noitalics,nounderscore]#[fg=black,bg=cyan,bold] #H "
+#+--- Colors ---+
+set -g status-style bg=black,fg=white
+
+#+-------+
+#+ Panes +
+#+-------+
+set -g pane-border-style bg=default,fg=brightblack
+set -g pane-active-border-style bg=default,fg=blue
+set -g display-panes-colour black
+set -g display-panes-active-colour brightblack
+
+#+------------+
+#+ Clock Mode +
+#+------------+
+setw -g clock-mode-colour cyan
+
+#+----------+
+#+ Messages +
+#+---------+
+set -g message-style bg=brightblack,fg=cyan
+set -g message-command-style bg=brightblack,fg=cyan
+
+#+--- Windows ---+
+set -g window-status-format "#[fg=black,bg=brightblack,nobold,noitalics,nounderscore] #[fg=white,bg=brightblack]#I #[fg=white,bg=brightblack,nobold,noitalics,nounderscore] #[fg=white,bg=brightblack]#W #F #[fg=brightblack,bg=black,nobold,noitalics,nounderscore]"
+set -g window-status-current-format "#[fg=black,bg=cyan,nobold,noitalics,nounderscore] #[fg=black,bg=cyan]#I #[fg=black,bg=cyan,nobold,noitalics,nounderscore] #[fg=black,bg=cyan]#W #F #[fg=cyan,bg=black,nobold,noitalics,nounderscore]"
+set -g window-status-separator ""