Merge with single-screen branch

2024-08-27 10:45:29 -04:00
10 changed files with 91 additions and 104 deletions
--- a/aliases/key_aliases.tmpl
+++ b/aliases/key_aliases.tmpl
@@ -1029,7 +1029,7 @@ cpsdv "cp * /home/kevin/Documents/stardew-valley-sdv-saves/hevintales"

 # ]]] games #

-# school  [[[ #
+# work  [[[ #

 # basic
 # wlf "watson log --all --tag=final"
@@ -1037,13 +1037,10 @@ cpsdv "cp * /home/kevin/Documents/stardew-valley-sdv-saves/hevintales"
 gpa "column -ts',' ~/Documents/gpa.md"
 ssc "mosh mokkar@teach.cs.utoronto.ca"

-zs "zathura --fork syllabus.pdf"
+ttlo "timetrace start look@job"
+ttle "timetrace start leetcode@job"

-pvabn "npm run serve:localhost"
-pvafn "npm run start:localhost"
-ssv "ssh -p 3022 kevin@127.0.0.1"
-
-# ]]] school  #
+# ]]] work  #

 # red-hat [[[ #

--- a/aliases/key_dirs.tmpl
+++ b/aliases/key_dirs.tmpl
@@ -25,6 +25,7 @@ me /run/media/kevin
 o /
 pd ~/.password-store
 pfp ~/Pictures/profile-pics
+pfpp ~/Pictures/profile-pics/profiles-by-moto
 P ~/Pictures
 ssu ~/Pictures/screenshots/desktop/unsorted
 std ~/st
--- a/dot_config/fish/config.fish.tmpl
+++ b/dot_config/fish/config.fish.tmpl
@@ -307,6 +307,5 @@ abbr xya "export-pkgs"
 # task sync > /dev/null 2>&1

 source /home/kevin/.config/fish/key_abbr.fish > /dev/null
-# wal -r
-cat /home/kevin/.cache/wal/sequences
+wal -r
 # ~/scripts/xmodmap-custom
--- a/dot_config/i3/config.tmpl
+++ b/dot_config/i3/config.tmpl
@@ -1,14 +1,12 @@
 #  startup [[[ # 

 set $term kitty
-set $term_alt urxvt
-# set $term urxvt
-# set $term_alt kitty
 # set $term st
+# set $term_alt urxvt
 {{ if eq .chezmoi.hostname "x1-carbon" }}
 set $term urxvt
-set $term_alt kitty
-# set $term_alt st
+# set $term_alt kitty
+set $term_alt st
 # set $term_alt urxvt
 exec dunst
 exec compton
