From 43e367d8349c9ee4bf083af94f5015884c9524aa Mon Sep 17 00:00:00 2001 From: Kevin Mok Date: Tue, 1 Nov 2022 15:46:13 -0400 Subject: [PATCH] Update chezmoi data on laptop --- .chezmoiignore | 2 +- aliases/key_aliases.tmpl | 54 +++++++++++-------- aliases/key_dirs.tmpl | 33 ++++-------- aliases/key_files.tmpl | 3 +- dot_Xmodmap-laptop | 8 ++- dot_Xmodmap-laptop-old | 9 ++++ dot_Xresources.tmpl | 18 ++++--- dot_bashrc | 2 +- dot_config/fish/config.fish.tmpl | 15 +++--- dot_config/fish/functions/wget-all.fish | 5 ++ dot_config/i3/config.tmpl | 31 +++++------ .../i3blocks/i3blocks-secondary.conf.tmpl | 4 +- dot_config/i3blocks/i3blocks.conf.tmpl | 10 ++-- dot_config/ranger/rc.conf.tmpl | 5 +- .../spotify/Users/polarbier-user/prefs.tmpl | 2 +- dot_config/st/config.def.h.tmpl | 2 +- dot_config/zathura/zathurarc | 2 +- dot_gitconfig.tmpl | 2 +- dot_imwheelrc | 4 +- dot_taskrc | 13 +++-- dot_vimrc.tmpl | 20 ++++--- dot_xinitrc.tmpl | 5 +- dot_zshrc | 2 +- scripts/executable_change-sink | 9 +++- scripts/executable_twem | 2 +- scripts/executable_xmodmap-custom.tmpl | 2 +- 26 files changed, 149 insertions(+), 115 deletions(-) create mode 100644 dot_Xmodmap-laptop-old create mode 100644 dot_config/fish/functions/wget-all.fish diff --git a/.chezmoiignore b/.chezmoiignore index 1753b05..1e1d367 100644 --- a/.chezmoiignore +++ b/.chezmoiignore @@ -13,6 +13,6 @@ txt/ .xinitrc .Xresources {{ end }} -{{ if not (eq .chezmoi.fullHostname "x1-carbon") }} +{{ if not (eq .chezmoi.hostname "x1-carbon") }} .Xmodmap-laptop {{ end }} diff --git a/aliases/key_aliases.tmpl b/aliases/key_aliases.tmpl index f0c2c64..58aa47a 100644 --- a/aliases/key_aliases.tmpl +++ b/aliases/key_aliases.tmpl @@ -28,10 +28,11 @@ td "tldr" # display [[[ # # nvt "nvidia-settings --assign CurrentMetaMode='DVI-I-1: nvidia-auto-select +0+0 {ForceCompositionPipeline=On}, HDMI-0: nvidia-auto-select +3840+0 {ForceCompositionPipeline=On}'" -{{ if eq .chezmoi.fullHostname "x1-carbon" }} +{{ if eq .chezmoi.hostname "x1-carbon" }} xr "xrandr" xro "xrandr --output HDMI2 --off" -xrr "xrandr --output HDMI2 --auto --right-of eDP1 --scale 1.33x1.33" +xrl "xrandr --output HDMI2 --auto --left-of eDP1 --scale 1.33x1.33 && xrandr --output eDP1 --panning 2560x1440+2554+0" +xrr "xrandr --output HDMI2 --auto --right-of eDP1 --scale 1.33x1.33" xrm "xrandr --output HDMI2 --auto --same-as eDP1 --scale 1.33x1.33" xrs "xrandr -s 0" {{ end }} @@ -68,9 +69,11 @@ ctt "sudo systemctl status" ctltd "sudo systemctl status dhcpcd" ctlas "sudo systemctl start sshd" -nct "sudo netctl" -nctf "sudo ip link set dev wlp3s0 down" -nctr "sudo systemctl restart netctl-auto@wlp4s0.service" +nc "sudo netctl" +ncd "sudo ip link set dev wlp3s0 down" +ncu "sudo ip link set dev wlp3s0 up" +ncr "sudo systemctl restart netctl-auto@wlp3s0.service" +ncs "sudo systemctl stop netctl-auto@wlp3s0.service" # ]]] systemctl # @@ -103,7 +106,7 @@ udub "udisksctl unmount -b /dev/sdc2" # ]]] mounting # -tc "touch" +tch "touch" vdr "vidir --verbose" # directory-related [[[ # @@ -140,13 +143,14 @@ ds "df -h | head -n 1 && df -h | grep sd" chownw "sudo chown -R kevin:wheel" chwnm "sudo chown -R kevin:wheel /run/media/{{ .chezmoi.username }}" # cd into backup folder and show backup sizes -nbu "cd /run/media/kevin/backup-hd/{{ .chezmoi.fullHostname }}/tar && lsd -l" +nbu "cd /run/media/kevin/backup-hd/{{ .chezmoi.hostname }}/tar && lsd -l" # ]]] directory-related # # power options [[[ # s "systemctl suspend" +sl "i3lock-fancy && systemctl suspend" x "exit" so "xset dpms force off" sd "tmux kill-server; systemctl poweroff" @@ -154,7 +158,7 @@ rb "systemctl reboot" lo "i3-msg exit" xm "xmodmap ~/.Xmodmap && xset r rate $XSET_DELAY $XSET_RATE" X "xmodmap ~/.Xmodmap && xset r rate $XSET_DELAY $XSET_RATE" -{{ if eq .chezmoi.fullHostname "x1-carbon" }} +{{ if eq .chezmoi.hostname "x1-carbon" }} xl "xmodmap ~/.Xmodmap-laptop && xset r rate $XSET_DELAY $XSET_RATE" XL "xmodmap ~/.Xmodmap-laptop && xset r rate $XSET_DELAY $XSET_RATE" bt "~/linux-config/dot_config/i3blocks/scripts/executable_battery" @@ -164,7 +168,7 @@ bt "~/linux-config/dot_config/i3blocks/scripts/executable_battery" # sound [[[ # -{{ if eq .chezmoi.fullHostname "nzxt" }} +{{ if eq .chezmoi.hostname "nzxt" }} vlm "alsamixer -c 0" vlh "alsamixer -c 2" {{ else }} @@ -183,7 +187,7 @@ vlm "alsamixer -c 1" # pcr "sudo pacman -Rns" # pcud "sudo pacman -Sy" # pcug "sudo pacman -Syu" -# xpc "pacman -Qqne > ~/{{ .chezmoi.os }}-config/txt/{{ .chezmoi.fullHostname }}-pkgs.txt && pacman -Qqme > ~/{{ .chezmoi.os }}-config/txt/{{ .chezmoi.fullHostname }}-aur.txt " +# xpc "pacman -Qqne > ~/{{ .chezmoi.os }}-config/txt/{{ .chezmoi.hostname }}-pkgs.txt && pacman -Qqme > ~/{{ .chezmoi.os }}-config/txt/{{ .chezmoi.hostname }}-aur.txt " # ]]] pacman # @@ -248,6 +252,7 @@ spipi "sudo pip install" # internet [[[ # pg "ping -c 2 -W 1 8.8.8.8" +wpg "watch ping -c 2 -W 1 8.8.8.8" pgc "ping 8.8.8.8" dh "sudo dhcpcd" kdh "sudo killall dhcpcd" @@ -279,13 +284,17 @@ am "antimicro" a "task" aa "task add" +aa3 "task add proj:sch +324" aal "task add proj:lnx" +aap "task add proj:" +aas "task add proj:sch" ac "task context" acn "task context none && task" ach "task context home && task" aco "task context out && task" acs "task context sch && task" acpl "task completed" +af "task proj:" al "task limit:10" ans "task +next" ao "taskopen" @@ -339,7 +348,8 @@ ka "killall" kd "killall Discord && killall Discord" kr "killall electron" kt "killall thunderbird" -mp "mpv --volume=50" +# mp "mpv --volume=50" +m "mpv" mra "man ranger" # mt "minetest" n "nvim" @@ -365,6 +375,7 @@ ta "tmux a -t" tac "tmux a -t config || tmux new -s config" taj "tmux a -t journal || tmux new -s journal" tal "tmux a" +tc "clear && tmux clear-history" tk "tmux kill-server" tl "tmux ls" tn "tmux new -s" @@ -372,7 +383,8 @@ tnb "tmux new -s backup" #]]] usn "usernames --num 20" vmd "vimdiff" -wg "wego" +# wg "wego" +wg "curl -L wthr.ml" ytd "youtube-dl" z "zathura --fork" @@ -611,7 +623,7 @@ slg "tail -n 5 $spv_dir/src/api/management/commands/update-history.log" # removes all but newest file # rmol "ls -t | tail -n +2 | xargs rm -- && l" -snw "spotify-now -i '%artist - %title'" +# snw "spotify-now -i '%artist - %title'" svd "pg_dump spotifyvis > spotifyvis.bak" @@ -691,6 +703,7 @@ nst "cp ~/Documents/workout-logs/stretching.md /tmp && nvim /tmp/stretching.md" # games [[[ # +{{ if eq .chezmoi.hostname "nzxt" }} wlm "watson log --all --project=minetest" wrm "watson report --all --project=minetest" wamv "watson start minetest +video" @@ -704,6 +717,7 @@ msv "minetestserver --gameid minimal --worldname Test --terminal" # mtrsy "rsync -vr .minetest/ /mnt/linux-files/.minetest/" tet "pandoc -f markdown -t html twitch-emote-conversion.md | xclip -selection clipboard" +{{ end }} # ]]] games # @@ -714,14 +728,10 @@ tet "pandoc -f markdown -t html twitch-emote-conversion.md | xclip -selection cl # wrf "watson report --all --tag=final" ssc "mosh mokkar@teach.cs.utoronto.ca" -# alg course -jc "javac -d out *.java" -jr "java -cp \"$CLASSPATH:out\"" - -# 263 -wl6 "watson log --all --project=263 --tag=a5" -wr6 "watson report --all --project=263 --tag=a5" -z6 "zathura --fork ~/school/263/Introduction-to-Algorithms-CLRs/Introduction\ to\ Algorithms\ -\ 3rd\ Edition.pdf" -pd6 "pdflatex a5" +rk "clear && tmux clear-history && raco test" +rka "clear && tmux clear-history && raco test hubbub_test_sample.rkt" +rkr "clear && tmux clear-history && racket" +# hk "clear && tmux clear-history && runhaskell TestChups.hs" +hk "clear && tmux clear-history && runhaskell" # ]]] school # diff --git a/aliases/key_dirs.tmpl b/aliases/key_dirs.tmpl index e76f807..5196de1 100644 --- a/aliases/key_dirs.tmpl +++ b/aliases/key_dirs.tmpl @@ -31,9 +31,11 @@ sv /etc/systemd/system ad ~/.task ccd ~/.calcurse +cms ~/Documents/codm/site cn ~/coding hbd ~/.habitctl ib ~/linux-config/dot_config/i3blocks/scripts +ms ~/coding/my-site ra ~/linux-config/dot_config/ranger sr ~/linux-config/scripts snp ~/.vim/plugged/vim-snippets/UltiSnips @@ -41,7 +43,7 @@ sw ~/.local/share/nvim/swap/ tx ~/linux-config/txt wd ~/.config/watson -{{ if eq .chezmoi.fullHostname "nzxt" }} +{{ if eq .chezmoi.hostname "nzxt" }} b1 ~/coding/mf-site/themes/base16 2d ~/coding/godot-demos/2d-plat ada ~/coding/ada-mario @@ -49,9 +51,6 @@ ft ~/coding/face-tracker j ~/Documents/journal lh ~/Documents/listening-history mmd ~/coding/move-mouse-with-head -mfs ~/coding/mf-site -mh ~/coding/mf-site/layouts -# mg ~/coding/best-mf-site-personal sv ~/coding/spotify-lib-vis/src svg ~/coding/spotify-lib-vis/src/graphs/static/graphs/scripts swd ~/coding/swex @@ -73,7 +72,7 @@ pk ~/Downloads/gba/mgba/pokemon/emerald/1 {{ end }} -{{ if eq .chezmoi.fullHostname "x1-carbon" }} +{{ if eq .chezmoi.hostname "x1-carbon" }} adb ~/coding/ada-mario/build adm ~/coding/ada-mario/media adp ~/coding/ada-mario-presentation @@ -88,25 +87,11 @@ adP ~/Pictures/ada-mario sc ~/school lt ~/school/latex-notes -6 ~/school/263 -63 ~/school/263/a5 -# 631 ~/school/263/a5/q1 -# 632 ~/school/263/a5/q2 -633 ~/school/263/a5/q3 -63t ~/school/latex-notes/263/a5 +2 ~/school/324 +2a ~/school/324-a2-2 +2e ~/school/324/e/8 +2l ~/school/324/l/8 -al1 ~/school/algorithms/w1-union-find - -# 309 [[[ # - -0c ~/school/309-proj/css -0d ~/school/309 -0j ~/school/309-proj/public/js -0l ~/school/309/l -0p ~/school/309-proj -0m ~/school/309-proj/mongo - -# ]]] 309 # +8 ~/school/384 # ]]] sch # - diff --git a/aliases/key_files.tmpl b/aliases/key_files.tmpl index a2bfa9d..1252de6 100644 --- a/aliases/key_files.tmpl +++ b/aliases/key_files.tmpl @@ -56,7 +56,7 @@ tm ~/.vim/plugged/vim-snippets/UltiSnips/texmath.snippets tp /tmp/ tw ~/linux-config/dot_taskrc wh ~/Documents/journal/todo/work-habit.md -wt ~/.config/watson/state.tmp +wt ~/.config/watson/state.md # ]]] cdn # @@ -77,3 +77,4 @@ wt ~/.config/watson/state.tmp # ]]] sch # mta ~/.minetest/clientmods/custom_aliases/init.lua +cmr ~/Documents/codm/discord-recruitment.md diff --git a/dot_Xmodmap-laptop b/dot_Xmodmap-laptop index 227be3e..d6952d0 100644 --- a/dot_Xmodmap-laptop +++ b/dot_Xmodmap-laptop @@ -1,9 +1,7 @@ clear Lock -keycode 115 = BackSpace -keycode 110 = Delete - -keycode 22 = Home -keycode 119 = End +keycode 115 = Escape +keycode 9 = End +keycode 22 = BackSpace pointer = 1 2 3 4 5 6 7 8 9 10 11 12 diff --git a/dot_Xmodmap-laptop-old b/dot_Xmodmap-laptop-old new file mode 100644 index 0000000..227be3e --- /dev/null +++ b/dot_Xmodmap-laptop-old @@ -0,0 +1,9 @@ +clear Lock + +keycode 115 = BackSpace +keycode 110 = Delete + +keycode 22 = Home +keycode 119 = End + +pointer = 1 2 3 4 5 6 7 8 9 10 11 12 diff --git a/dot_Xresources.tmpl b/dot_Xresources.tmpl index 6980d83..b9678dd 100644 --- a/dot_Xresources.tmpl +++ b/dot_Xresources.tmpl @@ -1,8 +1,9 @@ /* dpi [[[ */ -{{ if eq .chezmoi.fullHostname "x1-carbon" }} +{{ if eq .chezmoi.hostname "x1-carbon" }} +! Xft.dpi: 230 +Xft.dpi: 235 ! Xft.dpi: 240 -Xft.dpi: 230 {{ else }} Xft.dpi: 135 {{ end }} @@ -17,10 +18,9 @@ Xft.rgba: rgb /* font [[[ */ -{{ if eq .chezmoi.fullHostname "x1-carbon" }} -! URxvt.font: xft:DejaVuSansMono Nerd Font Mono:size=11 -URxvt.font: xft:DejaVuSansMono Nerd Font Mono:size=11.5 -! URxvt.font: xft:DejaVuSansMono Nerd Font Mono:size=12 +{{ if eq .chezmoi.hostname "x1-carbon" }} +URxvt.font: xft:DejaVuSansMono Nerd Font Mono:size=11 +! URxvt.font: xft:DejaVuSansMono Nerd Font Mono:size=10 {{ else }} ! URxvt.font: xft:DejaVuSansMono Nerd Font Mono:size=15 ! URxvt.font: xft:DejaVuSansMono Nerd Font Mono:size=14 @@ -31,7 +31,8 @@ URxvt.font: xft:DejaVuSansMono Nerd Font Mono:size=12 /* resize [[[ */ -URxvt.resize-font.step: 4 +! URxvt.resize-font.step: 4 +URxvt.resize-font.step: 2 URxvt.keysym.C-S-Down: resize-font:smaller URxvt.keysym.C-S-Up: resize-font:bigger URxvt.keysym.C-S-equal: resize-font:reset @@ -66,7 +67,8 @@ URxvt.scrollBar: false /* Clickable URLs [[[ */ URxvt.perl-ext-common: default,matcher,resize-font -URxvt.url-launcher: /usr/bin/xdg-open +URxvt.url-launcher: /usr/bin/firefox +! URxvt.url-launcher: firefox URxvt.matcher.button: 1 /* ]]] Clickable URLs */ diff --git a/dot_bashrc b/dot_bashrc index 5f38228..0124876 100644 --- a/dot_bashrc +++ b/dot_bashrc @@ -204,4 +204,4 @@ fi # Both PC/Laptop }}} [ -f ~/.fzf.bash ] && source ~/.fzf.bash -source ~/aliases/.key_aliases +source /home/kevin/aliases/.key_aliases diff --git a/dot_config/fish/config.fish.tmpl b/dot_config/fish/config.fish.tmpl index 90e1670..5a5db13 100755 --- a/dot_config/fish/config.fish.tmpl +++ b/dot_config/fish/config.fish.tmpl @@ -18,7 +18,7 @@ set -x GPG_TTY (tty) set -U fish_greeting # spv -{{ if eq .chezmoi.fullHostname "nzxt" }} +{{ if eq .chezmoi.hostname "nzxt" }} set -U spv_dir "/home/kevin/coding/spotify-lib-vis" set -U mfs_dir "/home/kevin/coding/mf-site" source /home/kevin/coding/spotify-lib-vis/src/scripts/api-keys-fish.sh @@ -30,7 +30,7 @@ set -x CLASSPATH $CLASSPATH /home/kevin/java/*.jar set -x LD_LIBRARY_PATH $LD_LIBRARY_PATH /usr/local/lib /usr/local/lib64 set -x PKG_CONFIG_PATH $PKG_CONFIG_PATH /usr/lib/pkgconfig set -x HASTE_SERVER https://pste.gq -{{ if eq .chezmoi.fullHostname "nzxt" }} +{{ if eq .chezmoi.hostname "nzxt" }} set -x CALCURSE_CALDAV_PASSWORD (pass show technology/linux/baikal | head -n1) {{ end }} @@ -46,7 +46,7 @@ set SPACEFISH_VI_MODE_SUFFIX '' set -x PASSWORD_STORE_CLIP_TIME 120 set -xU XSET_RATE 90 set -xU XSET_DELAY 200 -{{ if and (eq .chezmoi.fullHostname "x1-carbon") (not (eq .chezmoi.username "root")) }} +{{ if and (eq .chezmoi.hostname "x1-carbon") (not (eq .chezmoi.username "root")) }} xset r rate $XSET_DELAY $XSET_RATE {{ end }} @@ -72,7 +72,7 @@ chezmoi apply ~/scripts/sync-shortcuts {{ end }} source ~/.config/fish/key_abbr.fish > /dev/null -set -U fish_fxn_dir "{{ .chezmoi.homedir }}/linux-config/dot_config/fish/functions" +set -U fish_fxn_dir "{{ .chezmoi.homeDir }}/linux-config/dot_config/fish/functions" # set -U fish_fxn_dir "~/.config/fish/functions" abbr ff "cd $fish_fxn_dir" for fxn in (find $fish_fxn_dir -name '*.fish') @@ -124,8 +124,8 @@ abbr def "define" abbr ens "enable-site" abbr ev "evince-silent" # abbr fbg "find-bg" +abbr fv "fzf-vim" abbr fvft "find-vim-filetype" -abbr fzv "fzf-vim" # git [[[ # abbr gcamp "git-amend-push" @@ -140,9 +140,9 @@ abbr grmb "git-delete-branch" abbr gro "git-replace-origin" # ]]] git # -abbr m "man-vim" abbr ma "man-vim task" abbr mat "math" +abbr mn "man-vim" abbr pgr "grep-pdf" abbr pgrf "grep-pdf-file" abbr png "git-push-new-gitea" @@ -161,6 +161,7 @@ abbr thes "thesaurus" abbr ut "unix-timestamp" abbr uzr "unzip-rm" abbr vsnp "vim-snippet" +abbr wga "wget-all" abbr xya "export-pkgs" # school [[[ # @@ -178,4 +179,4 @@ abbr jct "java-compile-test" # ]]] fxn abbr's # # task sync > /dev/null 2>&1 -~/scripts/xmodmap-custom +# ~/scripts/xmodmap-custom diff --git a/dot_config/fish/functions/wget-all.fish b/dot_config/fish/functions/wget-all.fish new file mode 100644 index 0000000..179b039 --- /dev/null +++ b/dot_config/fish/functions/wget-all.fish @@ -0,0 +1,5 @@ +function wget-all + for url in $argv + wget $url + end +end diff --git a/dot_config/i3/config.tmpl b/dot_config/i3/config.tmpl index fb1f177..5562435 100755 --- a/dot_config/i3/config.tmpl +++ b/dot_config/i3/config.tmpl @@ -4,7 +4,7 @@ set $term urxvt set $term_alt st # set $term st # set $term_alt urxvt -{{ if eq .chezmoi.fullHostname "x1-carbon" }} +{{ if eq .chezmoi.hostname "x1-carbon" }} exec dunst exec compton exec imwheel @@ -58,7 +58,8 @@ bindsym Mod4+o exec xclip -selection clipboard ~/.password-store/social/gmail && bindsym Mod4+$mod+o exec xset dpms force off # bindsym Mod4+p workspace $ws4; exec pgadmin3 # bindsym Mod4+p exec pycharm -bindsym Mod4+p exec passmenu +bindsym Mod4+p exec $type_delay_cmd && xdotool type '.catch ' +bindsym Mod4+$mod+p exec passmenu # bindsym Mod4+$mod+p exec notify-send "ping" "$(ping -c 3 -W 1 8.8.8.8)" bindsym Mod4+q exec qdirstat bindsym Mod4+r exec $term -e ranger @@ -79,8 +80,8 @@ bindsym Print --release exec "scrot -s /tmp/screenshot-$(date +%F_%T).png -e 'xc bindsym Control+Print --release exec "scrot -u /tmp/screenshot-$(date +%F_%T).png -e 'xclip -selection c -t image/png < $f'" {{ else }} bindsym Mod4+x exec xmodmap ~/.Xmodmap-laptop && xset r rate $XSET_DELAY $XSET_RATE -bindsym Control+$mod+p --release exec "scrot -s /tmp/screenshot-$(date +%F_%T).png -e 'xclip -selection c -t image/png < $f'" -bindsym Control+Shift+p --release exec "scrot -u /tmp/screenshot-$(date +%F_%T).png -e 'xclip -selection c -t image/png < $f'" +bindsym Control+p --release exec "scrot -s ~/tmp/screenshot-$(date +%F_%T).png -e 'xclip -selection c -t image/png < $f'" +bindsym Control+$mod+p --release exec "scrot -u ~/tmp/screenshot-$(date +%F_%T).png -e 'xclip -selection c -t image/png < $f'" {{ end }} # ]]] app shortcuts # @@ -98,7 +99,7 @@ bindsym $mod+Mod4+grave exec redshift -x # backlight [[[ # -{{ if eq .chezmoi.fullHostname "x1-carbon" }} +{{ if eq .chezmoi.hostname "x1-carbon" }} bindsym Shift+F1 exec xbacklight -set 10 bindsym Shift+F2 exec xbacklight -set 20 bindsym Shift+F3 exec xbacklight -set 30 @@ -108,7 +109,7 @@ bindsym Shift+F6 exec xbacklight -set 60 bindsym Shift+F7 exec xbacklight -set 70 bindsym Shift+F8 exec xbacklight -set 80 bindsym Shift+F9 exec xbacklight -set 90 -bindsym Shift+F0 exec xbacklight -set 100 +bindsym Shift+F10 exec xbacklight -set 100 bindsym Control+$mod+plus exec xbacklight -inc 2 bindsym Control+$mod+minus exec xbacklight -dec 2 @@ -166,7 +167,7 @@ for_window [class="^.*"] border pixel 3 # gaps bottom 0 gaps inner 0 gaps outer 0 -{{ if eq .chezmoi.fullHostname "nzxt" }} +{{ if eq .chezmoi.hostname "nzxt" }} border_radius $border_radius {{ end }} @@ -224,7 +225,7 @@ bindsym $mod+minus move workspace to output left bindsym $mod+plus move workspace to output right # move focused window -{{ if eq .chezmoi.fullHostname "x1-carbon" }} +{{ if eq .chezmoi.hostname "x1-carbon" }} bindsym Control+Shift+h move left 50px bindsym Control+Shift+j move down 50px bindsym Control+Shift+k move up 50px @@ -267,7 +268,7 @@ bindsym Control+$mod+a floating enable; resize set 400px 150px; move absolute po set $make_st_script "/home/kevin/st/make-st.sh" # test -{{ if eq .chezmoi.fullHostname "x1-carbon" }} +{{ if eq .chezmoi.hostname "x1-carbon" }} bindsym Control+Shift+q exec wal -i $($scripts_path/shuffler "$HOME/Pictures/Backgrounds/bright/editing") && $make_st_script bindsym Control+Shift+w exec wal -i $($scripts_path/shuffler "$HOME/Pictures/Backgrounds/dim/non-editing") && $make_st_script bindsym Control+$mod+z exec feh --bg-fill ~/Pictures/Backgrounds/dim/black.jpg @@ -283,10 +284,10 @@ bindsym Control+$mod+y exec wal -i $($scripts_path/shuffler "$HOME/Pictures/Back # ws names [[[ # set $ws1 "1 " -{{ if eq .chezmoi.fullHostname "x1-carbon" }} +{{ if eq .chezmoi.hostname "x1-carbon" }} set $secondary "HDMI2" set $main "eDP1" -{{ else if eq .chezmoi.fullHostname "nzxt" }} +{{ else if eq .chezmoi.hostname "nzxt" }} set $secondary "DVI-I-1" set $main "HDMI-0" {{ end }} @@ -335,8 +336,8 @@ for_window [class="ada-mario"] move absolute position 640 0 set $ws6 "6 " workspace $ws6 output $secondary assign [class="Slack"] $ws6 -# bindsym Mod4+d workspace $ws6; exec discord -bindsym Mod4+d workspace $ws6; exec riot-desktop +bindsym Mod4+d workspace $ws6; exec discord +# bindsym Mod4+d workspace $ws6; exec riot-desktop # bindsym Mod4+i workspace $ws6; exec firefox -new-window https://riot.im/app/#/home bindsym Mod4+k workspace $ws6; exec slack @@ -476,7 +477,7 @@ set $bar_trans 00 set $main_ws_trans aa bar { i3bar_command i3bar -t - {{ if eq .chezmoi.fullHostname "x1-carbon" }} + {{ if eq .chezmoi.hostname "x1-carbon" }} font pango:$sb_font 17 {{ else }} # font pango:$sb_font 17 @@ -506,7 +507,7 @@ bar { bar { output $secondary - {{ if eq .chezmoi.fullHostname "x1-carbon" }} + {{ if eq .chezmoi.hostname "x1-carbon" }} font pango:$sb_font 18 {{ else }} font pango:$sb_font 20 diff --git a/dot_config/i3blocks/i3blocks-secondary.conf.tmpl b/dot_config/i3blocks/i3blocks-secondary.conf.tmpl index dfdf014..5297035 100755 --- a/dot_config/i3blocks/i3blocks-secondary.conf.tmpl +++ b/dot_config/i3blocks/i3blocks-secondary.conf.tmpl @@ -36,7 +36,7 @@ interval=60 [calendar] interval=30 label= -{{ if eq .chezmoi.fullHostname "nzxt" }} +{{ if eq .chezmoi.hostname "nzxt" }} DATEFMT=+%H:%M.%a-%m-%d {{ else }} DATEFMT=+%H:%M @@ -48,7 +48,7 @@ WIDTH=220 # ]]] time # -{{ if eq .chezmoi.fullHostname "x1-carbon" }} +{{ if eq .chezmoi.hostname "x1-carbon" }} [temperature] label= interval=5 diff --git a/dot_config/i3blocks/i3blocks.conf.tmpl b/dot_config/i3blocks/i3blocks.conf.tmpl index c1eb04f..f309bba 100755 --- a/dot_config/i3blocks/i3blocks.conf.tmpl +++ b/dot_config/i3blocks/i3blocks.conf.tmpl @@ -15,7 +15,7 @@ color=#cbe4ff # volume/spotify [[[ # -{{ if eq .chezmoi.fullHostname "nzxt" }} +{{ if eq .chezmoi.hostname "nzxt" }} [volume] interval=once signal=1 @@ -32,7 +32,7 @@ interval=5 # laptop [[[ # -{{ if eq .chezmoi.fullHostname "x1-carbon" }} +{{ if eq .chezmoi.hostname "x1-carbon" }} [battery] label=⚡ interval=30 @@ -54,7 +54,7 @@ interval=5 [calendar] interval=30 label= -{{ if eq .chezmoi.fullHostname "nzxt" }} +{{ if eq .chezmoi.hostname "nzxt" }} DATEFMT=+%H:%M {{ else }} DATEFMT=+%H:%M.%a-%m-%d @@ -67,7 +67,7 @@ WIDTH=220 # sys.monitoring [[[ # -{{ if eq .chezmoi.fullHostname "nzxt" }} +{{ if eq .chezmoi.hostname "nzxt" }} # [wifi] # label= # instance=wlp4s0 @@ -88,7 +88,7 @@ interval=5 label= interval=5 -{{ if eq .chezmoi.fullHostname "nzxt" }} +{{ if eq .chezmoi.hostname "nzxt" }} [memory] label= # color=#3da061 diff --git a/dot_config/ranger/rc.conf.tmpl b/dot_config/ranger/rc.conf.tmpl index 7c4281e..9e90a2f 100755 --- a/dot_config/ranger/rc.conf.tmpl +++ b/dot_config/ranger/rc.conf.tmpl @@ -272,7 +272,7 @@ map abort map change_mode normal map ~ set viewmode! -map i display_file +# map id display_file map ? help map W display_log # map w taskview_open @@ -331,6 +331,7 @@ map move down=1 pages=True map move up=1 pages=True map move right=1 map console delete +map i console touch%space map console touch%space # VIM-like @@ -699,7 +700,7 @@ map zr shell unzip %f && rm %f map e. open_with evince f map v. shell $EDITOR %f -source {{ .chezmoi.homedir }}/.config/ranger/key_mappings.conf +source {{ .chezmoi.homeDir }}/.config/ranger/key_mappings.conf map dg shell dragon-drag-and-drop -a -x %p # map shell dragon-drag-and-drop -a -x %p diff --git a/dot_config/spotify/Users/polarbier-user/prefs.tmpl b/dot_config/spotify/Users/polarbier-user/prefs.tmpl index d56d165..c8f45f7 100644 --- a/dot_config/spotify/Users/polarbier-user/prefs.tmpl +++ b/dot_config/spotify/Users/polarbier-user/prefs.tmpl @@ -4,7 +4,7 @@ ui.track_notifications_enabled=false ui.show_friend_feed=false audio.play_bitrate_enumeration=4 app.player.volume=40000 -{{ if eq .chezmoi.fullHostname "x1-carbon" }} +{{ if eq .chezmoi.hostname "x1-carbon" }} app.browser.zoom-level=300 {{ else }} app.browser.zoom-level=75 diff --git a/dot_config/st/config.def.h.tmpl b/dot_config/st/config.def.h.tmpl index 5939682..055fe0f 100644 --- a/dot_config/st/config.def.h.tmpl +++ b/dot_config/st/config.def.h.tmpl @@ -7,7 +7,7 @@ * * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html */ -{{ if eq .chezmoi.fullHostname "x1-carbon" }} +{{ if eq .chezmoi.hostname "x1-carbon" }} static char *font = "DejaVuSansMono Nerd Font Mono:pixelsize=33:antialias=true:autohint=true"; {{ else }} static char *font = "DejaVuSansMono Nerd Font Mono:pixelsize=20:antialias=true:autohint=true"; diff --git a/dot_config/zathura/zathurarc b/dot_config/zathura/zathurarc index e1ff79d..b5cc5a8 100755 --- a/dot_config/zathura/zathurarc +++ b/dot_config/zathura/zathurarc @@ -1,4 +1,4 @@ -set recolor true +# set recolor true # black set recolor-darkcolor "#ffffff" set recolor-lightcolor "#000000" diff --git a/dot_gitconfig.tmpl b/dot_gitconfig.tmpl index 2c1168d..9ae849b 100644 --- a/dot_gitconfig.tmpl +++ b/dot_gitconfig.tmpl @@ -18,7 +18,7 @@ [diff] tool = vimdiff [commit] - gpgsign = true + gpgsign = false [alias] a = add c = commit diff --git a/dot_imwheelrc b/dot_imwheelrc index 3a005ba..cc82f29 100644 --- a/dot_imwheelrc +++ b/dot_imwheelrc @@ -1,3 +1,3 @@ ".*" -None, Up, Button4, 5 -None, Down, Button5, 5 +None, Up, Button4, 3 +None, Down, Button5, 3 diff --git a/dot_taskrc b/dot_taskrc index fe293dc..399316f 100644 --- a/dot_taskrc +++ b/dot_taskrc @@ -42,16 +42,21 @@ taskd.certificate=\/home\/kevin\/.task\/do.cert.pem taskd.key=\/home\/kevin\/.task\/do.key.pem taskd.ca=\/home\/kevin\/.task\/ca.cert.pem taskd.server=taskd.khkm.tk:53589 -taskd.credentials=Hevin\/Kevin\/e843c83c-b701-43e7-9509-70595333b419 +taskd.credentials=Hevin\/Kevin\/eb6225dc-80fb-4721-8b03-9114c6c4423d +recurrence=no # }}} server # # urgency {{{ # -urgency.user.project.mfs.coefficient=3 -urgency.user.project.sch.coefficient=5 -urgency.uda.priority.L.coefficient=-1 +urgency.user.project.codm.coefficient=-2 +urgency.user.project.ms.coefficient=3 +urgency.user.project.pey.coefficient=5 +urgency.user.project.sch.coefficient=7 +urgency.uda.priority.H.coefficient=10 +urgency.uda.priority.L.coefficient=-7 urgency.uda.priority..coefficient=1 +urgency.user.tag.nx.coefficient=15 # }}} urgency # diff --git a/dot_vimrc.tmpl b/dot_vimrc.tmpl index 5694aa4..5a751f6 100644 --- a/dot_vimrc.tmpl +++ b/dot_vimrc.tmpl @@ -58,17 +58,20 @@ autocmd CursorHold * if !bufexists("[Command Line]") | checktime | endif autocmd BufNewFile,BufRead .* set syntax=sh autocmd BufRead,BufNewFile /tmp/calcurse*,~/.calcurse/notes/* set filetype=markdown -autocmd FileType *css,gitcommit,htmldjango,html,javascript,json,lisp,markdown,tex,text,yaml set tabstop=2 shiftwidth=2 +autocmd FileType *css,gitcommit,haskell,htmldjango,html,javascript,json,lisp, + \markdown,racket,tex,text,yaml set ts=2 sw=2 " autocmd BufNewFile,BufRead *.md set filetype=markdown " autocmd Filetype markdown set textwidth=0 " autocmd Filetype html set foldmarker=0 autocmd BufNewFile,BufRead *.gd set expandtab! autocmd Filetype go set expandtab! sw=4 -" autocmd Filetype markdown set commentstring= +autocmd FileType javascript,python,lua set fdm=indent +autocmd Filetype markdown set commentstring= " autocmd Filetype markdown map :LivedownToggle +autocmd Filetype markdown let g:AutoPairs={'(':')', '[':']', '{':'}','"':'"', "`":"`", '```':'```', '"""':'"""', "'''":"'''","*":"*"} autocmd Filetype markdown map :InstantMarkdownPreview autocmd Filetype markdown map :InstantMarkdownStop:InstantMarkdownPreview -autocmd Filetype markdown nnoremap >>A +autocmd Filetype markdown inoremap >>A autocmd Filetype markdown inoremap <<> > " autocmd FileType markdown,tex,text set spell spelllang=en_us formatoptions=cjMqtvw autocmd FileType markdown,tex,text set spell spelllang=en_us formatoptions=acjMqtvw " autocmd FileType tex,text set spell spelllang=en_us formatoptions=acjMqtvw -autocmd FileType python,lua set fdm=indent autocmd Filetype json nnoremap j :%!python -m json.tool autocmd Filetype json set foldmethod=marker +autocmd Filetype racket set commentstring=;%s; +autocmd Filetype racket let g:AutoPairs={'(':')', '[':']', '{':'}','"':'"', "`":"`", '```':'```', '"""':'"""', "'''":"'''"} autocmd FileType sh map :!clear && shellcheck % autocmd Filetype taskdata set tw=0 autocmd FileType tex set updatetime=1000 timeoutlen=300 tw=65 @@ -275,7 +279,7 @@ Plug 'djoshea/vim-autoread' " Plug 'trapd00r/vim-syntax-vidir-ls' Plug 'calviken/vim-gdscript3' " display hex colors in Vim -Plug 'RRethy/vim-hexokinase' +" Plug 'RRethy/vim-hexokinase' Plug 'junegunn/goyo.vim' " prevent commands being executed through modelines " Plug 'ciaranm/securemodelines/' @@ -317,6 +321,8 @@ Plug 'junegunn/vim-easy-align' xmap ga (EasyAlign) " Start interactive EasyAlign for a motion/text object (e.g. gaip) nmap ga (EasyAlign) +Plug 'wlangstroth/vim-racket' +Plug 'masukomi/vim-markdown-folding' " ]]] vim-plug " " Mappings [[[ " @@ -333,6 +339,7 @@ colorscheme gotham256 nnoremap nnoremap +nnoremap Y yy " visual select across lines by default " nnoremap v @@ -558,12 +565,13 @@ autocmd Filetype fish inoremap 2 $argv[2] autocmd Filetype javascript inoremap x process.exit() +" autocmd Filetype markdown inoremap bc because autocmd Filetype markdown inoremap cb - [ ] autocmd Filetype markdown nnoremap x 0f[lrx " nnoremap x 0f[lrx autocmd Filetype go-template inoremap e {{"{{ else }}"}} -autocmd Filetype go-template inoremap hd {{"{{ .chezmoi.homedir }}"}} +autocmd Filetype go-template inoremap hd {{"{{ .chezmoi.homeDir }}"}} autocmd Filetype go-template nnoremap fp :%s/{{"{{{"}}/[[[/g:%s/}}}/]]]/g autocmd Filetype python inoremap bp breakpoint() diff --git a/dot_xinitrc.tmpl b/dot_xinitrc.tmpl index 28393d2..aa22620 100644 --- a/dot_xinitrc.tmpl +++ b/dot_xinitrc.tmpl @@ -4,13 +4,14 @@ xrandr --setprovideroutputsource modesetting NVIDIA-0 {{ if .ext_kb }} xmodmap ~/.Xmodmap {{ else }} -xmodmap ~/.Xmodmap-laptop +# xmodmap ~/.Xmodmap-laptop +xmodmap ~/tmp/.Xmodmap-laptop {{ end }} redshift -O 2000 xset r rate $XSET_DELAY $XSET_RATE # exec /home/kevin/Downloads/dwm/reload-dwm.sh -{{ if eq .chezmoi.fullHostname "nzxt" }} +{{ if eq .chezmoi.hostname "nzxt" }} dunst & compton -b imwheel & diff --git a/dot_zshrc b/dot_zshrc index 87dc0be..bd7cc01 100644 --- a/dot_zshrc +++ b/dot_zshrc @@ -176,4 +176,4 @@ export GPG_TTY=$(tty) export PASSWORD_STORE_CLIP_TIME=120 #exec fish -source ~/aliases/.key_aliases +source /home/kevin/aliases/.key_aliases diff --git a/scripts/executable_change-sink b/scripts/executable_change-sink index 598364e..6a90a17 100755 --- a/scripts/executable_change-sink +++ b/scripts/executable_change-sink @@ -9,9 +9,16 @@ case $1 in devicename="alsa_output.usb-1852_DigiHug_USB_Audio-01.analog-stereo" ;; line-out ) - devicename="alsa_output.pci-0000_00_14.2.analog-stereo" + # devicename="alsa_output.pci-0000_00_14.2.analog-stereo" + devicename="alsa_output.pci-0000_00_1b.0.analog-stereo" # devicename="alsa_output.pci-0000_00_14.2.iec958-stereo" ;; + hdmi ) + devicename="alsa_output.pci-0000_00_03.0.hdmi-stereo-extra1" + ;; + speakers ) + devicename="alsa_output.pci-0000_00_1b.0.analog-stereo" + ;; esac echo "$devicename" diff --git a/scripts/executable_twem b/scripts/executable_twem index fdd93e9..dcd0c61 100644 --- a/scripts/executable_twem +++ b/scripts/executable_twem @@ -1,7 +1,7 @@ #!/bin/bash sleep .3 -xdotool type 'https://twem.tk/.png' +xdotool type 'https://twem.gq/.png' for i in {1..4} ; do xdotool key Left done diff --git a/scripts/executable_xmodmap-custom.tmpl b/scripts/executable_xmodmap-custom.tmpl index 6c7ed52..12f0d65 100644 --- a/scripts/executable_xmodmap-custom.tmpl +++ b/scripts/executable_xmodmap-custom.tmpl @@ -3,7 +3,7 @@ DELAY=200 RATE=90 -{{ if eq .chezmoi.fullHostname "x1-carbon" }} +{{ if eq .chezmoi.hostname "x1-carbon" }} xmodmap ~/.Xmodmap-laptop &> /dev/null {{ else }} xmodmap ~/.Xmodmap &> /dev/null