summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Noll <nbnoll@eml.cc>2021-09-09 16:32:04 -0700
committerNicholas Noll <nbnoll@eml.cc>2021-09-09 16:32:04 -0700
commitdb877acd7bff561aec115c5dec6c9eac8a444cde (patch)
treeda42f7cbc252fd8a85159e92fee420ae39f2d3e5
parentd73b9ad6094d37864f7859871c4fdf705d9fa60c (diff)
chore: rm vim inits
-rw-r--r--.config/fish/config.fish3
-rw-r--r--.config/nvim/colors.vim13
-rw-r--r--.config/nvim/commandmode.vim6
-rw-r--r--.config/nvim/init.vim75
-rw-r--r--.config/nvim/insertmode.vim1
-rw-r--r--.config/nvim/leaders.vim25
-rw-r--r--.config/nvim/macros.vim67
-rw-r--r--.config/nvim/normalmode.vim21
-rw-r--r--.config/nvim/plugins.vim95
-rw-r--r--.config/nvim/settings.vim161
-rw-r--r--.config/nvim/visualmode.vim4
11 files changed, 2 insertions, 469 deletions
diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index feb6705..39f68a4 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -46,7 +46,6 @@ alias lofi="mpv 'https://www.youtube.com/watch?v=5qap5aO4i9A' --no-video"
alias wttr='curl wttr.in'
alias dotfiles='/usr/bin/git --git-dir=$HOME/.dotfiles --work-tree=$HOME'
alias dbg='~/pyenv/bin/gdbgui'
-alias vpn='/opt/cisco/anyconnect/bin/vpnui'
# remote
alias vpn-ucsb='sudo openconnect --protocol=pulse https://ps.vpn.ucsb.edu/ra'
@@ -57,6 +56,8 @@ alias mnt-pod='sshfs nbnoll@pod-login1.cnsi.ucsb.edu:/home/nbnoll $HOME/mnt/clus
alias ssh-knot='ssh -X nbnoll@knot7.cnsi.ucsb.edu'
alias mnt-knot='sshfs nbnoll@knot7.cnsi.ucsb.edu:/home/nbnoll $HOME/mnt/cluster'
+alias ssh-server='ssh root@nbnoll.xyz'
+
alias umnt-cluster='umount $HOME/mnt/cluster'
# Prompt configuration.
diff --git a/.config/nvim/colors.vim b/.config/nvim/colors.vim
deleted file mode 100644
index e905710..0000000
--- a/.config/nvim/colors.vim
+++ /dev/null
@@ -1,13 +0,0 @@
-hi Normal guibg=NONE ctermbg=NONE
-hi NonText guibg=NONE ctermbg=NONE
-hi EndOfBuffer guibg=NONE ctermbg=NONE
-hi LineNr guibg=NONE ctermbg=NONE
-hi SignColumn guibg=NONE ctermbg=NONE
-hi VertSplit guibg=NONE ctermbg=NONE
-
-hi Pmenu ctermbg=237 ctermfg=NONE cterm=NONE guibg=#3a3a3a guifg=NONE gui=NONE
-hi PmenuSbar ctermbg=236 ctermfg=NONE cterm=NONE guibg=#303030 guifg=NONE gui=NONE
-hi PmenuSel ctermbg=236 ctermfg=140 cterm=NONE guibg=#303030 guifg=#af87d7 gui=NONE
-hi PmenuThumb ctermbg=167 ctermfg=NONE cterm=NONE guibg=#d75f5f guifg=NONE gui=NONE
-
-set pumblend=10
diff --git a/.config/nvim/commandmode.vim b/.config/nvim/commandmode.vim
deleted file mode 100644
index b09043e..0000000
--- a/.config/nvim/commandmode.vim
+++ /dev/null
@@ -1,6 +0,0 @@
-""""""""""""""""""""""""""""
-" Mappings
-""""""""""""""""""""""""""""
-
-cnoremap <C-a> <Home>
-cnoremap <C-e> <End>
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
deleted file mode 100644
index f4fce83..0000000
--- a/.config/nvim/init.vim
+++ /dev/null
@@ -1,75 +0,0 @@
-""""""""""""""""""""""""""""""""""""""""""""""""
-" VIM PLUGINS
-""""""""""""""""""""""""""""""""""""""""""""""""
-call plug#begin('~/.config/nvim/plugged')
-
-" Themes & ornamentation
-Plug 'junegunn/seoul256.vim'
-Plug 'mhartington/oceanic-next'
-Plug 'gilgigilgil/anderson.vim'
-
-" Universal coding help
-Plug 'tpope/vim-surround' " Extend vim's ability to change surronding marks.
-Plug 'tpope/vim-repeat' " Extend vim's ability to '.' repeat
-Plug 'tpope/vim-vinegar' " Extend vim's ability to move around file system
-Plug 'tpope/vim-commentary' " Extend vim's ability to comment things.
-Plug 'nathanaelkane/vim-indent-guides' " Indent blocks.
-Plug 'unblevable/quick-scope' " Quick horizontal movements.
-Plug 'https://github.com/adelarsq/vim-matchit' " Extended match operations for % operator
-
-Plug 'neovim/nvim-lspconfig'
-Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
-Plug 'Shougo/deoplete-lsp'
-
-Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' }
-Plug 'junegunn/fzf.vim' " Fuzzy file searchs
-
-Plug 'simeji/winresizer' " Nice window resize
-
-" Version control
-Plug 'airblade/vim-gitgutter'
-
-" Language specific
-Plug 'lervag/vimtex' " LaTeX
-Plug 'plasticboy/vim-markdown' " Markdown
-Plug 'dag/vim-fish' " Fish
-Plug 'fatih/vim-go' " Go
-Plug 'JuliaEditorSupport/julia-vim' " Julia
-Plug 'vim-python/python-syntax' " Python
-
-" Formatting
-Plug 'sbdchd/neoformat'
-
-Plug 'leafgarland/typescript-vim'
-Plug 'peitalin/vim-jsx-typescript'
-
-call plug#end()
-
-packadd termdebug
-
-""""""""""""""""""""""""""""""""""""""""""""""""
-" VIM COLOR SCHEME
-""""""""""""""""""""""""""""""""""""""""""""""""
-
-syntax enable
-if (has("termguicolors"))
- set termguicolors
-endif
-
-" colo seoul256
-colorscheme seoul256
-set laststatus=2
-
-""""""""""""""""""""""""""""""""""""""""""""""""
-" PARTITIONED FILES
-""""""""""""""""""""""""""""""""""""""""""""""""
-
-source ~/.config/nvim/leaders.vim
-source ~/.config/nvim/normalmode.vim
-source ~/.config/nvim/insertmode.vim
-source ~/.config/nvim/visualmode.vim
-source ~/.config/nvim/commandmode.vim
-source ~/.config/nvim/macros.vim
-source ~/.config/nvim/settings.vim
-source ~/.config/nvim/plugins.vim
-source ~/.config/nvim/colors.vim
diff --git a/.config/nvim/insertmode.vim b/.config/nvim/insertmode.vim
deleted file mode 100644
index 6fe9e9f..0000000
--- a/.config/nvim/insertmode.vim
+++ /dev/null
@@ -1 +0,0 @@
-inoremap <C-D> ·
diff --git a/.config/nvim/leaders.vim b/.config/nvim/leaders.vim
deleted file mode 100644
index 95ad868..0000000
--- a/.config/nvim/leaders.vim
+++ /dev/null
@@ -1,25 +0,0 @@
-let mapleader = ' '
-
-" fuzzy finder
-nnoremap <Leader>f :Files<CR>
-nnoremap <Leader>b :Buffers<CR>
-nnoremap <Leader>l :Lines<CR>
-nnoremap <Leader>w :BLines<CR>
-
-" buffer management
-nnoremap <Leader>o :only<CR>
-nnoremap <Leader>\| :wincmd \|<CR>
-nnoremap <Leader>= :wincmd =<CR>
-nnoremap <Leader>r :wincmd R<CR>
-
-" remove highlights
-nnoremap <Leader><Leader>R<CR> :so ~/.config/nvim/init.vim
-
-" testing
-nnoremap <Leader>t :call TestFile()<CR>
-nnoremap <Leader><Leader>t :call TestPkg()<CR>
-
-" debugging
-noremap <Leader><Leader>d :Termdebug<CR>
-nnoremap <Leader><Leader>b :Break<CR>
-nnoremap <Leader><Leader><S-b> :Clear<CR>
diff --git a/.config/nvim/macros.vim b/.config/nvim/macros.vim
deleted file mode 100644
index 45e49bf..0000000
--- a/.config/nvim/macros.vim
+++ /dev/null
@@ -1,67 +0,0 @@
-"""""""""""""""""""""""""""""""""""""""""""""
-" GENERAL
-"""""""""""""""""""""""""""""""""""""""""""""
-
-" TERMINAL HOTKEYS
-:tnoremap <Esc> <C-\><C-n>
-
-" Tmux integration.
-if empty($TMUX)
- nmap <silent> <c-k> :wincmd k<CR>
- nmap <silent> <c-j> :wincmd j<CR>
- nmap <silent> <c-h> :wincmd h<CR>
- nmap <silent> <c-l> :wincmd l<CR>
-else
- let g:tmux_is_last_pane = 0
- au WinEnter * let g:tmux_is_last_pane = 0
- " Like `wincmd` but also change tmux panes instead of vim windows when needed.
- function! TmuxWinCmd(direction)
- let nr = winnr()
- let tmux_last_pane = (a:direction == 'p' && g:tmux_is_last_pane)
- if !tmux_last_pane
- " try to switch windows within vim
- exec 'wincmd ' . a:direction
- endif
- " Forward the switch panes command to tmux if:
- " a) we're toggling between the last tmux pane;
- " b) we tried switching windows in vim but it didn't have effect.
- if tmux_last_pane || nr == winnr()
- let cmd = 'tmux select-pane -' . tr(a:direction, 'phjkl', 'lLDUR')
- exec 'silent !'.cmd
- redraw! " because `exec` fucked up the screen. why is this needed?? arrghh
- let g:tmux_is_last_pane = 1
- else
- let g:tmux_is_last_pane = 0
- endif
- endfunction
-
- " Ctrl + arrows to jump between windows.
- " Can also jump to adjacent tmux panes.
- nmap <silent> <c-k> :call TmuxWinCmd('k')<cr>
- nmap <silent> <c-j> :call TmuxWinCmd('j')<cr>
- nmap <silent> <c-h> :call TmuxWinCmd('h')<cr>
- nmap <silent> <c-l> :call TmuxWinCmd('l')<cr>
-
-endif
-
-"""""""""""""""""""""""""""""""""""""""""""""
-" CODING SPECFIC
-"""""""""""""""""""""""""""""""""""""""""""""
-
-" GOLANG
-command GoProfCPU execute "!go tool pprof --web $GOPATH/bin/%:r cpu.pprof"
-command GoProfMEM execute "!go tool pprof --web $GOPATH/bin/%:r mem.pprof"
-
-" testing
-function TestPkg()
- silent !clear
- execute "!runtest " . substitute(expand('%:p:h'), "/home/nolln/root/sys/", "", "")
-endfunction
-
-function TestFile()
- silent !clear
- execute "!runtest " . substitute(expand('%:p:r'), "/home/nolln/root/sys/", "", "")
-endfunction
-
-" C files
-autocmd BufNewfile,BufRead *.h set ft=c
diff --git a/.config/nvim/normalmode.vim b/.config/nvim/normalmode.vim
deleted file mode 100644
index b7b4f8c..0000000
--- a/.config/nvim/normalmode.vim
+++ /dev/null
@@ -1,21 +0,0 @@
-""""""""""""""""""""""""""""""
-" Normal mode remappings
-""""""""""""""""""""""""""""""
-
-" Toggle fold at current level
-"noremap <Tab> za
-
-" Repeat the last macro with enter key instead of @@
-" noremap <expr> <CR> empty(&buftype) ? '@@' : '<CR>'
-
-" Avoid unintentional switches to Ex mode
-nmap Q q
-
-" Consistent syntax
-noremap Y y$
-
-"""""" SPLIT NAVIGATION IN MACROS
-
-" Store relative line number jumps in the jump list if > 5
-" noremap <expr> k (v:count > 5 ? "m'" . v:count : '') . 'k'
-" noremap <expr> j (v:count > 5 ? "m'" . v:count : '') . 'j'
diff --git a/.config/nvim/plugins.vim b/.config/nvim/plugins.vim
deleted file mode 100644
index 174386c..0000000
--- a/.config/nvim/plugins.vim
+++ /dev/null
@@ -1,95 +0,0 @@
-""""""""""""""""""""""""""""""""""""""
-" Generic coding plugins
-""""""""""""""""""""""""""""""""""""""
-
-" Diagnostics for LSP
-
-lua <<
- local lsp = require('lspconfig')
-
- local setup = function(client, buffer)
- local function set_keymap(...) vim.api.nvim_buf_set_keymap(buffer, ...) end
- local function set_option(...) vim.api.nvim_buf_set_option(buffer, ...) end
-
- set_option('omnifunc', 'v:lua.vim.lsp.omnifunc')
-
- local opts = { noremap=true, silent=true }
-
- set_keymap('n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<CR>', opts)
- set_keymap('n', 'gd', '<cmd>lua vim.lsp.buf.definition()<CR>', opts)
- set_keymap('n', 'K', '<cmd>lua vim.lsp.buf.hover()<CR>', opts)
- set_keymap('n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<CR>', opts)
- set_keymap('n', '<C-k>', '<cmd>lua vim.lsp.buf.signature_help()<CR>', opts)
- set_keymap('n', 'gr', '<cmd>lua vim.lsp.buf.references()<CR>', opts)
- set_keymap('n', '[c', '<cmd>lua vim.lsp.diagnostic.goto_prev()<CR>', opts)
- set_keymap('n', ']c', '<cmd>lua vim.lsp.diagnostic.goto_next()<CR>', opts)
- set_keymap('n', '<space>e', '<cmd>lua vim.lsp.diagnostic.show_line_diagnostics()<CR>', opts)
- --[[
- set_keymap('n', '<space>dt', '<cmd>lua vim.lsp.buf.type_definition()<CR>', opts)
- set_keymap('n', '<space>rn', '<cmd>lua vim.lsp.buf.rename()<CR>', opts)
- --]]
- end
-
- local servers = { 'clangd', 'julials', 'tsserver' }
- for _, s in ipairs(servers) do
- lsp[s].setup {
- on_attach=setup,
- flags = {
- debounce_text_changes = 150,
- }
- }
- end
-
- vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(
- vim.lsp.diagnostic.on_publish_diagnostics, {
- virtual_text = false
- }
- )
-.
-
-" gdb debugging
-let g:termdebug_wide = 1
-
-" latex configuration
-let g:tex_flavor="latex"
-let g:vimtex_view_general_viewer="zathura"
-
-" show git gutter
-let g:gitgutter_grep=''
-let g:gitgutter_set_sign_backgrounds = 1
-
-" Quick-scope configuration.
-let g:qs_highlight_on_keys = ['f', 'F', 't', 'T']
-
-" Golang support
-let g:go_gocode_propose_builtins = 1
-let g:go_highlight_build_constraints = 1
-let g:go_highlight_extra_types = 1
-let g:go_highlight_fields = 1
-let g:go_highlight_functions = 1
-let g:go_highlight_methods = 1
-let g:go_highlight_operators = 1
-let g:go_highlight_structs = 1
-let g:go_highlight_types = 1
-let g:go_fmt_experimental = 1
-
-" Python support
-let g:pymode_python = 'python3'
-let g:python_highlight_all = 1
-
-" Clang support
-autocmd FileType c,cpp setlocal commentstring=//\ %s
-
-" prettier
-" when running at every change you may want to disable quickfix
-function RunPrettier()
- let l:winview = winsaveview()
- 1,$ !yarn -s prettier --stdin-filepath %:p --loglevel silent
- call winrestview(l:winview)
-endfunction
-
-augroup fmt
- autocmd!
- autocmd BufWritePre *.js,*.jsx,*.mjs,*.ts,*.tsx,*.css,*.less,*.scss,*.json,*.graphql,*.md,*.vue,*.yaml,*.html call RunPrettier()
-augroup END
-autocmd BufNewFile,BufRead *.tsx,*.jsx set filetype=typescriptreact
diff --git a/.config/nvim/settings.vim b/.config/nvim/settings.vim
deleted file mode 100644
index 4bfc4c1..0000000
--- a/.config/nvim/settings.vim
+++ /dev/null
@@ -1,161 +0,0 @@
-""""""""""""""""""""""""""""""""""""""
-" Vanilla Vim Settings
-""""""""""""""""""""""""""""""""""""""
-" Fonts
-set guifont=Inconsolata
-
-" Show linenumbers
-set ruler
-set number relativenumber
-
-" Search properties
-set incsearch
-set hlsearch
-
-" Set Proper Tabs
-set tabstop=4
-set softtabstop=4
-set shiftwidth=4
-set smarttab
-set expandtab
-
-" Set text display properties.
-set smartindent
-set nowrap
-set linebreak
-set nolist
-
-set textwidth=0
-set wrapmargin=0
-
-" Lazy drawing for fast scrolling
-set ttyfast
-set lazyredraw
-
-" Highlight current line
-set cursorline
-
-" Splits behave properly
-set noea
-set noequalalways
-
-" Manually configure some colors
-set laststatus=1
-
-" Allows to hide buffers without changes being saved
-set hidden
-
-" Some server have issues with backup files, see #649
-set nobackup
-set nowritebackup
-
-" Better display for messages
-set cmdheight=2
-
-" Smaller updatetime for CursorHold & CursorHoldI
-set updatetime=300
-
-" don't give |ins-completion-menu| messages.
-set shortmess+=c
-
-" always show signcolumns
-set signcolumn=yes
-
-" · to not be tokenized
-set iskeyword+=·
-
-let g:python_host_proj = "~/pyenv/bin/python"
-
-" Nasm
-let g:asmsyntax = 'nasm'
-
-if has('windows')
- set splitbelow " open horizontal splits below current window
-endif
-
-if has('vertsplit')
- set splitright " open vertical splits to the right of the current window
-endif
-
-if exists('$SUDO_USER')
- set nobackup " don't create root-owned files
- set nowritebackup " don't create root-owned files
-else
- set backupdir=~/local/.vim/tmp/backup
- set backupdir+=~/.vim/tmp/backup " keep backup files out of the way
- set backupdir+=.
-endif
-
-if exists('$SUDO_USER')
- set noswapfile " don't create root-owned files
-else
- set directory=~/local/.vim/tmp/swap//
- set directory+=~/.vim/tmp/swap// " keep swap files out of the way
- set directory+=.
-endif
-
-if has('persistent_undo')
- if exists('$SUDO_USER')
- set noundofile " don't create root-owned files
- else
- set undodir=~/local/.vim/tmp/undo
- set undodir+=~/.vim/tmp/undo " keep undo files out of the way
- set undodir+=.
- set undofile " actually use undo files
- endif
-endif
-
-if has('folding')
- if has('windows')
- set fillchars=vert:│ " BOX DRAWINGS HEAVY VERTICAL (U+2503, UTF-8: E2 94 83)
- set fillchars+=fold:· " MIDDLE DOT (U+00B7, UTF-8: C2 B7)
- endif
-
- set foldmethod=syntax " not as cool as syntax, but faster
- set foldlevelstart=99 " start unfolded
-
-endif
-
-if has('viminfo')
- if exists('$SUDO_USER')
- set viminfo= " don't create root-owned files
- else
- if isdirectory('~/local/.vim/tmp')
- set viminfo+=n~/local/.vim/tmp/viminfo
- else
- set viminfo+=n~/.vim/tmp/viminfo " override ~/.viminfo default
- endif
-
- if !empty(glob('~/.vim/tmp/viminfo'))
- if !filereadable(expand('~/.vim/tmp/viminfo'))
- echoerr 'warning: ~/.vim/tmp/viminfo exists but is not readable'
- endif
- endif
- endif
-endif
-
-if has('mksession')
- if isdirectory('~/local/.vim/tmp')
- set viewdir=~/local/.vim/tmp/view
- else
- set viewdir=~/.vim/tmp/view " override ~/.vim/view default
- endif
- set viewoptions=cursor,folds " save/restore just these (with `:{mk,load}view`)
-endif
-
-if has('virtualedit')
- set virtualedit=block " allow cursor to move where there is no text in visual block mode
-endif
-
-set visualbell t_vb= " stop annoying beeping for non-error errors
-set whichwrap=b,h,l,s,<,>,[,],~ " allow <BS>/h/l/<Left>/<Right>/<Space>, ~ to cross line boundaries
-set wildcharm=<C-z> " substitute for 'wildchar' (<Tab>) in macros
-
-if has('wildignore')
- set wildignore+=*.o,*.rej " patterns to ignore during file-navigation
-endif
-if has('wildmenu')
- set wildmenu " show options as list when switching buffers etc
-endif
-
-set wildmode=longest:full,full " shell-like autocomplete to unambiguous portion
diff --git a/.config/nvim/visualmode.vim b/.config/nvim/visualmode.vim
deleted file mode 100644
index 9a91f9f..0000000
--- a/.config/nvim/visualmode.vim
+++ /dev/null
@@ -1,4 +0,0 @@
-xnoremap <C-h> <C-w>h
-xnoremap <C-j> <C-w>j
-xnoremap <C-k> <C-w>k
-xnoremap <C-l> <C-w>l