diff options
| -rw-r--r-- | config/alacritty/alacritty.linux.yml | 3 | ||||
| -rw-r--r-- | config/git/config.linux | 6 | ||||
| -rwxr-xr-x | config/x11/xinitrc | 5 | ||||
| -rw-r--r-- | config/xmonad/xmonad.hs | 2 | ||||
| -rw-r--r-- | config/zsh/.zshrc | 3 | ||||
| -rw-r--r-- | config/zsh/aliases.zsh | 2 | ||||
| -rwxr-xr-x | config/zsh/zprofile | 5 |
7 files changed, 17 insertions, 9 deletions
diff --git a/config/alacritty/alacritty.linux.yml b/config/alacritty/alacritty.linux.yml index fc50a27..d50a166 100644 --- a/config/alacritty/alacritty.linux.yml +++ b/config/alacritty/alacritty.linux.yml @@ -30,6 +30,9 @@ key_bindings: - { key: K, mods: Alt, chars: "\e[A" } - { key: J, mods: Alt|Shift, action: ScrollHalfPageDown } - { key: K, mods: Alt|Shift, action: ScrollHalfPageUp } + - { key: Plus, mods: Alt|Shift, action: IncreaseFontSize } + - { key: Minus, mods: Alt, action: DecreaseFontSize } + - { key: Key0, mods: Alt, action: ResetFontSize } # gruvbox_dark: https://github.com/eendroroy/alacritty-theme/blob/master/schemes.yaml diff --git a/config/git/config.linux b/config/git/config.linux index 0dbbd8f..3c72be1 100644 --- a/config/git/config.linux +++ b/config/git/config.linux @@ -12,3 +12,9 @@ gpgsign = true [init] defaultBranch = master +[difftool "bat"] + cmd = "/usr/bin/bat --diff $REMOTE" +[difftool] + prompt = false +[diff] + tool = bat diff --git a/config/x11/xinitrc b/config/x11/xinitrc index 2771e72..f5b65f5 100755 --- a/config/x11/xinitrc +++ b/config/x11/xinitrc @@ -1,10 +1,5 @@ #!/bin/sh -# certain event cause rate to reset (https://wiki.archlinux.org/title/Xorg/Keyboard_configuration) -# -ardelay milliseconds -# -arinterval milliseconds -xset r rate 200 50 # delay before keyrepeat and keyrepeat rate - keynav daemonize # moving the cursor around without the mouse redshift & # filter blue light dunst & # notification daemon diff --git a/config/xmonad/xmonad.hs b/config/xmonad/xmonad.hs index a94df43..3fe2ee8 100644 --- a/config/xmonad/xmonad.hs +++ b/config/xmonad/xmonad.hs @@ -76,7 +76,7 @@ keys' = [ ("<XF86AudioLowerVolume>", spawn "pulseaudio-ctl down") startupHook' :: X () startupHook' = do spawnOnOnce "code" myTerminal - spawnOnOnce "web" "qutebrowser" + -- spawnOnOnce "web" "qutebrowser" confirm :: String -> X () -> X () confirm prompt f = do diff --git a/config/zsh/.zshrc b/config/zsh/.zshrc index e7dac3d..57b49c5 100644 --- a/config/zsh/.zshrc +++ b/config/zsh/.zshrc @@ -9,7 +9,7 @@ case $(tty) in /dev/tty[1-9]) # %~ path ('~' if $HOME) # %B/%b start/stop bold - # %B/%b start/stop color + # %F/%f start/stop color # shellcheck disable=SC2039,SC3003 NEWLINE=$'\n' export PROMPT="${NEWLINE}%B%F{blue}%~%f${NEWLINE}%F{red}> %f%b" @@ -120,6 +120,7 @@ fi # >>> conda initialize >>> # !! Contents within this block are managed by 'conda init' !! __conda_setup="$('/usr/local/anaconda3/bin/conda' 'shell.zsh' 'hook' 2> /dev/null)" +# shellcheck disable=SC2181 if [ $? -eq 0 ]; then eval "$__conda_setup" else diff --git a/config/zsh/aliases.zsh b/config/zsh/aliases.zsh index 3a5d0af..d478fe3 100644 --- a/config/zsh/aliases.zsh +++ b/config/zsh/aliases.zsh @@ -35,7 +35,7 @@ alias ta='tree -a' alias t1='tree -L 1' alias t2='tree -L 2' alias t3='tree -L 3' -alias ti="tree --matchdirs -I __pycache__ -I node_modules -I '*.o'" +alias ti="tree --matchdirs -I __pycache__ -I node_modules -I '*.o' -I build" # man alias ma="man" diff --git a/config/zsh/zprofile b/config/zsh/zprofile index ecf3ca7..f05d43e 100755 --- a/config/zsh/zprofile +++ b/config/zsh/zprofile @@ -83,6 +83,9 @@ export CLOUT_SYNC_PATH="${XDG_DATA_HOME:-$HOME/.sync}/$CLOUT_SYNC_DIR" if [ "$(uname)" = 'Linux' ] && [ "$(tty)" = '/dev/tty1' ] then - startx "$XDG_CONFIG_HOME/x11/xinitrc" + # https://wiki.archlinux.org/title/Xorg/Keyboard_configuration + # setting the keyrepeat delay and interval here as the default ones + # since some applications reset the those if we use xset r rate 200 30 instead + startx "$XDG_CONFIG_HOME/x11/xinitrc" -- -ardelay 200 -arinterval 30 poweroff fi |