From 11681ecc9f98f78118f9a81999ffed46df9dc048 Mon Sep 17 00:00:00 2001 From: Kevin Mok Date: Tue, 27 Aug 2024 10:45:29 -0400 Subject: [PATCH] Merge with single-screen branch --- aliases/key_aliases.tmpl | 11 ++++------ aliases/key_dirs.tmpl | 1 + dot_config/i3/config.tmpl | 20 +++++++++--------- dot_config/i3blocks/i3blocks.conf.tmpl | 28 +++++++++++++------------- dot_config/mpv/input.conf | 8 ++++++-- dot_config/ranger/executable_scope.sh | 7 +++++-- dot_config/ranger/rc.conf.tmpl | 4 ++-- dot_vimrc.tmpl | 23 ++------------------- txt/terminal-art.txt | 5 +++++ 9 files changed, 50 insertions(+), 57 deletions(-) create mode 100644 txt/terminal-art.txt diff --git a/aliases/key_aliases.tmpl b/aliases/key_aliases.tmpl index 100a70b..4c23452 100644 --- 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 [[[ # diff --git a/aliases/key_dirs.tmpl b/aliases/key_dirs.tmpl index e8a4d92..9abf5e4 100644 --- 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 diff --git a/dot_config/i3/config.tmpl b/dot_config/i3/config.tmpl index a4b58bb..f3a389e 100755 --- 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 # @@ -596,6 +596,7 @@ bar { # 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 wheel_up_cmd nop wheel_down_cmd nop } @@ -605,12 +606,13 @@ bar { # secondary bar [[[ # 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 21 + font pango:$sb_font 20 # font pango:$sb_font 17 {{ end }} # output $main diff --git a/dot_config/i3blocks/i3blocks.conf.tmpl b/dot_config/i3blocks/i3blocks.conf.tmpl index a74aad1..8c4adb6 100755 --- 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 diff --git a/dot_config/mpv/input.conf b/dot_config/mpv/input.conf index f675463..b6cfe48 100755 --- 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 diff --git a/dot_config/ranger/executable_scope.sh b/dot_config/ranger/executable_scope.sh index 8e932dc..f7cbf9f 100755 --- 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 } diff --git a/dot_config/ranger/rc.conf.tmpl b/dot_config/ranger/rc.conf.tmpl index f19ff7c..94cfa3b 100755 --- 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 diff --git a/dot_vimrc.tmpl b/dot_vimrc.tmpl index 90fd5ad..ad0915c 100644 --- a/dot_vimrc.tmpl +++ b/dot_vimrc.tmpl @@ -233,27 +233,8 @@ Plug 'Kevin-Mok/vim-snippets' Plug 'ervandew/supertab' " make YCM compatible with UltiSnips (using supertab) let g:ycm_key_list_select_completion = ['', ''] - let g:ycm_key_list_previous_completion = ['', ''] - let g:SuperTabDefaultCompletionType = '' - -" 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 (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 " arc diff --git a/txt/terminal-art.txt b/txt/terminal-art.txt new file mode 100644 index 0000000..17dd636 --- /dev/null +++ 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