Merge remote-tracking branch 'origin/master' into server
This commit is contained in:
commit
4c5a0cf0f2
|
|
@ -1 +1 @@
|
|||
Subproject commit 54fe9c5a793a2fe57cb99f4c466fe92aa5208c9e
|
||||
Subproject commit 2ef1c2fa607d90b6d42ae75b0f028bf81a223352
|
||||
|
|
@ -3,6 +3,8 @@
|
|||
|
||||
# except:
|
||||
!.zshrc
|
||||
!.vimrc
|
||||
!.ideavimrc
|
||||
!.config
|
||||
!.config/nvim
|
||||
!.config/nvim/**
|
||||
|
|
|
|||
|
|
@ -0,0 +1,26 @@
|
|||
"" Source your .vimrc
|
||||
source /home/plex/.vimrc
|
||||
|
||||
"" -- Suggested options --
|
||||
" Show a few lines of context around the cursor. Note that this makes the
|
||||
" text scroll if you mouse-click near the start or end of the window.
|
||||
set scrolloff=5
|
||||
|
||||
" Do incremental searching.
|
||||
set incsearch
|
||||
|
||||
" Do the joining with the ide
|
||||
set ideajoin
|
||||
|
||||
"" -- Map IDE actions to IdeaVim -- https://jb.gg/abva4t
|
||||
"" Map \r to the Reformat Code action
|
||||
"map \r <Action>(ReformatCode)
|
||||
|
||||
"" Map <leader>d to start debug
|
||||
"map <leader>d <Action>(Debug)
|
||||
|
||||
"" Map \b to toggle the breakpoint on the current line
|
||||
"map \b <Action>(ToggleLineBreakpoint)
|
||||
|
||||
|
||||
" Find more examples here: https://jb.gg/share-ideavimrc
|
||||
|
|
@ -0,0 +1,129 @@
|
|||
" GENERAL CONFIGS ----------------------------------------------------------------------------------
|
||||
syntax on " syntax highlighting
|
||||
set nocompatible " disable compatibility to old-time vi
|
||||
set number
|
||||
set nocompatible
|
||||
set hlsearch " highlight search
|
||||
set incsearch " incremental search
|
||||
set tabstop=4 " number of columns occupied by a tab
|
||||
set softtabstop=4 " see multiple spaces as tab stops so <BS> does the right thing
|
||||
set expandtab " converts tabs to white space
|
||||
set shiftwidth=4 " width for auto indents
|
||||
set autoindent " indent a new line the same amount as the line just typed
|
||||
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 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 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
|
||||
set shortmess+=c
|
||||
|
||||
"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 $
|
||||
|
||||
" 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> <<
|
||||
nmap <Right> >>
|
||||
" same for visual mode (plus reselecting stuff for visual mode)
|
||||
vmap <Left> <gv
|
||||
vmap <Right> >gv
|
||||
|
||||
" up and down move lines up and down
|
||||
nmap <Up> :m -2<CR>
|
||||
nmap <Down> :m +1<CR>
|
||||
" same for visual mode (plus reselecting stuff for visual mode)
|
||||
vmap <Up> :m -2<CR>
|
||||
vmap <Down> :m +1<CR>
|
||||
|
||||
" 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>
|
||||
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)
|
||||
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>
|
||||
nnoremap <leader>wyy yy :call system("wl-copy", @")<CR>
|
||||
|
||||
" copy to system clipboard when leader is used. (note, install gvim for this)
|
||||
vnoremap <leader>y "+y
|
||||
nnoremap <leader>Y "+Y
|
||||
nnoremap <leader>y "+y
|
||||
nnoremap <leader>yy "+yy
|
||||
|
||||
" don't write the pasted upon stuff in visual mode into the register
|
||||
vnoremap p pgvy
|
||||
|
||||
" open terminal with F12
|
||||
nnoremap <F12> :terminal<CR>
|
||||
|
||||
" vsplit with <Leader>, then "
|
||||
map <Leader>" :vsplit<CR>
|
||||
|
||||
" split with <Leader>, then %"
|
||||
map <Leader>% :split<CR>
|
||||
|
||||
" join with <leader>j
|
||||
nnoremap <leader>j :join<CR>
|
||||
" join up with <leader>J
|
||||
nnoremap <leader>J :move .-2<CR> :join<CR>
|
||||
|
||||
" 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
|
||||
15
.zshrc
15
.zshrc
|
|
@ -1,11 +1,18 @@
|
|||
### ENVVARS
|
||||
PATH="/usr/bin:/usr/sbin:$HOME/.local/bin:$HOME/.cargo/bin:/usr/local/bin"
|
||||
PATH="/usr/bin:/usr/sbin:$HOME/.local/bin:$HOME/.cargo/bin:/usr/local/bin:$HOME/.deno/bin"
|
||||
export PATH
|
||||
export EDITOR=nvim
|
||||
export editor=nvim
|
||||
export XDG_CONFIG_HOME=~/.config
|
||||
export TIMEFMT=$'\nreal\t%E\nuser\t%U\nsys\t%S\ncpu\t%P'
|
||||
export ZSH=$HOME/.zsh
|
||||
export CLIPBOARD_NOGUI=1 # wayland only allows GUI apps to use the clipboard.
|
||||
# cb would have to open every 2 seconds and steal
|
||||
# focus. This sucks, so I will have to disable GUI
|
||||
# integration (yes that means ctrl+v) for now.
|
||||
#
|
||||
# see https://github.com/Slackadays/Clipboard/issues/171
|
||||
|
||||
|
||||
### Aliases
|
||||
alias l="lsd -lah"
|
||||
|
|
@ -20,6 +27,7 @@ alias isotime='date +"%Y-%m-%dT%H:%M:%S%z"'
|
|||
alias gg=lazygit
|
||||
alias reload="source ~/.zshrc"
|
||||
alias gls=/bin/ls
|
||||
alias gotemp="cd $(mktemp -d)"
|
||||
|
||||
### non standard aliases
|
||||
if [ -f ~/.zsh_aliases ]; then
|
||||
|
|
@ -37,6 +45,10 @@ function cachekeys () { exec 2>/dev/null;
|
|||
function newpass() {
|
||||
LC_ALL=C tr -dc '[:alnum:]' < /dev/urandom | head -c${1:-$0}
|
||||
}
|
||||
function condac() {
|
||||
conda activate $@
|
||||
export HOST=$(hostname)
|
||||
}
|
||||
# TODO: make neorg a function, take a workspace as arg
|
||||
|
||||
### ---- zsh options -------------------------------------
|
||||
|
|
@ -180,4 +192,3 @@ then
|
|||
else
|
||||
eval "$(zoxide init zsh)"
|
||||
fi
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue