diff options
Diffstat (limited to '')
-rw-r--r-- | .config/lf/lfrc | 1 | ||||
-rw-r--r-- | .config/mpv/mpv.conf | 2 | ||||
-rw-r--r-- | .config/nvim/lua/config/bindings.lua | 2 | ||||
-rw-r--r-- | .config/nvim/lua/config/lazy.lua | 19 | ||||
-rw-r--r-- | .config/nvim/lua/config/settings.lua | 1 | ||||
-rw-r--r-- | .config/nvim/lua/plugins/lualine.lua | 5 | ||||
-rw-r--r-- | .config/x11/xinitrc | 20 | ||||
-rw-r--r-- | .config/zsh/alias.zsh | 18 | ||||
-rw-r--r-- | .config/zsh/plugins.zsh | 2 |
9 files changed, 31 insertions, 39 deletions
diff --git a/.config/lf/lfrc b/.config/lf/lfrc index 60a0964..5565b0b 100644 --- a/.config/lf/lfrc +++ b/.config/lf/lfrc @@ -68,6 +68,7 @@ map <c-s> $$SHELL map <c-n> push :mkdir<space> map <f-7> push :mkdir<space> map <c-r> reload +map <c-g> clear cmap <c-g> cmd-escape map x !$f map X $$f diff --git a/.config/mpv/mpv.conf b/.config/mpv/mpv.conf index d1f0c60..749a32a 100644 --- a/.config/mpv/mpv.conf +++ b/.config/mpv/mpv.conf @@ -1,5 +1,5 @@ # video-sync=display-resample -vo=x11 +vo=gpu osc=yes cache=yes demuxer-max-bytes=4GiB diff --git a/.config/nvim/lua/config/bindings.lua b/.config/nvim/lua/config/bindings.lua index 5821e5f..73dc669 100644 --- a/.config/nvim/lua/config/bindings.lua +++ b/.config/nvim/lua/config/bindings.lua @@ -69,3 +69,5 @@ vim.keymap.set('n', '<leader>rw', fzf.lsp_definitions, { noremap = true, silent vim.keymap.set('n', '<leader>ri', fzf.lsp_implementations, { noremap = true, silent = true }) vim.keymap.set('n', '<leader>rt', fzf.lsp_typedefs, { noremap = true, silent = true }) vim.keymap.set('n', '<leader>re', fzf.lsp_document_symbols, { noremap = true, silent = true }) +vim.keymap.set('n', '<leader>s', '<Plug>(leap-anywhere)', { noremap = true, silent = true }) +vim.keymap.set('n', '<leader>S', '<Plug>(leap-backward)', { noremap = true, silent = true }) diff --git a/.config/nvim/lua/config/lazy.lua b/.config/nvim/lua/config/lazy.lua index df4f702..2b8d66d 100644 --- a/.config/nvim/lua/config/lazy.lua +++ b/.config/nvim/lua/config/lazy.lua @@ -83,7 +83,7 @@ require('lazy').setup({ default_overlength = 80, grace_length = 1, highlight_to_eol = true, - disable_ft = { 'qf', 'help', 'man', 'checkhealth', 'lazy', 'packer', 'NvimTree', 'Telescope', 'WhichKey', 'text', 'csv', 'lua', 'gosum', '' } + disable_ft = { 'qf', 'help', 'man', 'checkhealth', 'lazy', 'packer', 'NvimTree', 'Telescope', 'WhichKey', 'text', 'csv', 'lua', 'gosum', 'sh', '' } } end }, @@ -97,11 +97,14 @@ require('lazy').setup({ 'ggandor/leap.nvim', dependencies = { 'tpope/vim-repeat' }, config = function() + require('leap').opts.preview_filter = + function (ch0, ch1, ch2) + return not ( + ch1:match('%s') or + ch0:match('%a') and ch1:match('%a') and ch2:match('%a') + ) + end require('leap').setup({}) - vim.keymap.set({'n', 'x', 'o'}, '<leader>s', '<Plug>(leap-forward-to)') - vim.keymap.set({'n', 'x', 'o'}, '<leader>S', '<Plug>(leap-backward-to)') - vim.keymap.set({'n', 'x', 'o'}, '<C-s>', '<Plug>(leap-forward-till)') - vim.keymap.set({'n', 'x', 'o'}, '<C-S-s>', '<Plug>(leap-backward-till)') end }, { @@ -120,7 +123,11 @@ require('lazy').setup({ border = 'none', preview = { border = 'none', - title = false + title = false, + layout = "horizontal", + winopts = { + number = false, + }, }, previewers = { builtin = { diff --git a/.config/nvim/lua/config/settings.lua b/.config/nvim/lua/config/settings.lua index e578062..2fceccc 100644 --- a/.config/nvim/lua/config/settings.lua +++ b/.config/nvim/lua/config/settings.lua @@ -38,6 +38,7 @@ vim.opt.fillchars = {eob = " "} vim.opt.wrap = true vim.opt.termguicolors = true vim.opt.bg = 'dark' +vim.opt.guicursor:remove { 't:block-blinkon500-blinkoff500-TermCursor' } vim.g.gruvbox_material_background = 'medium' vim.g.gruvbox_material_foreground = 'original' diff --git a/.config/nvim/lua/plugins/lualine.lua b/.config/nvim/lua/plugins/lualine.lua index b2a92d0..53d22ff 100644 --- a/.config/nvim/lua/plugins/lualine.lua +++ b/.config/nvim/lua/plugins/lualine.lua @@ -7,7 +7,6 @@ return { bg = '#32302f', fg = '#a89984', orange = '#fe8019', - violet = '#a9a1e1', red = '#cc241d', green = '#98971a', yellow = '#d79921', @@ -37,7 +36,7 @@ return { [''] = colors.orange, ic = colors.yellow, R = colors.bright_red, - Rv = colors.violet, + Rv = colors.bright_magenta, cv = colors.red, ce = colors.red, r = colors.cyan, @@ -199,7 +198,7 @@ return { ins_right { 'branch', icon = '', - color = { fg = colors.violet, gui = 'bold' }, + color = { fg = colors.blue, gui = 'bold' }, } ins_right { diff --git a/.config/x11/xinitrc b/.config/x11/xinitrc index 782f441..8d033d2 100644 --- a/.config/x11/xinitrc +++ b/.config/x11/xinitrc @@ -63,15 +63,15 @@ start_apps() { } export LANG='en_US.UTF-8' -[ $host = "mother" ] && xrandr \ - --output HDMI-0 --primary --mode 1920x1080 --pos 0x0 --rotate normal \ - --output DP-0 --off \ - --output DP-1 --off \ - --output DP-2 --off \ - --output DP-3 --off \ - --output DP-4 --mode 1680x1050 --pos 1920x0 --rotate normal \ - --output DP-5 --off - # --output DP-4 --mode 1440x900 --pos 0x0 --rotate normal \ +[ $host = "mother" ] && "$HOME"/.local/bin/scr2 +# [ $host = "mother" ] && xrandr \ +# --output HDMI-0 --mode 1920x1080 --pos 2560x0 --rotate normal \ +# --output DP-0 --off \ +# --output DP-1 --off \ +# --output DP-2 --off \ +# --output DP-3 --off \ +# --output DP-4 --primary --mode 2560x1440 --rate 180 --pos 0x0 --rotate normal \ +# --output DP-5 --off [ $host = "po-rbo" ] && xrandr \ --output eDP-1 --mode 1920x1200 --pos 0x0 --rotate normal \ --output HDMI-1 --primary --mode 2560x1440 --pos 1920x0 --rotate normal \ @@ -80,7 +80,7 @@ export LANG='en_US.UTF-8' --output VIRTUAL-1 --off dunst_shit -startif picom +[ $host = "po-rbo" ] && startif picom pgrep $mpd >/dev/null || $mpd >/dev/null 2>&1 xset s off xset -dpms diff --git a/.config/zsh/alias.zsh b/.config/zsh/alias.zsh index 4b01038..63b8be9 100644 --- a/.config/zsh/alias.zsh +++ b/.config/zsh/alias.zsh @@ -158,24 +158,6 @@ de() { $VISUAL $sc cd $p } -eebin() { - file=$(find "$HOME"/.local/bin -type f | fzf) - [ $? -ne 0 ] && return - bsdsetsid emacsclient -c "$file" - kill -9 "$(ps -p $$ -oppid=)" -} -eeconf() { - file=$(find "$HOME"/.config -type f | fzf) - [ $? -ne 0 ] && return - bsdsetsid emacsclient -c "$file" - kill -9 "$(ps -p $$ -oppid=)" -} -ee() { - file=$(find . -type f | fzf) - [ $? -ne 0 ] && return - bsdsetsid emacsclient -c "$file" - kill -9 "$(ps -p $$ -oppid=)" -} pa() { if [ -d $HOME/.local/packs ] && cd $HOME/.local/packs || return 1 dir=$(\ls $HOME/.local/packs | fzf) diff --git a/.config/zsh/plugins.zsh b/.config/zsh/plugins.zsh index 9e13701..77bffa1 100644 --- a/.config/zsh/plugins.zsh +++ b/.config/zsh/plugins.zsh @@ -13,4 +13,4 @@ source $HOME/.local/packs/fast-syntax-highlighting/fast-syntax-highlighting.plugin.zsh >/dev/null source $HOME/.local/packs/zsh-autosuggestions/zsh-autosuggestions.plugin.zsh >/dev/null -[[ -r "/usr/share/z/z.sh" ]] && source /usr/share/z/z.sh +# [[ -r "/usr/share/z/z.sh" ]] && source /usr/share/z/z.sh |