diff --git a/config/nvim/init.vim b/config/nvim/init.vim index 436d03f..a926bc2 100644 --- a/config/nvim/init.vim +++ b/config/nvim/init.vim @@ -5,6 +5,7 @@ call plug#begin('~/.vim/plugged') Plug 'itchyny/lightline.vim' Plug 'iamcco/markdown-preview.nvim' Plug 'dhruvasagar/vim-table-mode' + Plug 'easymotion/vim-easymotion' " File manger & seacher Plug 'scrooloose/nerdtree', { 'on': 'NERDTreeToggle' } @@ -13,7 +14,6 @@ call plug#begin('~/.vim/plugged') " Completion Plug 'jiangmiao/auto-pairs' Plug 'neoclide/coc.nvim', {'branch': 'release'} - Plug 'easymotion/vim-easymotion' " Language support Plug 'pangloss/vim-javascript', { 'for': 'javascript' } @@ -75,57 +75,48 @@ set background=dark colorscheme NeoSolarized -" ======================= -" == Plugins configure == -" ======================= - -"""""""" Lightline """""""" +" == Plugins configure +" Lightline +set noshowmode let g:lightline = { \ 'colorscheme': 'selenized_dark', \ 'active': { \ 'left': [ [ 'mode', 'paste' ], -\ [ 'readonly', 'modified', 'gitbranch' ] ], +\ [ 'readonly', 'modified' ] ], \ 'right': [ [ 'lineinfo' ], \ [ 'percent' ], \ [ 'filename', 'fileencoding', 'filetype' ] ] \ }, } -set noshowmode -""""""""""""""""""""""""""" -""""""""" Nerdtree """""""" +" Nerdtree map :NERDTreeToggle let g:NERDTreeWinPos="right" let NERDTreeIgnore = ['__pycache__', '\.pyc$', '\.o$', '\.so$', '\.a$', '\.swp', '*\.swp', '\.swo', '\.swn', '\.swh', '\.swm', '\.swl', '\.swk', '\.sw*$', '[a-zA-Z]*egg[a-zA-Z]*', '.DS_Store'] let NERDTreeMinimalUI = 1 let NERDTreeShowLineNumbers=0 -""""""""""""""""""""""""""" -"""""""""""" Coc """""""""" +" Coc inoremap pumvisible() ? "\" : "\" inoremap pumvisible() ? "\" : "\" -""""""""""""""""""""""""""" -""""""""" Markdown """""""" +" Markdown let g:vim_markdown_folding_disabled = 1 -""""""""""""""""""""""""" - -"""""" Easymotion """"""""" +" Easymotion let g:EasyMotion_do_mapping = 0 let g:EasyMotion_smartcase = 1 nmap f (easymotion-s) map w (easymotion-bd-w) nmap F (easymotion-overwin-line) nmap s (easymotion-overwin-f2) -""""""""""""""""""""""""""" +" CtrlP +map :CtrlP +imap :CtrlP +nmap :CtrlP - -" ============ -" == Maping == -" ============ -imap ii - +" == Maping +imap fd let mapleader="," " Change window @@ -139,7 +130,7 @@ noremap :tabnext noremap :tabprev noremap :tabnew noremap :tabnew -noremap :tabclose +noremap :tabclose noremap 1 :tabn 1 noremap 2 :tabn 2 noremap 3 :tabn 3 @@ -151,6 +142,3 @@ noremap 8 :tabn 8 noremap 9 :tabn 9 noremap n :bnext noremap p :bprev - -let &t_8f = "\[38;2;%lu;%lu;%lum" -let &t_8b = "\[48;2;%lu;%lu;%lum" diff --git a/config/ranger/rc.conf b/config/ranger/rc.conf index c3863df..8d9f1f7 100644 --- a/config/ranger/rc.conf +++ b/config/ranger/rc.conf @@ -24,7 +24,7 @@ set vcs_msg_length 30 ### Preview set preview_images true -set preview_images_method w3m +set preview_images_method ueberzug set w3m_delay 0.02 set w3m_offset 0 diff --git a/script/dmenu/dmenu-config-edit.sh b/script/dmenu/dmenu-config-edit.sh index ce00fce..916e87c 100755 --- a/script/dmenu/dmenu-config-edit.sh +++ b/script/dmenu/dmenu-config-edit.sh @@ -1,5 +1,4 @@ #!/bin/sh - declare options=("i3 berry qtile @@ -8,22 +7,21 @@ polybar picom dunst qutebrowser +taskwarrior tmux vim -neovim -kitty -taskwarrior -fish -zsh") +ranger +term +sh") -choice=$(echo -e "${options[@]}" | dmenu -p 'Edit config file: ' $@) +choice=$(echo -e "${options[@]}" | dmenu -p 'Edit config file' $@) case "$choice" in i3) choice="$HOME/.config/i3/config" ;; qtile) opt=$(echo -e "config.py\nautostart"|dmenu -p 'Qtile' $@) case "$opt" in "config.py") choice="$HOME/.config/qtile/config.py" ;; - "autostart") choice="$HOME/.config/qtile/autostart.sh" ;; + "autostart.sh") choice="$HOME/.config/qtile/autostart.sh" ;; esac ;; berry) @@ -44,22 +42,46 @@ case "$choice" in esac ;; picom) choice="$HOME/.config/picom.conf" ;; - tmux) choice="$HOME/.tmux.conf" ;; polybar) choice="$HOME/.config/polybar/config" ;; qutebrowser) - why=$(echo -e "config.py\nquickmarks" | dmenu -h 24 -p 'Qutebrowser') + why=$(echo -e "config.py\nquickmarks" | dmenu -p 'Qutebrowser') case "$why" in "config.py") choice="$HOME/.config/qutebrowser/config.py" ;; "quickmarks") choice="$HOME/.config/qutebrowser/quickmarks" ;; esac ;; - vim) choice="$HOME/.vimrc" ;; - nvim) choice="$HOME/.config/nvim/init.vim" ;; + ranger) + why=$(echo -e "rc.conf\nrifle.conf") + case "$why" in + "rc.conf") choice="$HOME/.config/ranger/rc.conf" ;; + "rifle.conf") choice="$HOME/.config/ranger/rifle.conf" ;; + esac + ;; + vim) + why=$(echo -e "nvim\nvim"|dmenu -p 'Vim' $@) + case "$why" in + vim) choice="$HOME/.vimrc" ;; + nvim) choice="$HOME/.config/nvim/init.vim" ;; + esac + ;; + tmux) choice="$HOME/.tmux.conf" ;; + term) + why=$(echo -e "kitty\nalacritty"|demnu -p "Term" $@) + case "$why" in + kitty) choice="$HOME/.config/kitty/kitty.conf" ;; + alacritty) choice="$hoME/.config/alacritty/alacritty.yml" ;; + esac + ;; dunst) choice="$HOME/.config/dunst/dunstrc" ;; - zsh) choice="$HOME/.zshrc" ;; + sh) + why=$(echo -e "zsh\nfish\nbash"|dmenu -p "Shell" $@) + case "$why" in + zsh) choice="$HOME/.zshrc" ;; + fish) choice="$HOME/.config/fish/config.fish" ;; + bash) choice="$hoME/.bashrc" + esac + ;; taskwarior) choice="$HOME/.taskrc" ;; - fish) choice="$HOME/.config/fish/config.fish" ;; - kitty) choice="$HOME/.config/kitty/kitty.conf" ;; *) exit 1 ;; esac kitty -e nvim "$choice"