Update, merge with laptop

This commit is contained in:
2019-05-03 02:43:07 -04:00
parent e875be5aac
commit fc99b8c1e1
9 changed files with 99 additions and 68 deletions

View File

@@ -13,6 +13,32 @@ set -x GPG_TTY (tty)
# ]]] login to X #
# universal var's [[[ #
# spv
{{ if eq .chezmoi.fullHostname "nzxt" }}
set -U spv_dir "/home/kevin/coding/spotify-lib-vis"
set -U mfs_dir "/home/kevin/coding/mf-site"
{{ end }}
set -x PATH $PATH ~/scripts ~/scripts/colors ~/go/bin
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 PASSWORD_STORE_CLIP_TIME 120
set -xU XSET_RATE 90
set -xU XSET_DELAY 200
# causes xmodmap to have issues when opening terminal sometimes
# xmodmap ~/.Xmodmap && xset r rate $XSET_DELAY $XSET_RATE
{{ if and (eq .chezmoi.fullHostname "x1-carbon") (not (eq .chezmoi.username "root")) }}
xset r rate $XSET_DELAY $XSET_RATE
{{ end }}
# set -U BROWSER "chromium"
set -U BROWSER "firefox"
# ]]] universal var's #
# fish-specific [[[ #
fish_vi_key_bindings
@@ -41,32 +67,6 @@ abbr f.. "cd ../.."
# ]]] fish-specific #
# universal var's [[[ #
# spv
{{ if eq .chezmoi.fullHostname "nzxt" }}
set -U spv_dir "~/coding/spotify-lib-vis"
set -U mfs_dir "~/coding/mf-site"
{{ end }}
set -x PATH $PATH ~/scripts ~/scripts/colors ~/go/bin
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 PASSWORD_STORE_CLIP_TIME 120
set -xU XSET_RATE 90
set -xU XSET_DELAY 200
# causes xmodmap to have issues when opening terminal sometimes
# xmodmap ~/.Xmodmap && xset r rate $XSET_DELAY $XSET_RATE
{{ if and (eq .chezmoi.fullHostname "x1-carbon") (not (eq .chezmoi.username "root")) }}
xset r rate $XSET_DELAY $XSET_RATE
{{ end }}
# set -U BROWSER "chromium"
set -U BROWSER "firefox"
# ]]] universal var's #
# fxn abbr's [[[ #
abbr ag "grep-aliases"

View File

@@ -1,9 +1,14 @@
# startup [[[ #
{{ if eq .chezmoi.fullHostname "x1-carbon" }}
exec dunst
exec compton
exec imwheel
exec numlockx on
exec xbacklight -set 10
exec wal -i "$(/home/kevin/scripts/shuffler \"$HOME/Pictures/Backgrounds/dim/non-editing\")"
{{ end }}
exec --no-startup-id i3-msg 'workspace $ws2; exec $term'
# exec --no-startup-id i3-msg 'workspace $ws2; exec $term'
exec --no-startup-id i3-msg 'workspace $ws3; exec $browser'
# ]]] startup #
@@ -13,16 +18,17 @@ exec --no-startup-id i3-msg 'workspace $ws3; exec $browser'
set $mod Mod1
# set $browser "firefox"
set $browser "chromium"
set $term "urxvt"
set $term_alt "st"
# set $term "st"
# set $term_alt "urxvt"
# set $term st
# set $term_alt urxvt
set $term urxvt
set $term_alt st
set $scripts_path "/home/kevin/scripts"
set $sch_dir "$HOME/Documents/School"
# app shortcuts [[[ #
bindsym Control+Return exec $term
bindsym Control+Shift+Return exec $term -A1
bindsym Control+$mod+Return exec $term_alt
# bindsym Control+$mod+Return exec st
# PROTIP: You can also dynamically set dmenu's colors this way:
@@ -198,10 +204,17 @@ 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" }}
bindsym Control+Shift+h move left 50px
bindsym Control+Shift+j move down 50px
bindsym Control+Shift+k move up 50px
bindsym Control+Shift+l move right 50px
{{ else }}
bindsym Control+Shift+h move left
bindsym Control+Shift+j move down
bindsym Control+Shift+k move up
bindsym Control+Shift+l move right
{{ end }}
# split in horizontal orientation
bindsym $mod+b split h
@@ -388,7 +401,6 @@ bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcu
# status bar [[[ #
# bar vars [[[ #
# set $sb_font Hack NF Bold
@@ -422,6 +434,7 @@ bar {
font pango:$sb_font 17
{{ else }}
font pango:$sb_font 21
# font pango:$sb_font 19
{{ end }}
colors {
# 0 (transparent) -> 255 (opaque) in hex
@@ -451,6 +464,7 @@ bar {
font pango:$sb_font 18
{{ else }}
font pango:$sb_font 25
# font pango:$sb_font 20
{{ end }}
# output $main
i3bar_command i3bar -t

View File

@@ -679,7 +679,7 @@ map rr source ~/.config/ranger/rc.conf
# backgrounds [[[ #
map w shell /usr/bin/wal -i %f
map w shell /usr/bin/wal -i %f && sudo ~/st/make-st.sh
map bde shell mv %f /home/kevin/Pictures/Backgrounds/dim/editing
map bdn shell mv %f /home/kevin/Pictures/Backgrounds/dim/non-editing
map bbe shell mv %f /home/kevin/Pictures/Backgrounds/bright/editing