Merge branch 'main' of https://git.sagev.space/sage/dotfiles

Add tpm to tmux

.gitmodules

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

copy.sh

@@ -3,6 +3,9 @@
 SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 FAKE_HOME="$SCRIPT_DIR/fake_home"
 
+git submodule init
+git submodule update
+
 dotdirs="$(find $FAKE_HOME -mindepth 1 -type d)"
 
 echo "$dotdirs" | while read -r dotdir; do

fake_home/.Xresources

@@ -0,0 +1,33 @@
+xterm*font:     *-fixed-*-*-*-26-*
+! terminal colours
+xterm*foreground:#FFFFFF
+xterm*background:#202020
+
+!black darkgray
+*color0:    #1B1D1E
+*color8:    #808080
+!darkred red
+*color1:    #FF0044
+*color9:    #F92672
+!darkgreen green
+*color2:    #82B414
+*color10:   #A6E22E
+!darkyellow yellow
+*color3:    #FD971F
+*color11:   #E6DB74
+!darkblue blue
+*color4:    #266C98
+*color12:   #7070F0
+!darkmagenta magenta
+*color5:    #AC0CB1
+*color13:   #D63AE1
+!darkcyan cyan
+*color6:    #AE81FF
+*color14:   #66D9EF
+!gray white
+*color7:    #CCCCCC
+*color15:   #F8F8F2
+
+xterm*faceName: Envy Code R
+xterm*faceNameDoublesize: Droid Sans Fallback
+xterm*faceSize: 12

fake_home/.config/rofi/config.rasi

