diff --git a/qt5ct/qt5ct.conf b/qt5ct/qt5ct.conf deleted file mode 100644 index bf100f2..0000000 --- a/qt5ct/qt5ct.conf +++ /dev/null @@ -1,10 +0,0 @@ -[Appearance] -color_scheme_path=/usr/share/qt5ct/colors/darker.conf -custom_palette=true -icon_theme=breeze-dark -standard_dialogs=default -style=Breeze - -[Fonts] -fixed=@Variant(\0\0\0@\0\0\0\x12\0N\0o\0t\0o\0 \0S\0\x61\0n\0s@$\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\x32\x10) -general=@Variant(\0\0\0@\0\0\0\x12\0N\0o\0t\0o\0 \0S\0\x61\0n\0s@$\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\x32\x10) diff --git a/shell/aliases.sh b/shell/aliases.sh index ef0a798..1a59578 100644 --- a/shell/aliases.sh +++ b/shell/aliases.sh @@ -42,7 +42,6 @@ alias \ calc="bc -l" \ cp="cp -iv" \ mv="mv -iv" \ - vim="nvim" \ df-short="df -h | grep -v '\s/dev.*$\|\s/run.*$\|\s/boot.*$'" \ qr-png="qrencode -s 16 -o qr.png" \ qr="qrencode -t ansiutf8" \ diff --git a/shell/profile.d/defaults.sh b/shell/profile.d/defaults.sh index a834ce5..37ad05a 100644 --- a/shell/profile.d/defaults.sh +++ b/shell/profile.d/defaults.sh @@ -1,5 +1,5 @@ export \ TERM="xterm-256color" \ BROWSER="firefox-hardened" \ - EDITOR="lvim" \ - VISUAL="lvim" + EDITOR="cvim" \ + VISUAL="cvim" diff --git a/vim/vimrc b/vim/vimrc index b21751d..f9d2aee 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -1,137 +1,14 @@ -" XDG Specifications -let rtp=&runtimepath -set runtimepath=~/.config/vim -let &runtimepath.=','.rtp.',~/.config/vim/after' -set directory=~/.config/vim/swap//,.,~/tmp,/var/tmp,/tmp -set backupdir=~/.config/vim/backup//,.,~/tmp,~/ -set spellfile=~/.config/vim/spell/en.utf-8.add -set viminfo+=n~/.config/vim/viminfo -set viewdir=~/.config/vim/view/ -set undodir=~/.config/vim/undo//,. +let g:customrtp = expand('~/.config/vim') -" Preferences -let mapleader = "\" -set list listchars=tab:⎸\ ,trail:~ -set clipboard=unnamedplus -set gp=git\ grep\ -n -set shellcmdflag=-c -set encoding=utf-8 -set relativenumber -filetype plugin on -set shiftwidth=4 -set nocompatible -set cursorline -set ignorecase -set smartcase -set expandtab -set autoread -set wildmenu -set hlsearch -set swapfile -set undofile -set mouse=a -set showcmd -set number -syntax on +let rtp = &runtimepath +let &runtimepath = g:customrtp . ',' . rtp . ',' . g:customrtp . '/after' +execute 'set directory=' . g:customrtp . '/swap//,.,~/tmp,/var/tmp,/tmp' +execute 'set backupdir=' . g:customrtp . '/backup//,.,~/tmp,~/' +execute 'set spellfile=' . g:customrtp . '/spell/en.utf-8.add' +execute 'set viminfo+=n' . g:customrtp . '/viminfo' +execute 'set viewdir=' . g:customrtp . '/view/' +execute 'set undodir=' . g:customrtp . '/undo//,.' -if (empty($TMUX) && getenv('TERM_PROGRAM') != 'Apple_Terminal') - if (has("nvim")) - let $NVIM_TUI_ENABLE_TRUE_COLOR=1 - endif - if (has("termguicolors")) - set termguicolors - endif -endif - -" Keybinds -noremap :setlocal spell! spelllang=en -noremap :setlocal spell! spelllang=es -noremap :TagbarToggle -noremap !!$SHELL -noremap :bn -noremap :bd -noremap :w -noremap 5< -noremap 5- -noremap 5+ -noremap 5> -noremap H :nohl -noremap za - -autocmd BufWinLeave *.* mkview - -" QuickFix -autocmd QuickFixCmdPost [^l]* nested cwindow -autocmd QuickFixCmdPost l* nested lwindow -autocmd QuickFixCmdPost * if &ft ==# 'qf' | wincmd J | endif - -function! WrapQuickfixNext() - try - execute 'cnext' - catch /^Vim\%((\a\+)\)\=:E553/ - cfirst - endtry -endfunction -function! WrapQuickfixPrev() - try - execute 'cprevious' - catch /^Vim\%((\a\+)\)\=:E553/ - clast - endtry -endfunction - -nnoremap n :call WrapQuickfixNext() -nnoremap p :call WrapQuickfixPrev() -nnoremap m :make -nnoremap :make - -" c/c++ -autocmd FileType c :compiler gcc | setlocal makeprg=gcc\ -Wall\ -c\ % -autocmd FileType cpp :compiler gcc | setlocal makeprg=g++\ -Wall\ -c\ % - -" groff -autocmd FileType troff noremap :!zathura --fork %:r.pdf & disown -autocmd FileType troff noremap :w :!grofftex % - -" Python -autocmd FileType python noremap :!python % - -function! SetMakeprg() - if filereadable('Makefile') - set makeprg=make - else - endif -endfunction -autocmd VimEnter * call SetMakeprg() - -" Functions - -"Open a shell on a vertical split -set splitright -function OpenTerminal() - execute "normal \" - execute "normal \" - execute "normal \" - execute "normal \" - - let bufNum = bufnr("%") - let bufType = getbufvar(bufNum, "&buftype", "not found") - - if bufType == "terminal" - execute "q" - else - execute "bot sp term://bash" - execute "resize -8" - execute "set nonu" - execute "set nornu" - silent au BufLeave stopinsert! - silent au BufWinEnter,WinEnter startinsert! - execute "tnoremap " - execute "tnoremap :q" - execute "tnoremap " - execute "IndentLinesDisable" - - startinsert! - endif -endfunction -nnoremap :call OpenTerminal() +for dir in ['swap', 'backup', 'spell', 'view', 'undo', 'after'] + call mkdir(g:customrtp . '/' . dir, 'p', 0700) +endfor diff --git a/wrappers/cvim b/wrappers/cvim index 0b31726..cd84620 100755 --- a/wrappers/cvim +++ b/wrappers/cvim @@ -1,3 +1,3 @@ #!/bin/sh -VIMINIT="source $HOME/.config/cvim/vimrc" nvim $@ +VIMINIT="source $HOME/.config/cvim/vimrc" vim $@