From c72de1d239aac325155fc840cd226309435538de Mon Sep 17 00:00:00 2001 From: yuzu-eva Date: Fri, 26 May 2023 11:20:50 +0200 Subject: using vim-tmux-navigator; some other updates --- .config/nvim/lua/user/keymaps.lua | 6 --- .config/nvim/lua/user/options.lua | 3 +- .config/nvim/lua/user/plugins.lua | 1 + .config/nvim/lua/user/plugins/telescope.lua | 2 +- .config/nvim/plugin/packer_compiled.lua | 37 ++++++++++-------- .config/shell/aliasrc | 8 ++-- .config/shell/profile | 3 ++ .config/tmux/tmux.conf | 59 ++++++++++++++++++++++------- .config/x11/xinitrc | 5 +-- .config/zathura/zathurarc | 14 ++++++- 10 files changed, 92 insertions(+), 46 deletions(-) diff --git a/.config/nvim/lua/user/keymaps.lua b/.config/nvim/lua/user/keymaps.lua index 59c323c..b174f65 100644 --- a/.config/nvim/lua/user/keymaps.lua +++ b/.config/nvim/lua/user/keymaps.lua @@ -8,12 +8,6 @@ keymap('n', 'Q', ':bufdo bdelete') -- Allow gf to open non-existant files keymap('n', 'gf', ':edit ') --- Quick navigation between splits -keymap('n', '', 'h') -keymap('n', '', 'j') -keymap('n', '', 'k') -keymap('n', '', 'l') - -- Open the current file in the default program keymap('n', 'x', ':!xdg-open %') diff --git a/.config/nvim/lua/user/options.lua b/.config/nvim/lua/user/options.lua index 0c35dfc..2fdd6e2 100644 --- a/.config/nvim/lua/user/options.lua +++ b/.config/nvim/lua/user/options.lua @@ -17,8 +17,9 @@ vim.o.splitright = 1 vim.o.splitbelow = 1 vim.o.clipboard = 'unnamedplus' -- Use Linux system clipboard vim.o.updatetime = 250 -- Decrease CursorHold delay -vim.o.redrawtime = 10000 -- Allow more time for loading syntax on large files +vim.o.redrawtime = 10000 -- Allow more time for loading syntax vim.o.foldmethod = "expr" vim.o.foldlevelstart = 10 vim.o.foldexpr = "nvim_treesitter#foldexpr()" vim.o.hlsearch = 0 +vim.o.colorcolumn = "80" diff --git a/.config/nvim/lua/user/plugins.lua b/.config/nvim/lua/user/plugins.lua index 755f0e9..07f8f42 100644 --- a/.config/nvim/lua/user/plugins.lua +++ b/.config/nvim/lua/user/plugins.lua @@ -4,6 +4,7 @@ require('packer').startup(function() use { 'tpope/vim-surround' } use { 'tpope/vim-eunuch' } use { 'tpope/vim-sleuth' } + use { 'christoomey/vim-tmux-navigator' } use { 'dracula/vim', diff --git a/.config/nvim/lua/user/plugins/telescope.lua b/.config/nvim/lua/user/plugins/telescope.lua index b1d1136..5f7023f 100644 --- a/.config/nvim/lua/user/plugins/telescope.lua +++ b/.config/nvim/lua/user/plugins/telescope.lua @@ -4,7 +4,7 @@ local keymap = require 'lib.utils'.keymap keymap('n', ';f', [[lua require('telescope.builtin').find_files()]]) keymap('n', ';r', [[lua require('telescope.builtin').live_grep()]]) -keymap('n', ';\\', [[lua require('telescope.builtin').buffers()]]) +keymap('n', ';b', [[lua require('telescope.builtin').buffers()]]) require('telescope').setup { defaults = { diff --git a/.config/nvim/plugin/packer_compiled.lua b/.config/nvim/plugin/packer_compiled.lua index 6275daa..713ebc9 100644 --- a/.config/nvim/plugin/packer_compiled.lua +++ b/.config/nvim/plugin/packer_compiled.lua @@ -238,18 +238,23 @@ _G.packer_plugins = { loaded = true, path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/vim-surround", url = "https://github.com/tpope/vim-surround" + }, + ["vim-tmux-navigator"] = { + loaded = true, + path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/vim-tmux-navigator", + url = "https://github.com/christoomey/vim-tmux-navigator" } } time([[Defining packer_plugins]], false) --- Config for: dracula -time([[Config for dracula]], true) -try_loadstring("\27LJ\2\n4\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\25user.plugins.dracula\frequire\0", "config", "dracula") -time([[Config for dracula]], false) -- Config for: nvim-autopairs time([[Config for nvim-autopairs]], true) try_loadstring("\27LJ\2\n<\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\19nvim-autopairs\frequire\0", "config", "nvim-autopairs") time([[Config for nvim-autopairs]], false) +-- Config for: nvim-treesitter +time([[Config for nvim-treesitter]], true) +try_loadstring("\27LJ\2\n]\0\0\3\0\4\0\t6\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\0016\0\0\0'\2\3\0B\0\2\1K\0\1\0\28user.plugins.treesitter\nsetup\16spellsitter\frequire\0", "config", "nvim-treesitter") +time([[Config for nvim-treesitter]], false) -- Config for: nvim-ts-autotag time([[Config for nvim-ts-autotag]], true) try_loadstring("\27LJ\2\n=\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\20nvim-ts-autotag\frequire\0", "config", "nvim-ts-autotag") @@ -258,30 +263,30 @@ time([[Config for nvim-ts-autotag]], false) time([[Config for nvim-lspconfig]], true) try_loadstring("\27LJ\2\n6\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\27user.plugins.lspconfig\frequire\0", "config", "nvim-lspconfig") time([[Config for nvim-lspconfig]], false) --- Config for: telescope.nvim -time([[Config for telescope.nvim]], true) -try_loadstring("\27LJ\2\n6\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\27user.plugins.telescope\frequire\0", "config", "telescope.nvim") -time([[Config for telescope.nvim]], false) -- Config for: lualine.nvim time([[Config for lualine.nvim]], true) try_loadstring("\27LJ\2\n4\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\25user.plugins.lualine\frequire\0", "config", "lualine.nvim") time([[Config for lualine.nvim]], false) --- Config for: nvim-treesitter -time([[Config for nvim-treesitter]], true) -try_loadstring("\27LJ\2\n]\0\0\3\0\4\0\t6\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\0016\0\0\0'\2\3\0B\0\2\1K\0\1\0\28user.plugins.treesitter\nsetup\16spellsitter\frequire\0", "config", "nvim-treesitter") -time([[Config for nvim-treesitter]], false) -- Config for: nvim-tree.lua time([[Config for nvim-tree.lua]], true) try_loadstring("\27LJ\2\n6\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\27user.plugins.nvim-tree\frequire\0", "config", "nvim-tree.lua") time([[Config for nvim-tree.lua]], false) --- Config for: nvim-cmp -time([[Config for nvim-cmp]], true) -try_loadstring("\27LJ\2\n0\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\21user.plugins.cmp\frequire\0", "config", "nvim-cmp") -time([[Config for nvim-cmp]], false) -- Config for: LuaSnip time([[Config for LuaSnip]], true) try_loadstring("\27LJ\2\n4\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\25user.plugins.luasnip\frequire\0", "config", "LuaSnip") time([[Config for LuaSnip]], false) +-- Config for: telescope.nvim +time([[Config for telescope.nvim]], true) +try_loadstring("\27LJ\2\n6\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\27user.plugins.telescope\frequire\0", "config", "telescope.nvim") +time([[Config for telescope.nvim]], false) +-- Config for: dracula +time([[Config for dracula]], true) +try_loadstring("\27LJ\2\n4\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\25user.plugins.dracula\frequire\0", "config", "dracula") +time([[Config for dracula]], false) +-- Config for: nvim-cmp +time([[Config for nvim-cmp]], true) +try_loadstring("\27LJ\2\n0\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\21user.plugins.cmp\frequire\0", "config", "nvim-cmp") +time([[Config for nvim-cmp]], false) _G._packer.inside_compile = false if _G._packer.needs_bufread == true then diff --git a/.config/shell/aliasrc b/.config/shell/aliasrc index 67ae3d0..07c75bf 100644 --- a/.config/shell/aliasrc +++ b/.config/shell/aliasrc @@ -26,6 +26,9 @@ alias freyr='docker run -it -v /media/hdd/music:/data freyr-dev' # set my preferred keyboard options alias setkeys='xset r rate 250 30 && setxkbmap -option "ctrl:nocaps"' +# pad numbers in filenames with zeros +alias padz='perl-rename "s/\d+/sprintf(\"%02d\",$&)/e"' + # set custom ascii # alias neofetch='neofetch --source ~/docs/ascii/lain' @@ -43,7 +46,7 @@ alias ls='ls -hl --color=always --group-directories-first' alias la='ls -a' alias lc='ls | tail -n +2 | wc -l' -ld() { +lsd() { if [ "$1" = "" ]; then ls -d */; else @@ -125,9 +128,8 @@ alias dpush='dfiles push origin' ## PACKAGE MANAGER -alias eq='equery uses' +alias eq='equery' alias emin='doas emerge -av' alias emrm='doas emerge -avc' alias emup='doas emerge -avuND @world' alias ems='emerge -s' - diff --git a/.config/shell/profile b/.config/shell/profile index 2adf26c..eca8c75 100644 --- a/.config/shell/profile +++ b/.config/shell/profile @@ -22,4 +22,7 @@ export XDG_SESSION_TYPE='x11' export VDPAU_DRIVER=radeonsi +export EIX_LIMIT=0 +export EIX_LIMIT_COMPACT=0 + export PATH="$PATH:$HOME/.local/bin:$HOME/.fzf/bin:/sbin:/usr/sbin" diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf index ef0dabb..caf8066 100644 --- a/.config/tmux/tmux.conf +++ b/.config/tmux/tmux.conf @@ -20,23 +20,56 @@ set -g default-terminal "tmux-256color" # Set history-limit set -g history-limit 30000 +# various window option +set -g base-index 1 +set -g pane-base-index 1 +set-window-option -g pane-base-index 1 +set-option -g renumber-windows on +setw -g aggressive-resize on + ## KEYBINDS # Change the prefix key to C-a -set -g prefix C-a +set -g prefix C-Space unbind C-b -bind C-a send-prefix - -bind C-v split-window -v # split vertically -bind C-h split-window -h # split horizontally -bind C-w killp # kill pane -bind C-q killw # kill window -bind -n M-h select-pane -L -bind -n M-l select-pane -R -bind -n M-k select-pane -U -bind -n M-j select-pane -D - -# Turn the mouse on, but without copy mode dragging +bind C-Space send-prefix + +bind C-v split-window -v -c "#{pane_current_path}" +bind C-s split-window -h -c "#{pane_current_path}" +bind C-w killp +bind C-q killw +bind C-p previous-window +bind C-n next-window +# bind -n C-h select-pane -L +# bind -n C-j select-pane -D +# bind -n C-k select-pane -U +# bind -n C-l select-pane -R +bind -n M-h resize-pane -L 5 +bind -n M-j resize-pane -D 5 +bind -n M-k resize-pane -U 5 +bind -n M-l resize-pane -R 5 + +# Smart pane switching with awareness of Vim splits. +# See: https://github.com/christoomey/vim-tmux-navigator +is_vim="ps -o state= -o comm= -t '#{pane_tty}' \ + | grep -iqE '^[^TXZ ]+ +(\\S+\\/)?g?(view|l?n?vim?x?)(diff)?$'" +bind-key -n 'C-h' if-shell "$is_vim" 'send-keys C-h' 'select-pane -L' +bind-key -n 'C-j' if-shell "$is_vim" 'send-keys C-j' 'select-pane -D' +bind-key -n 'C-k' if-shell "$is_vim" 'send-keys C-k' 'select-pane -U' +bind-key -n 'C-l' if-shell "$is_vim" 'send-keys C-l' 'select-pane -R' +tmux_version='$(tmux -V | sed -En "s/^tmux ([0-9]+(.[0-9]+)?).*/\1/p")' +if-shell -b '[ "$(echo "$tmux_version < 3.0" | bc)" = 1 ]' \ + "bind-key -n 'C-\\' if-shell \"$is_vim\" 'send-keys C-\\' 'select-pane -l'" +if-shell -b '[ "$(echo "$tmux_version >= 3.0" | bc)" = 1 ]' \ + "bind-key -n 'C-\\' if-shell \"$is_vim\" 'send-keys C-\\\\' 'select-pane -l'" + +bind-key -T copy-mode-vi 'C-h' select-pane -L +bind-key -T copy-mode-vi 'C-j' select-pane -D +bind-key -T copy-mode-vi 'C-k' select-pane -U +bind-key -T copy-mode-vi 'C-l' select-pane -R +bind-key -T copy-mode-vi 'C-\' select-pane -l + +# Turn the mouse off set -g mouse off # Keys to toggle monitoring activity in a window and the synchronize-panes option diff --git a/.config/x11/xinitrc b/.config/x11/xinitrc index ecd80c1..a3a9bda 100644 --- a/.config/x11/xinitrc +++ b/.config/x11/xinitrc @@ -4,12 +4,10 @@ if command -v dbus-launch > /dev/null && test -z "${DBUS_SESSION_BUS_ADDRESS}"; eval $(dbus-launch --sh-syntax --exit-with-session) fi -rfkill block all - eval "$(gpg-agent --daemon --allow-preset-passphrase --write-env-file "$envfile")" eval "$(ssh-agent)" -xset r rate 250 30 +xset r rate 200 20 xset s off -dpms setxkbmap -option "ctrl:nocaps" @@ -24,4 +22,3 @@ picom & statusbar & exec dwm - diff --git a/.config/zathura/zathurarc b/.config/zathura/zathurarc index 452e116..5836bc0 100644 --- a/.config/zathura/zathurarc +++ b/.config/zathura/zathurarc @@ -3,13 +3,23 @@ set statusbar-h-padding 0 set statusbar-v-padding 0 set page-padding 1 set selection-clipboard clipboard + map u scroll half-up map d scroll half-down +map J scroll full-down +map K scroll full-up map D toggle_page_mode map r reload map R rotate -map K zoom in -map J zoom out map i recolor map p print map g goto top + +#stop at page boundries +set scroll-page-aware true +set scroll-full-overlap 0.01 +set scroll-step 100 + +unmap f +map f toggle_fullscreen +map [fullscreen] f toggle_fullscreen -- cgit v1.2.3