Merge pull request 'xdg config home' (#3) from PlexSheep/configs:master into master

Reviewed-on: cscherrNT/configs#3
This commit is contained in:
cscherrNT 2023-08-28 09:49:34 +02:00
commit 45c429b7b2
6 changed files with 92 additions and 35 deletions

View File

@ -1,7 +1,6 @@
" GENERAL CONFIGS ----------------------------------------------------------------------------------
syntax on " syntax highlighting
set nocompatible " disable compatibility to old-time vi
set mouse=v " middle-click paste with
set number
set nocompatible
set hlsearch " highlight search
@ -14,27 +13,40 @@ set autoindent " indent a new line the same amount as the line just
set number " add line numbers
set wildmode=longest,list " get bash-like tab completions
set cc=100 " set an 100 column border for good coding style
set mouse=a " enable mouse click
set mouse=a " enable mouse for help file editing and hitting prompts
set cursorline " highlight current cursor line
set ttyfast " Speed up scrolling in Vim
set fdm=indent " folding method syntax
set foldlevel=10 " only fold when a certain complexity is reached by default. This applies only at startup.
"set spell " enable spell check (may need to download language package)
set timeout timeoutlen=400
set foldlevel=10 " only fold when a certain complexity is reached by default.
" This applies only at startup.
set numberwidth=4 " How much space the line numbers should take
set signcolumn=yes " Show extra icons in the line numbers (like git marks, errors)
set timeout timeoutlen=400 " How long to wait for non prefix free hotkey melodies
set ttimeoutlen=0
" Avoid showing message extra message when using completion"
" Avoid showing message extra message when using completion
set shortmess+=c
" set timeout to wait for shortcuts with a prefix
"allow auto-indenting depending on file type
filetype plugin indent on
filetype plugin on
let g:indentLine_char = '│'
" HOTKEYS ------------------------------------------------------------------------------------------
" add lines with double o
noremap oo o<ESC>
noremap OO O<ESC>
" H and L for end and beginning
nmap H ^
nmap L $
vmap H ^
vmap L $
" usefull functions for arrow keys
" (and force the user to use hjkl)
" useful functions for arrow keys
" (and force the user to use `hjkl`)
" right/left to add/remove a tab in the beginning of the line.
nmap <Left> <<
@ -44,13 +56,19 @@ vmap <Left> <gv
vmap <Right> >gv
" up and down move lines up and down
nmap <Up> :m -1<CR>
nmap <Up> :m -2<CR>
nmap <Down> :m +1<CR>
" same for visual mode (plus reselecting stuff for visual mode)
vmap <Up> :m -1<CR>
vmap <Up> :m -2<CR>
vmap <Down> :m +1<CR>
" hit f3 to toggle search highlighting"
" resize windows
nnoremap <C-Left> :vertical resize -1<CR>
nnoremap <C-Right> :vertical resize +1<CR>
nnoremap <C-Up> :resize -1<CR>
nnoremap <C-Down> :resize +1<CR>
" hit F3 to toggle search highlighting"
nnoremap <F3> :set hlsearch!<CR>
nnoremap <SPACE> <Nop>
@ -58,7 +76,7 @@ let mapleader=" "
map <leader>t :echo "leader tested!"<CR>
map <leader>h :noh<CR>
" copy to wayland clipboard when leader is used. (note, install gvim for this)
" copy to Wayland clipboard when leader is used. (note, install gvim for this)
vnoremap <leader>wy y :call system("wl-copy", @")<CR>
nnoremap <leader>wY Y :call system("wl-copy", @")<CR>
nnoremap <leader>wy y :call system("wl-copy", @")<CR>
@ -70,31 +88,64 @@ nnoremap <leader>Y "+Y
nnoremap <leader>y "+y
nnoremap <leader>yy "+yy
" dont write the pastet upon stuff in visual mode into the register
" don't write the pasted upon stuff in visual mode into the register
vnoremap p pgvy
" open terminal with F12
nnoremap <F12> :terminal<CR>
" automatically set closed braces aswell when making opened ones.
"inoremap " ""<left>
"inoremap ' ''<left>
"inoremap ( ()<left>
"inoremap [ []<left>
"inoremap { {}<left>
"inoremap {<CR> {<CR>}<ESC>O
"inoremap {;<CR> {<CR>};<ESC>O
" vsplit with <Leader>, then "
map <Leader>" :vsplit<CR>
" split with <Leader>, then %"
map <Leader>% :split<CR>
" enter normal mode from terminal-emulator width <ESC>
tnoremap <Esc> <C-\><C-n>
" join with <leader>j
nnoremap <leader>j :join<CR>
" join up with <leader>J
nnoremap <leader>J :move .-2<CR> :join<CR>
" :W to write file as root"
command W :w ! sudo tee %
" Set completeopt to have a better completion experience"
set completeopt=menuone,noinsert,noselect
" split lines with <leader>s
nnoremap <leader>s i<CR><ESC>
" split lines up with <leader>S
nnoremap <leader>S i<CR><ESC> V:m -2<CR>
" move screen a line up/down with alt U/D
nmap <A-u> kzz
nmap <A-d> jzz
" spell checking -----------------------------------------------------------------------------------
set spell spelllang=en
" set a location
set spellfile=~/.config/nvim/spell/en.utf-8.add
" go to last or next misspelled word
nnoremap zn ]s
nnoremap zN [s
" same as above but only with bad words (unrecognized)
nnoremap Zn ]S
nnoremap ZN [S
" mark correct with zg, mark bad with zw, undo with zug/zuw
" fancy fzf correct with zc, default is z= but that sucks for qwertz keyboards
function! FzfSpellSink(word)
exe 'normal! "_ciw'.a:word
endfunction
function! FzfSpell()
let suggestions = spellsuggest(expand("<cword>"))
return fzf#run({'source': suggestions, 'sink': function("FzfSpellSink"), 'down': 10 })
endfunction
nnoremap z<space> :call FzfSpell()<CR>
" don't make things written as `something` a typo
syntax region cBackTickNoSpell start=+`+ end=+`+
\ contained containedin=cComment,cCommentL transparent
\ contains=@NoSpell
" don't make lines starting with `//!` a typo (used by rust docs)
syntax region cRusDocCommentNoSpell start=+//!+ end='\z1' contained extend
\ contained containedin=cComment,cCommentL transparent
\ contains=@NoSpell

View File

@ -8,6 +8,7 @@ fi
### ENVVARS
export EDITOR=nvim
export editor=nvim
export XDG_CONFIG_HOME=~/.config
# configure `time` format
TIMEFMT=$'\nreal\t%E\nuser\t%U\nsys\t%S\ncpu\t%P'

View File

@ -9,6 +9,7 @@ fi
export PATH=/usr/local/sbin:/usr/sbin/:/usr/local/bin:/usr/bin:/var/lib/flatpak/exports/bin:/usr/bin/site_perl:/usr/bin/vendor_perl:/usr/bin/core_perl:~/.local/bin:~/.cargo/bin
export EDITOR=nvim
export editor=nvim
export XDG_CONFIG_HOME=~/.config
# configure `time` format
TIMEFMT=$'\nreal\t%E\nuser\t%U\nsys\t%S\ncpu\t%P'

View File

@ -2,6 +2,7 @@
export PATH=/usr/local/sbin:/usr/sbin/:/usr/local/bin:/usr/bin:~/.local/bin:~/.cargo/bin
export EDITOR=vim
export editor=vim
export XDG_CONFIG_HOME=~/.config
# configure `time` format
TIMEFMT=$'\nreal\t%E\nuser\t%U\nsys\t%S\ncpu\t%P'

View File

@ -8,6 +8,7 @@ fi
### ENVVARS
export PATH=/usr/local/sbin:/usr/sbin/:/usr/local/bin:/usr/bin:/var/lib/flatpak/exports/bin:/usr/bin/site_perl:/usr/bin/vendor_perl:/usr/bin/core_perl:~/.local/bin:~/.cargo/bin
export EDITOR=nvim
export XDG_CONFIG_HOME=~/.config
export editor=nvim
# configure `time` format

View File

@ -12,6 +12,8 @@ cp -r $(pwd)/home/.config ~
cp -r $(pwd)/home/.tmux-server.conf ~/.tmux.conf
touch ~/.local.zsh
if [ tail -n 1 ~/.zshrc != "source ~/.zsh-kali/zshrc" ]; then
last_line=$(tail -n 1 ~/.zshrc)
if [ $last_line != "source ~/.zsh-kali/zshrc" ]; then
echo "source ~/.zsh-kali/zshrc" >> ~/.zshrc
fi