@@ -1,15 +1,5 @@
 configuration {
-  modes: [ combi, emoji ];
   sort: true;
-  combi-modes: [
-    window,
-    drun,
-    emoji,
-    "tabs:/home/sage/.rofi-tabs.sh",
-    // "history:/home/sage/.rofi-history-search.sh",
-    "projects:/home/sage/.rofi-list-git-repos.py",
-    "suspend:/home/sage/.rofi-suspend.sh"
-  ];
   show-icons: true;
   drun {
     display-name: "";
@@ -34,16 +24,27 @@ configuration {
     display-name: "";
     fallback-icon: "firefox-beta";
   }
+  modes: [ combi, "mvn:/home/sagevaillancourt/.rofi-mvn-search.py" ];
+  combi-modes: [
+    window,
+    drun,
+    emoji,
+    "mvn:/home/sagevaillancourt/.rofi-mvn-search.py",
+    "tabs:/home/sagevaillancourt/.rofi-tabs.sh",
+    // "history:/home/sage/.rofi-history-search.sh",
+    "projects:/home/sagevaillancourt/.rofi-list-git-repos.py",
+    "suspend:/home/sagevaillancourt/.rofi-suspend.sh"
+  ];
 }
 
 //@theme "/usr/share/rofi/themes/gruvbox-dark-hard.rasi"
 //@theme "/usr/share/rofi/themes/Arc-Dark.rasi"
-@theme "/usr/share/rofi/themes/android_notification.rasi"
+@theme "/usr/local/share/rofi/themes/android_notification.rasi"
 
 textbox-prompt-sep {
-  // str: ">";
+  str: ">";
 }
 
-inputbar {
+// inputbar {
-    // children:   [ "textbox-prompt-sep","entry","case-indicator" ];
+//     children:   [ "textbox-prompt-sep","entry","case-indicator" ];
-}
+// }

fake_home/.config/xfce4/terminal/terminalrc

@@ -16,7 +16,7 @@ MiscTabCloseMiddleClick=TRUE
 MiscTabPosition=GTK_POS_TOP
 MiscHighlightUrls=TRUE
 ScrollingLines=999999
-BackgroundDarkness=0.750000
+BackgroundDarkness=0.610000
 ScrollingOnOutput=FALSE
 MiscBellUrgent=TRUE
 MiscMouseWheelZoom=TRUE
@@ -38,7 +38,7 @@ ColorCursor=#f8f8f2
 ColorBold=#f8f8f2
 ColorBoldUseDefault=FALSE
 ColorPalette=rgb(39,40,34);rgb(249,38,114);rgb(146,198,42);rgb(244,191,117);rgb(102,217,239);rgb(174,129,255);rgb(161,239,228);rgb(248,248,242);rgb(117,113,94);rgb(249,38,114);rgb(166,226,46);rgb(244,191,117);rgb(102,217,239);rgb(174,129,255);rgb(161,239,228);rgb(249,248,245)
-ColorForeground=#f8f8f2
+ColorForeground=#ffffffffffff
 ColorBackground=#206d206d206d
 CustomCommand=zsh
 

fake_home/.gitconfig

@@ -28,3 +28,5 @@
 	rebase = false
 [protocol "file"]
 	allow = always
+[safe]
+	directory = /var/lib/gitea/custom

fake_home/.rofi-list-git-repos.py

@@ -79,13 +79,17 @@ def print_project_message(project: str) -> ():
 
 
 if __name__ == '__main__':
-    if len(sys.argv) == 1:
+    include_icon = sys.argv[1] != "--no-icon" if len(sys.argv) > 1 else True
+    if len(sys.argv) == 1 or not include_icon:
         for git_dir in git_dirs:
             if not os.path.isdir(git_dir):
                 continue
             for project in os.listdir(git_dir):
                 project = f'{git_dir}/{project}'
                 if os.path.isdir(project):
-                    print_project_message(project)
+                    if include_icon:
+                        print_project_message(project)
+                    else:
+                        print(f'git {project}')
     else:
         open_project(sys.argv[1][4:])

fake_home/.shell_aliases

@@ -6,6 +6,13 @@ function hearch {
 
 alias hsearch='hearch'
 
+alias caddyfile="sudo vim /etc/caddy/Caddyfile"
+alias cf="sudo vim /etc/caddy/Caddyfile"
+
+function download-channel {
+  ~/Downloads/yt-dlp "$1" --format 'bestvideo[height=1080]+bestaudio/best' --download-archive archive.txt --output '%(uploader)s/%(upload_date)s.%(title)s.%(id)s.%(ext)s' --restrict-filenames --merge-output-format mkv --ignore-errors
+}
+
 function fin {
     find -iname "*$@*"
 }
@@ -40,9 +47,12 @@ function ww {
     ws $(rg --no-line-number --no-filename . ~/wiki | sed 's/[^a-zA-Z0-9]\+/\n/g' | grep -v "^$" | sort -f | uniq -ci | sort -hr | fzf -i | cut -c 9-)
 }
 
+<<<<<<< HEAD
+=======
 if command -v bat; then
     alias cat="bat -p"
 fi
+>>>>>>> 12ed01fb9697f14a24fde45d561a42e4b71d3cf1
 export FZF_DEFAULT_COMMAND='fd --type f'
 alias fzf="fzf --preview 'bat --style=numbers --color=always {}'"
 

fake_home/.tmux.conf

@@ -1,15 +1,19 @@
-# set -g default-terminal "screen-255color"
+set -g default-terminal "xterm-256color"
+set-option -ga terminal-overrides ",xterm-256color:Tc"
+
+set -g @plugin 'tmux-plugins/tpm'
+set -g @plugin 'tmux-plugins/tmux-sensible'
 
 # remap prefix from 'C-b' to 'C-a'
 unbind C-b
 set-option -g prefix C-a
 bind-key C-a send-prefix
+
 set -g default-shell /usr/bin/zsh
-set-option -g default-terminal "screen-256color"
 set -g status-right "# %A, %d %b %Y - %I:%M %p "
 
-set -g status-bg blue
+set -g status-bg black
-set -g status-fg black
+set -g status-fg blue
 
 # Smart pane switching with awareness of Vim splits.
 # See: https://github.com/christoomey/vim-tmux-navigator
@@ -34,3 +38,5 @@ bind-key -T copy-mode-vi 'C-\' select-pane -l
 setw -g window-status-current-style fg=blue,bg=black
 setw -g window-status-current-format ' #I #{s|/home/sagevaillancourt|~|:pane_current_path} #W#F '
 setw -g window-status-format ' #I #{s|/home/sagevaillancourt|~|:pane_current_path} #W#F '
+
+run '~/.tmux/plugins/tpm/tpm'

fake_home/.tmux/plugins/tpm

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

fake_home/.vimrc

@@ -11,7 +11,7 @@ set tags=./tags;/ " Search up to / for tags file
 set updatetime=100
 set clipboard=unnamedplus " Use system clipboard
 
-if empty($DISPLAY)
+if empty($DISPLAY) && empty($SSH_CONNECTION)
     colorscheme elflord
 else
     set termguicolors

fake_home/.zshrc

@@ -3,8 +3,7 @@ if test -f /usr/share/doc/fzf/examples/completion.zsh &> /dev/null; then
 fi
 
 HISTFILE=~/.histfile
-HISTSIZE=10000
+HISTSIZE=SAVEHIST=100000
-SAVEHIST=10000
 setopt appendhistory autocd notify
 setopt menu_complete
 unsetopt beep
@@ -97,3 +96,4 @@ export NVM_DIR="$HOME/.nvm"
 [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
 
 test -f /usr/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh && source /usr/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+test -f "$HOME/.asdf/asdf.sh" && . "$HOME/.asdf/asdf.sh"