@@ -24,7 +22,8 @@ exec wal -i $(/home/kevin/scripts/shuffler "$HOME/Pictures/Backgrounds/dim/editi
 exec --no-startup-id i3-msg 'workspace $ws3; exec $browser'
 # exec --no-startup-id i3-msg 'workspace $ws5; exec $term -e twitchy'
 # exec --no-startup-id i3-msg 'workspace $ws5; exec firefox -P nft'
-# exec --no-startup-id i3-msg workspace $ws6; exec discord
+exec --no-startup-id i3-msg workspace $ws6; exec discord
+exec --no-startup-id i3-msg 'workspace $ws6; exec signal-desktop'
 # exec --no-startup-id i3-msg workspace $ws1; exec $term -e fish -c 'tmux-attach school'

 #  ]]] startup # 
@@ -420,10 +419,11 @@ workspace $ws6 output $secondary
 assign [class="Slack"] $ws6
 bindsym Mod4+d workspace $ws6; exec discord
 bindsym Mod4+$mod+d workspace $ws6; exec element-desktop
+bindsym Mod4+i workspace $ws6; exec signal-desktop
 # bindsym Mod4+d workspace $ws6; exec firefox -new-window https://riot.im/app
 bindsym Mod4+k workspace $ws6; exec slack
 # bindsym Mod4+i workspace $ws6; exec $term -e fish -c 'mosh kmok@$work_laptop_ip -- tmux a -t weechat'
-bindsym Mod4+i workspace $ws6; exec $term -e fish -c 'mosh kmok@$work_laptop_ip -- tmux a -t weechat'
+# bindsym Mod4+i workspace $ws6; exec $term -e fish -c 'mosh kmok@$work_laptop_ip -- tmux a -t weechat'
 # bindsym Mod4+i workspace $ws6; exec $term -e fish -c 'tmux-attach weechat'

 #  ]]] ws6 # 
@@ -579,8 +579,8 @@ bar {
  {{ if eq .chezmoi.hostname "x1-carbon" }}
  font pango:$sb_font 17
  {{ else }}
-  font pango:$sb_font 17
-  # font pango:$sb_font 16
+  # font pango:$sb_font 17
+  font pango:$sb_font 16
  {{ end }}
  colors {
    # 0 (transparent) -> 255 (opaque) in hex
@@ -595,8 +595,8 @@ bar {
  tray_output none
  # status_command i3blocks -c ~/.config/i3blocks/i3blocks.conf
  status_command 2>/tmp/i3blocks.err i3blocks -vvv -c ~/.config/i3blocks/i3blocks.conf | tee /tmp/i3blocks.out
-  # output $main
-  output $secondary
+  output $main
+  # output $secondary
  wheel_up_cmd nop
  wheel_down_cmd nop
 }
@@ -605,31 +605,32 @@ bar {

 #  secondary bar [[[ # 

-# bar {
-  # output $secondary
-  # {{ if eq .chezmoi.hostname "x1-carbon" }}
-  # font pango:$sb_font 18
-  # {{ else }}
+bar {
+  # output $main
+  output $secondary
+  {{ if eq .chezmoi.hostname "x1-carbon" }}
+  font pango:$sb_font 18
+  {{ else }}
  # font pango:$sb_font 21
-  # # font pango:$sb_font 20
-  # # font pango:$sb_font 17
-  # {{ end }}
-  # # output $main
-  # i3bar_command i3bar -t
-  # colors {
-    # background $black$bar_trans
-    # # border, bg, text color
-    # # focused_workspace $inactive_ws_bg $bg $focused_ws_text
-    # focused_workspace $inactive_ws_bg $bg $fg
-    # active_workspace $inactive_ws_bg $fg$active_ws_trans $fg
-    # inactive_workspace $inactive_ws_bg $inactive_ws_bg$inactive_ws_trans $fg
-  # }
-  # status_command i3blocks -c ~/.config/i3blocks/i3blocks-secondary.conf
-  # # status_command 2>/tmp/i3blocks-sam.err i3blocks -vvv -c ~/.config/i3blocks/sam-i3blocks.conf | tee /tmp/i3blocks-sam.out
-  # tray_output none
-  # wheel_up_cmd nop
-  # wheel_down_cmd nop
-# }
+  font pango:$sb_font 20
+  # font pango:$sb_font 17
+  {{ end }}
+  # output $main
+  i3bar_command i3bar -t
+  colors {
+    background $black$bar_trans
+    # border, bg, text color
+    # focused_workspace $inactive_ws_bg $bg $focused_ws_text
+    focused_workspace $inactive_ws_bg $bg $fg
+    active_workspace $inactive_ws_bg $fg$active_ws_trans $fg
+    inactive_workspace $inactive_ws_bg $inactive_ws_bg$inactive_ws_trans $fg
+  }
+  status_command i3blocks -c ~/.config/i3blocks/i3blocks-secondary.conf
+  # status_command 2>/tmp/i3blocks-sam.err i3blocks -vvv -c ~/.config/i3blocks/sam-i3blocks.conf | tee /tmp/i3blocks-sam.out
+  tray_output none
+  wheel_up_cmd nop
+  wheel_down_cmd nop
+}

 #  ]]] secondary bar # 

--- a/dot_config/i3blocks/i3blocks.conf.tmpl
+++ b/dot_config/i3blocks/i3blocks.conf.tmpl
@@ -52,33 +52,33 @@ label=ETH
 TICKER=ETHUSDC
 interval=30

-# [kraken]
-# label=SOL
-# TICKER=SOLUSD
-# interval=30
-
 # [kraken]
 # label=SEI
 # TICKER=SEIUSD
 # interval=30

-[dexscreener]
-label=PIXL 
-CHAIN=ethereum
-PAIR=0x31c0ba10e4e12be6cdceb612e5e829d977532bfc
+[kraken]
+label=SOL 
+TICKER=SOLUSD
 interval=30

+# [dexscreener]
+# label=PIXL
+# CHAIN=ethereum
+# PAIR=0x31c0ba10e4e12be6cdceb612e5e829d977532bfc
+# interval=30
+
 # [dexscreener]
 # label=BLAST
 # CHAIN=blast
 # PAIR=0x9A0AA28d999a21d3cf6F2703CDBba9FeAF4a32F7
 # interval=30

-[dexscreener]
-label=LOCK 
-CHAIN=solana
-PAIR=AtWMAA6T9t8cq8XCccCFPGDNNQYXhScuNuY6WVRi7FKe
-interval=30
+# [dexscreener]
+# label=LOCK
+# CHAIN=solana
+# PAIR=AtWMAA6T9t8cq8XCccCFPGDNNQYXhScuNuY6WVRi7FKe
+# interval=30

 # [dexscreener]
 # label=FLT
@@ -114,16 +114,16 @@ interval=60
 # SHORT_NAME=
 # interval=5

-# [spotify]
-# # command=python ~/linux-config/configs/i3blocks-scripts/spotify.py
-# # label=
-# label=
-# # label=🎧
-# # green
-# # color=#198c19
-# # aqua
-# # color=#2d7272
-# interval=5
+[spotify]
+# command=python ~/linux-config/configs/i3blocks-scripts/spotify.py
+# label=
+label= 
+# label=🎧
+# green
+# color=#198c19
+# aqua
+# color=#2d7272
+interval=5
 {{ end }}

 #  ]]] volume/spotify # 
@@ -191,9 +191,9 @@ WIDTH=220

 #  name [[[ # 

-# [name]
-# label=
-# interval=30
+[name]
+label= 
+interval=30
 {{ end }}

 #  ]]] name # 
--- a/dot_config/mpv/input.conf
+++ b/dot_config/mpv/input.conf
@@ -15,13 +15,17 @@ Ctrl+RIGHT no-osd seek   0.2 exact
 Ctrl+LEFT  no-osd seek  -0.2 exact
 Shift+RIGHT no-osd seek  1 exact
 Shift+LEFT  no-osd seek -1 exact
-RIGHT seek  3 exact
-LEFT  seek -3 exact
+RIGHT seek  5 exact
+LEFT  seek -5 exact
 UP    seek  10 exact
 DOWN  seek -10 exact
 Shift+UP    seek  60 exact
 Shift+DOWN  seek -60 exact

+# zoom
+Ctrl+- add video-zoom -0.25
+Ctrl+= add video-zoom 0.25
+
 # mark
 m revert-seek mark         # mark position for revert-seek
 Shift+m revert-seek
--- a/dot_config/ranger/executable_scope.sh
+++ b/dot_config/ranger/executable_scope.sh
@@ -96,8 +96,11 @@ handle_extension() {
            jq --color-output '.' "${FILE_PATH}" && exit 5
            python -m json.tool -- "${FILE_PATH}" && exit 5
            
-        # txt)
-            # cat "${FILE_PATH}" && exit 5
+        js)
+            bat "${FILE_PATH}" && exit 5
+            
+        txt)
+            bat "${FILE_PATH}" && exit 5
    esac
 }

--- a/dot_config/ranger/rc.conf.tmpl
+++ b/dot_config/ranger/rc.conf.tmpl
@@ -668,8 +668,8 @@ set preview_images true
 #   The same as urxvt but utilizing not only the preview pane but the
 #   whole terminal window.
 # set preview_images_method w3m
-# set preview_images_method ueberzug
-set preview_images_method kitty
+set preview_images_method ueberzug
+# set preview_images_method kitty
 # set preview_images_method urxvt
 # set preview_images_method urxvt-full

--- a/dot_vimrc.tmpl
+++ b/dot_vimrc.tmpl
@@ -150,10 +150,10 @@ Plug 'vim-scripts/L9'
 " find files from within Vim
 " Plug 'vim-scripts/FuzzyFinder'

-" {{ if not .gui }}
+{{ if not .gui }}
 " Gotham color scheme
 Plug 'whatyouhide/vim-gotham'
-" {{ end }}
+{{ end }}

 " " collection of Vim color schemes
 " Plug 'flazz/vim-colorschemes'
@@ -233,27 +233,7 @@ Plug 'Kevin-Mok/vim-snippets'
 Plug 'ervandew/supertab'
 	" make YCM compatible with UltiSnips (using supertab)
 	let g:ycm_key_list_select_completion = ['<C-n>', '<Down>']
-	let g:ycm_key_list_previous_completion = ['<C-p>', '<Up>']
-	let g:SuperTabDefaultCompletionType = '<C-n>'
-
-" easily comment/uncomment lines
-Plug 'scrooloose/nerdcommenter'
-	let g:NERDTrimTrailingWhitespace = 1
-	let g:NERDSpaceDelims = 1
-
-" add quotes/brackets around chunks of text easily
-Plug 'tpope/vim-surround'
-    nmap S ys
-
-" navigate around file easily and precisely
-Plug 'easymotion/vim-easymotion'
-	map <Space> <Plug>(easymotion-prefix)
-
-" status bar displaying various info about the current buffer
-Plug 'vim-airline/vim-airline'
-	let g:airline_section_c = '%F'
-Plug 'vim-airline/vim-airline-themes'
-	let g:airline_powerline_fonts = 1
+    let g:airline_powerline_fonts = 1
    let g:airline_theme='supernova'

 " continue Markdown lists when started
@@ -262,7 +242,6 @@ Plug 'dkarter/bullets.vim'

 " coordinate Vim color scheme with terminal color scheme
 Plug 'dylanaraps/wal.vim'
-Plug 'AlphaTechnolog/pywal.nvim', { 'as': 'pywal' }
 " Plug 'morhetz/gruvbox'
 Plug 'bluz71/vim-nightfly-colors', { 'as': 'nightfly' }

@@ -371,9 +350,7 @@ call plug#end()
 {{ if .gui }}
 " autocmd vimenter * ++nested colorscheme gruvbox
 " colorscheme wal
-colorscheme pywal
-" colorscheme nightfly
-" colorscheme gotham256
+colorscheme nightfly
 {{ else }}
 colorscheme gotham256
 {{ end }}
--- a/txt/terminal-art.txt
+++ b/txt/terminal-art.txt
@@ -0,0 +1,5 @@
+- cmatrix
+- pipes.sh
+- jp2a
+- {pacman,invaders,colors}.sh, c screenfetch, archy, toilet/figlet, doge, etc. 
+- cbonsai