diff options
| -rw-r--r-- | config/git/config.linux | 6 | ||||
| -rw-r--r-- | config/nvim/lua/plugins.lua | 1 | ||||
| -rwxr-xr-x | config/x11/xinitrc | 5 | ||||
| -rw-r--r-- | config/zsh/.zshrc | 2 | ||||
| -rw-r--r-- | config/zsh/aliases.zsh | 2 | ||||
| -rwxr-xr-x | config/zsh/zprofile | 5 |
6 files changed, 13 insertions, 8 deletions
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/nvim/lua/plugins.lua b/config/nvim/lua/plugins.lua index 71498e9..a5cd5ce 100644 --- a/config/nvim/lua/plugins.lua +++ b/config/nvim/lua/plugins.lua @@ -181,6 +181,7 @@ return require('packer').startup(function() map('n', '<C-p>', '<cmd>Telescope git_files<cr>', {}) map('n', '<leader>H', '<cmd>Telescope help_tags<cr>', {}) map('n', '<leader>;', '<cmd>Telescope commands<cr>', {}) + map('n', '<leader>g', '<cmd>Telescope live_grep<cr>', {}) end } 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/zsh/.zshrc b/config/zsh/.zshrc index 92c55c5..8ee4622 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" diff --git a/config/zsh/aliases.zsh b/config/zsh/aliases.zsh index 7832558..7488ac1 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 b64522f..c9466d1 100755 --- a/config/zsh/zprofile +++ b/config/zsh/zprofile @@ -81,6 +81,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 |