From 413ffb53db5d9db99f6471cd24b90d17e07a5501 Mon Sep 17 00:00:00 2001 From: Kevin Mok Date: Thu, 4 Jul 2019 04:06:25 -0400 Subject: [PATCH] Update (laptop) --- dot_Xresources.tmpl | 4 ++-- dot_config/i3/config.tmpl | 6 ++++-- dot_vimrc.tmpl | 2 +- dot_xinitrc.tmpl | 4 ++++ key_aliases.tmpl | 4 +++- key_dirs.tmpl | 10 ++++++++-- private_dot_gnupg/gpg-agent-template.conf | 2 ++ scripts/executable_backup | 2 -- txt/exclude-dirs-backup.txt.tmpl | 1 + txt/x1-carbon-aur.txt | 6 ++++++ txt/x1-carbon-pkgs.txt | 12 ++++++++++++ 11 files changed, 43 insertions(+), 10 deletions(-) create mode 100644 private_dot_gnupg/gpg-agent-template.conf diff --git a/dot_Xresources.tmpl b/dot_Xresources.tmpl index 4c8cf6c..03d3a5e 100755 --- a/dot_Xresources.tmpl +++ b/dot_Xresources.tmpl @@ -1,8 +1,8 @@ /* font [[[ */ {{ if eq .chezmoi.fullHostname "x1-carbon" }} -! URxvt.font: xft:DejaVuSansMono Nerd Font Mono:size=11 -URxvt.font: xft:DejaVuSansMono Nerd Font Mono:size=12 +URxvt.font: xft:DejaVuSansMono Nerd Font Mono:size=11 +! URxvt.font: xft:DejaVuSansMono Nerd Font Mono:size=12 {{ else }} ! URxvt.font: xft:DejaVuSansMono Nerd Font Mono:size=14 URxvt.font: xft:DejaVuSansMono Nerd Font Mono:size=13.5 diff --git a/dot_config/i3/config.tmpl b/dot_config/i3/config.tmpl index dde02a2..a7eaab6 100755 --- a/dot_config/i3/config.tmpl +++ b/dot_config/i3/config.tmpl @@ -64,12 +64,13 @@ bindsym Mod4+w exec notify-send "watson status" "$(watson status)" bindsym Mod4+$mod+w exec notify-send "watson stop" "$(watson status && watson stop)" bindsym Control+Mod4+w exec urxvt -e nvim /home/kevin/.config/watson/state.tmp # bindsym Mod4+x exec $swex -bindsym Mod4+x exec xmodmap ~/.Xmodmap && xset r rate $XSET_DELAY $XSET_RATE bindsym Mod4+z exec cliqz {{ if .ext_kb }} +bindsym Mod4+x exec xmodmap ~/.Xmodmap && xset r rate $XSET_DELAY $XSET_RATE bindsym Print --release exec "scrot -s /tmp/screenshot-$(date +%F_%T).png -e 'xclip -selection c -t image/png < $f'" 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 $mod+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 }} @@ -325,7 +326,8 @@ assign [class="spotify"] $ws10 workspace $ws10 output $secondary set $hp 2 # bindsym Mod4+v workspace $ws10; exec urxvt -e alsamixer -c 0 -bindsym Mod4+v workspace $ws10; exec urxvt -e cava +bindsym Mod4+v workspace $ws10; exec urxvt -e alsamixer -c 1 +bindsym Mod4+$mod+c workspace $ws10; exec urxvt -e cava # bindsym Mod4+h workspace $ws10; exec urxvt -e alsamixer -c $hp bindsym Mod4+s workspace $ws10; exec spotify diff --git a/dot_vimrc.tmpl b/dot_vimrc.tmpl index 3774ace..9265b53 100755 --- a/dot_vimrc.tmpl +++ b/dot_vimrc.tmpl @@ -333,7 +333,7 @@ vnoremap n q:anorm nnoremap nw :set nowrap " check if in neovim nnoremap nv :echo has('nvim') -" open fold recursively +" recursively open fold nnoremap o zO " Plug commands nnoremap p "*p diff --git a/dot_xinitrc.tmpl b/dot_xinitrc.tmpl index b298cd9..28393d2 100755 --- a/dot_xinitrc.tmpl +++ b/dot_xinitrc.tmpl @@ -1,7 +1,11 @@ xrandr --setprovideroutputsource modesetting NVIDIA-0 [[ -f ~/.Xresources ]] && xrdb -merge ~/.Xresources # xrandr --auto +{{ if .ext_kb }} xmodmap ~/.Xmodmap +{{ else }} +xmodmap ~/.Xmodmap-laptop +{{ end }} redshift -O 2000 xset r rate $XSET_DELAY $XSET_RATE # exec /home/kevin/Downloads/dwm/reload-dwm.sh diff --git a/key_aliases.tmpl b/key_aliases.tmpl index 3f326f8..2765ce1 100755 --- a/key_aliases.tmpl +++ b/key_aliases.tmpl @@ -103,6 +103,7 @@ X "xmodmap ~/.Xmodmap && xset r rate $XSET_DELAY $XSET_RATE" {{ if eq .chezmoi.fullHostname "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" {{ end }} # ]]] power options # @@ -165,7 +166,8 @@ pipi "pip install" spipi "sudo pip install" # internet -pg "ping -c 3 -W 1 8.8.8.8" +pg "ping -c 2 -W 1 8.8.8.8" +pgc "ping 8.8.8.8" dh "sudo dhcpcd" kdh "sudo killall dhcpcd" rdh "sudo killall dhcpcd && sudo dhcpcd" diff --git a/key_dirs.tmpl b/key_dirs.tmpl index a481270..7a0e764 100755 --- a/key_dirs.tmpl +++ b/key_dirs.tmpl @@ -37,8 +37,6 @@ wd ~/.config/watson b1 ~/coding/mf-site/themes/base16 2d ~/coding/godot-demos/2d-plat ad ~/coding/ada-mario -ads ~/coding/ada-mario/scripts -adP ~/Pictures/ada-mario ft ~/coding/face-tracker j ~/Documents/journal lh ~/Documents/listening-history @@ -54,6 +52,14 @@ tb ~/coding/trapbot/src/trapbot wo ~/Documents/workout-logs/11 {{ end }} +{{ if eq .chezmoi.fullHostname "x1-carbon" }} +adb ~/coding/ada-mario/build +adm ~/coding/ada-mario/media +adp ~/coding/ada-mario-presentation +ads ~/coding/ada-mario/scripts +adP ~/Pictures/ada-mario +{{ end }} + # ]]] cdn # # sch [[[ # diff --git a/private_dot_gnupg/gpg-agent-template.conf b/private_dot_gnupg/gpg-agent-template.conf new file mode 100644 index 0000000..da7b2f1 --- /dev/null +++ b/private_dot_gnupg/gpg-agent-template.conf @@ -0,0 +1,2 @@ +default-cache-ttl 86400 +max-cache-ttl 86400 diff --git a/scripts/executable_backup b/scripts/executable_backup index cd37065..41a8e9e 100755 --- a/scripts/executable_backup +++ b/scripts/executable_backup @@ -26,6 +26,4 @@ case $2 in full ) sudo rsync -PraAX --exclude-from="$exclude_dirs_list_full" / "$backup_dest/full" # sudo rsync -PraAX /home "$backup_dest/full" - # echo rsync -PraAX --exclude-from="$exclude_dirs_list_full" / "$backup_dest/full" - # echo rsync -PraAX /home "$backup_dest/full/home" esac diff --git a/txt/exclude-dirs-backup.txt.tmpl b/txt/exclude-dirs-backup.txt.tmpl index 3f75aee..33ad9a8 100755 --- a/txt/exclude-dirs-backup.txt.tmpl +++ b/txt/exclude-dirs-backup.txt.tmpl @@ -9,6 +9,7 @@ /home/kevin/.local/share/godot/templates /home/kevin/Android /home/kevin/coding/archived/opencv +/home/kevin/Downloads/build /lost+found /mnt /opt diff --git a/txt/x1-carbon-aur.txt b/txt/x1-carbon-aur.txt index 2c12246..346216e 100755 --- a/txt/x1-carbon-aur.txt +++ b/txt/x1-carbon-aur.txt @@ -1,6 +1,7 @@ bear chezmoi discord +dragon-drag-and-drop-git gdm3setup-utils godot heroku-cli @@ -11,7 +12,9 @@ libc++abi libc++experimental mongodb-bin nerd-fonts-dejavu-complete +pdftk-bin qdirstat +spotify spotify-now-git texlive-local-algorithmicx texlive-local-algorithms @@ -26,11 +29,14 @@ texlive-local-pgfplots texlive-local-siunitx texlive-local-tkz-base texlive-local-tkz-euclide +texlive-local-was texlive-local-xifthen texlive-localmanager-git trizen ttf-hack-powerline-git +vidir watson +wego wpa_actiond yad yay diff --git a/txt/x1-carbon-pkgs.txt b/txt/x1-carbon-pkgs.txt index 1a601af..56982cd 100755 --- a/txt/x1-carbon-pkgs.txt +++ b/txt/x1-carbon-pkgs.txt @@ -13,6 +13,7 @@ cheese chrome-gnome-shell chromium cmake +colordiff compton coreutils cryptsetup @@ -21,6 +22,7 @@ dhcpcd dialog diffutils dmenu +dunst e2fsprogs eog epiphany @@ -38,9 +40,11 @@ fzf gawk gcc gcc-libs +gdb gdm gedit gettext +gimp git glibc gnome-backgrounds @@ -119,6 +123,7 @@ man-db man-pages mdadm mousetweaks +mpv mutter nano nautilus @@ -128,11 +133,14 @@ netctl npm ntfs-3g ntp +numlockx +nvidia-settings orca pacman pacman-contrib pass pciutils +peek perl pkgconf procps-ng @@ -157,11 +165,14 @@ simple-scan stow sudo sushi +sxiv sysfsutils +sysstat systemd-sysvcompat tar texinfo texlive-core +tldr tor totem tracker @@ -219,6 +230,7 @@ xorg-xwd xorg-xwininfo xorg-xwud yelp +youtube-dl zathura zathura-pdf-poppler zsh