diff options
| -rw-r--r-- | .bashrc | 1 | ||||
| -rw-r--r-- | .config/nvim/lua/setup.lua | 1 | ||||
| -rw-r--r-- | .vimrc | 61 | ||||
| -rw-r--r-- | .xinitrc | 8 |
4 files changed, 65 insertions, 6 deletions
@@ -125,7 +125,6 @@ alias rm='rm -i' alias gs='git status' alias cs='config status' alias config='/usr/bin/git --git-dir=/home/adam/.cfg/ --work-tree=/home/adam' -alias vim='nvim' # PATH export PATH="$HOME/bin:$PATH" diff --git a/.config/nvim/lua/setup.lua b/.config/nvim/lua/setup.lua index 5d71554..68dba9e 100644 --- a/.config/nvim/lua/setup.lua +++ b/.config/nvim/lua/setup.lua @@ -30,7 +30,6 @@ set.incsearch = true set.backspace= 'indent,eol,start' set.pastetoggle = '<F11>' set.confirm = true -set.number = true set.relativenumber = true set.shiftwidth = 4 set.softtabstop = 4 @@ -0,0 +1,61 @@ +if has('filetype') + filetype indent plugin on +endif + +if has('syntax') + syntax on +endif + +if has('mouse') + set mouse=a +endif + +set nocompatible +set hidden +set wildmenu +set wildignorecase +set fileignorecase +set showcmd +set hlsearch +set incsearch +set ignorecase +set smartcase +set backspace=indent,eol,start +set autoindent +set ruler +set laststatus=0 +set confirm +set visualbell +set cmdheight=2 +set relativenumber +set notimeout ttimeout ttimeoutlen=200 +set pastetoggle=<F11> +set shiftwidth=4 +set softtabstop=4 +set expandtab +set noswapfile +set nowrap + +map Y y$ +nnoremap <C-L> :nohl<CR><C-L> +nnoremap n nzzzv +nnoremap N Nzzzv +inoremap kj <Esc> +tnoremap kj <C-\><C-n> + +inoremap , ,<c-g>u +inoremap . .<c-g>u +inoremap [ [<c-g>u +inoremap ! !<c-g>u +inoremap ? ?<c-g>u + +let mapleader=" " +nnoremap <leader>h :wincmd h<CR> +nnoremap <leader>j :wincmd j<CR> +nnoremap <leader>k :wincmd k<CR> +nnoremap <leader>l :wincmd l<CR> + +colorscheme default +highlight CursorLine cterm=NONE ctermbg=NONE ctermfg=NONE guibg=NONE guifg=NONE +highlight CursorLineNr cterm=bold ctermbg=NONE ctermfg=Yellow +set cursorline @@ -26,10 +26,10 @@ fi # start some nice programs if [ -d /etc/X11/xinit/xinitrc.d ] ; then - for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do - [ -x "$f" ] && . "$f" - done - unset f + for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do + [ -x "$f" ] && . "$f" + done + unset f fi |