diff --git a/dot_Xmodmap-laptop b/dot_Xmodmap-laptop index 84749ce..227be3e 100644 --- a/dot_Xmodmap-laptop +++ b/dot_Xmodmap-laptop @@ -5,3 +5,5 @@ 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 874648e..6980d83 100644 --- a/dot_Xresources.tmpl +++ b/dot_Xresources.tmpl @@ -1,6 +1,11 @@ /* dpi [[[ */ +{{ if eq .chezmoi.fullHostname "x1-carbon" }} +! Xft.dpi: 240 +Xft.dpi: 230 +{{ else }} Xft.dpi: 135 +{{ end }} Xft.autohint: 0 Xft.lcdfilter: lcddefault Xft.hintstyle: hintfull @@ -13,7 +18,8 @@ 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 +URxvt.font: xft:DejaVuSansMono Nerd Font Mono:size=11.5 ! URxvt.font: xft:DejaVuSansMono Nerd Font Mono:size=12 {{ else }} ! URxvt.font: xft:DejaVuSansMono Nerd Font Mono:size=15 diff --git a/dot_config/fish/config.fish.tmpl b/dot_config/fish/config.fish.tmpl index 745a5aa..90e1670 100755 --- a/dot_config/fish/config.fish.tmpl +++ b/dot_config/fish/config.fish.tmpl @@ -30,7 +30,9 @@ 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" }} set -x CALCURSE_CALDAV_PASSWORD (pass show technology/linux/baikal | head -n1) +{{ end }} {{ if eq .linux_os "termux" }} # set SPACEFISH_PROMPT_ORDER time user dir host git package node docker ruby golang php rust haskell julia aws conda pyenv kubecontext exec_time line_sep battery jobs exit_code vi_mode char @@ -49,7 +51,7 @@ xset r rate $XSET_DELAY $XSET_RATE {{ end }} # set -U BROWSER "chromium" -set -U BROWSER "firefox" +set -xU BROWSER "firefox" # ]]] universal var's # diff --git a/dot_config/i3/config.tmpl b/dot_config/i3/config.tmpl index 9f0e3dc..fb1f177 100755 --- a/dot_config/i3/config.tmpl +++ b/dot_config/i3/config.tmpl @@ -79,8 +79,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 $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'" +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'" {{ end }} # ]]] app shortcuts # @@ -113,8 +113,8 @@ bindsym Shift+F0 exec xbacklight -set 100 bindsym Control+$mod+plus exec xbacklight -inc 2 bindsym Control+$mod+minus exec xbacklight -dec 2 -bindsym $mod+w exec sudo systemctl start netctl-auto@wlp3s0.service -bindsym $mod+q exec sudo systemctl stop netctl-auto@wlp3s0.service +bindsym Control+$mod+w exec sudo systemctl start netctl-auto@wlp3s0.service +bindsym Control+$mod+q exec sudo systemctl stop netctl-auto@wlp3s0.service {{ end }} # ]]] backlight # @@ -267,13 +267,16 @@ 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" }} +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 +{{ else }} bindsym Control+$mod+q exec wal -i $($scripts_path/shuffler "$HOME/Pictures/Backgrounds/bright/editing") && $make_st_script bindsym Control+$mod+w exec wal -i $($scripts_path/shuffler "$HOME/Pictures/Backgrounds/dim/non-editing") && $make_st_script +{{ end }} bindsym $mod+r exec wal -i $($scripts_path/shuffler "$HOME/Pictures/Backgrounds/dim/editing") && $make_st_script bindsym Control+$mod+y exec wal -i $($scripts_path/shuffler "$HOME/Pictures/Backgrounds/bright/non-editing") && $make_st_script -{{ if eq .chezmoi.fullHostname "x1-carbon" }} -bindsym Control+$mod+z exec feh --bg-fill ~/Pictures/Backgrounds/dim/black.jpg -{{ end }} # ]]] backgrounds # diff --git a/dot_config/i3blocks/scripts/executable_wifi b/dot_config/i3blocks/scripts/executable_wifi index 1ce6ee0..85d3aee 100755 --- a/dot_config/i3blocks/scripts/executable_wifi +++ b/dot_config/i3blocks/scripts/executable_wifi @@ -29,7 +29,7 @@ INTERFACE="${BLOCK_INSTANCE:-wlan0}" #------------------------------------------------------------------------ -QUALITY=$(sudo grep $INTERFACE /proc/net/wireless | awk '{ print int($3 * 100 / 70) }') +QUALITY=$(grep $INTERFACE /proc/net/wireless | awk '{ print int($3 * 100 / 70) }') # echo $QUALITY W_inter=$(ip link | grep "[1-9]: wlp" | cut -d " " -f2 | tr -d ':') W_name=$(nmcli d | grep "$W_inter" | awk '{print $4}') diff --git a/dot_taskopenrc b/dot_taskopenrc index cbb9b95..ee8b244 100644 --- a/dot_taskopenrc +++ b/dot_taskopenrc @@ -1,6 +1,7 @@ -#BROWSER='xdg-open $FILE &>/dev/null' -#EDITOR='vim' +# BROWSER='xdg-open $FILE &>/dev/null' +BROWSER='firefox' +EDITOR='nvim' #FILE_CMD='xdg-open' TASKBIN='task' diff --git a/scripts/executable_xmodmap-custom b/scripts/executable_xmodmap-custom deleted file mode 100644 index ab7204e..0000000 --- a/scripts/executable_xmodmap-custom +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -DELAY=200 -RATE=90 - -xmodmap ~/.Xmodmap &> /dev/null -xset r rate $DELAY $RATE &> /dev/null diff --git a/scripts/executable_xmodmap-custom.tmpl b/scripts/executable_xmodmap-custom.tmpl new file mode 100644 index 0000000..6c7ed52 --- /dev/null +++ b/scripts/executable_xmodmap-custom.tmpl @@ -0,0 +1,11 @@ +#!/bin/bash + +DELAY=200 +RATE=90 + +{{ if eq .chezmoi.fullHostname "x1-carbon" }} +xmodmap ~/.Xmodmap-laptop &> /dev/null +{{ else }} +xmodmap ~/.Xmodmap &> /dev/null +{{ end }} +xset r rate $DELAY $RATE &> /dev/null