mirror of
https://github.com/itme-brain/nixos.git
synced 2026-05-08 14:50:12 -04:00
chore: unstage incorrectly tracked submodule contents
Remove files that were committed as regular tracked files instead of as git submodule references. Submodules will be re-added properly.
This commit is contained in:
parent
864c69fe61
commit
2779aed365
24 changed files with 0 additions and 1596 deletions
3
user/modules/vim/vim/.gitignore
vendored
3
user/modules/vim/vim/.gitignore
vendored
|
|
@ -1,3 +0,0 @@
|
|||
autoload
|
||||
plugged
|
||||
.netrwhist
|
||||
|
|
@ -1,74 +0,0 @@
|
|||
# Vim Config
|
||||
|
||||
Lightweight Vim config that mirrors the core editing feel of the Neovim setup without the IDE stack.
|
||||
|
||||
## Install
|
||||
|
||||
```bash
|
||||
git clone git@github.com:itme-brain/vim.git ~/.vim
|
||||
vim # plugins auto-install on first run
|
||||
```
|
||||
|
||||
Requires `curl` and `git` for vim-plug bootstrap. On NixOS this is managed via home-manager instead.
|
||||
|
||||
## How it works
|
||||
|
||||
- Vim auto-loads `~/.vim/vimrc` — no symlinks needed
|
||||
- [vim-plug](https://github.com/junegunn/vim-plug) auto-downloads itself via curl on first run if missing
|
||||
- Missing plugins are installed with `PlugInstall --sync` on `VimEnter`, then the vimrc is re-sourced
|
||||
- `silent! colorscheme` suppresses errors if the colorscheme hasn't been fetched yet (e.g. offline first run)
|
||||
- Undo history persists to `~/.vim/undodir` across sessions (`undofile`)
|
||||
|
||||
## Plugins
|
||||
|
||||
| Plugin | What it does |
|
||||
|--------|-------------|
|
||||
| base16-vim | Colorscheme (onedark) |
|
||||
| vim-surround | Surround text objects (`cs"'`, `ysiw]`) |
|
||||
| auto-pairs | Auto-close brackets/quotes |
|
||||
| fzf + fzf.vim | Fuzzy finder (files, buffers, grep) |
|
||||
| vim-log-highlighting | Syntax highlighting for log files |
|
||||
| vim-highlightedyank | Flash feedback on yank |
|
||||
| lightline.vim | Statusline |
|
||||
| vim-anzu | Search match count in statusline |
|
||||
|
||||
## Keybinds
|
||||
|
||||
Leader is `Space`.
|
||||
|
||||
### File explorer & search
|
||||
| Key | Action |
|
||||
|-----|--------|
|
||||
| `<leader>e` | Toggle netrw sidebar |
|
||||
| `<leader>/` | Ripgrep search from git root |
|
||||
| `<leader>ff` | Find files from git root (fzf) |
|
||||
| `<leader>fp` | Recent files (fzf) |
|
||||
| `<leader>fb` | Open buffers (fzf) |
|
||||
| `<leader>?` | Command history (fzf) |
|
||||
|
||||
### Buffers
|
||||
| Key | Action |
|
||||
|-----|--------|
|
||||
| `H` / `L` | Previous / next buffer |
|
||||
| `<leader>bd` | Delete buffer safely |
|
||||
|
||||
### Windows
|
||||
| Key | Action |
|
||||
|-----|--------|
|
||||
| `<C-h/j/k/l>` | Navigate windows (skips netrw) |
|
||||
| `<C-Arrow>` | Resize windows |
|
||||
| `<leader>wc` | Close window |
|
||||
| `<leader>ws` | Horizontal split |
|
||||
| `<leader>wv` | Vertical split |
|
||||
| `<leader>wm` | Maximize window |
|
||||
|
||||
### Other
|
||||
| Key | Action |
|
||||
|-----|--------|
|
||||
| `<Esc>` | Clear search highlight |
|
||||
| `<C-U>` / `<C-D>` | Scroll half-page (centered) |
|
||||
| `<` / `>` (visual) | Indent and keep selection |
|
||||
| `<leader>t` | Terminal (bottom split) |
|
||||
| `<leader>ts` | Insert timestamp |
|
||||
| `<leader>pu` | PlugUpdate |
|
||||
| `<leader>pi` | PlugInstall |
|
||||
|
|
@ -1,193 +0,0 @@
|
|||
let data_dir = has('nvim') ? stdpath('data') . '/site' : '~/.vim'
|
||||
if empty(glob(data_dir . '/autoload/plug.vim'))
|
||||
silent execute '!curl -fLo '.data_dir.'/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
|
||||
endif
|
||||
|
||||
autocmd VimEnter * if len(filter(values(g:plugs), '!isdirectory(v:val.dir)'))
|
||||
\| PlugInstall --sync | source $MYVIMRC
|
||||
\| endif
|
||||
|
||||
call plug#begin('~/.vim/plugged')
|
||||
Plug 'chriskempson/base16-vim'
|
||||
Plug 'tpope/vim-surround'
|
||||
Plug 'jiangmiao/auto-pairs'
|
||||
Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
|
||||
Plug 'junegunn/fzf.vim'
|
||||
Plug 'mtdl9/vim-log-highlighting'
|
||||
Plug 'machakann/vim-highlightedyank'
|
||||
Plug 'itchyny/lightline.vim'
|
||||
Plug 'osyo-manga/vim-anzu'
|
||||
call plug#end()
|
||||
|
||||
let mapleader = "\<Space>"
|
||||
set background=dark
|
||||
if has('termguicolors')
|
||||
set termguicolors
|
||||
endif
|
||||
silent! colorscheme base16-onedark
|
||||
|
||||
highlight Normal ctermbg=NONE guibg=NONE ctermfg=White guifg=#FFFFFF
|
||||
highlight NonText ctermbg=NONE guibg=NONE
|
||||
highlight CursorLine ctermbg=NONE guibg=NONE
|
||||
highlight CursorLineNr ctermfg=Yellow guifg=#E5C07B ctermbg=NONE guibg=NONE cterm=bold gui=bold
|
||||
highlight HighlightedyankRegion ctermfg=Black guifg=#000000 ctermbg=Yellow guibg=yellow
|
||||
highlight NormalNC ctermbg=NONE guibg=NONE
|
||||
highlight Search ctermfg=Black guifg=#000000 ctermbg=Yellow guibg=#FFCC66
|
||||
highlight LineNr ctermbg=NONE guibg=NONE
|
||||
highlight Visual ctermbg=Gray guibg=Gray ctermfg=Black guifg=Black
|
||||
|
||||
let g:highlightedyank_highlight_duration = 140
|
||||
let g:lightline = { 'colorscheme': 'deus', }
|
||||
|
||||
let $FZF_DEFAULT_OPTS = '--bind=tab:up,shift-tab:down'
|
||||
let g:fzf_layout = { 'window': 'enew' }
|
||||
|
||||
" netrw settings
|
||||
let g:netrw_banner = 0
|
||||
let g:netrw_winsize = 20
|
||||
let g:netrw_liststyle = 3
|
||||
let g:netrw_browse_split = 4
|
||||
let g:netrw_altv = 1
|
||||
|
||||
autocmd FileType netrw nnoremap <buffer> <C-l> :wincmd l<CR>
|
||||
autocmd FileType netrw nnoremap <buffer> <C-h> :wincmd h<CR>
|
||||
autocmd FileType netrw nnoremap <buffer> <C-j> :wincmd j<CR>
|
||||
autocmd FileType netrw nnoremap <buffer> <C-k> :wincmd k<CR>
|
||||
|
||||
set laststatus=2
|
||||
|
||||
set number
|
||||
set relativenumber
|
||||
set cursorline
|
||||
set scrolloff=8
|
||||
|
||||
set noincsearch
|
||||
set ignorecase
|
||||
set smartcase
|
||||
|
||||
set clipboard=unnamedplus
|
||||
set noswapfile
|
||||
set nobackup
|
||||
set undofile
|
||||
set undodir=~/.vim/undodir
|
||||
|
||||
set hidden
|
||||
|
||||
set tabstop=2
|
||||
set shiftwidth=2
|
||||
set softtabstop=2
|
||||
set expandtab
|
||||
set smartindent
|
||||
set fillchars=eob:\
|
||||
|
||||
set statusline=%{exists('*anzu#search_status')?anzu#search_status():''}
|
||||
|
||||
" --- Netrw toggle (like neo-tree) ---
|
||||
function! NetrwToggle()
|
||||
for i in range(1, winnr('$'))
|
||||
if getbufvar(winbufnr(i), '&filetype') ==# 'netrw'
|
||||
execute i . 'wincmd w'
|
||||
close
|
||||
return
|
||||
endif
|
||||
endfor
|
||||
let g:netrw_return_win = winnr()
|
||||
Lexplore
|
||||
endfunction
|
||||
|
||||
function! SafeWincmd(dir)
|
||||
let target = winnr(a:dir)
|
||||
if target == winnr()
|
||||
return
|
||||
endif
|
||||
if getbufvar(winbufnr(target), '&filetype') ==# 'netrw'
|
||||
return
|
||||
endif
|
||||
execute 'wincmd ' . a:dir
|
||||
endfunction
|
||||
|
||||
function! GitRoot()
|
||||
let l:root = systemlist('git rev-parse --show-toplevel')
|
||||
if v:shell_error == 0 && !empty(l:root) && !empty(l:root[0])
|
||||
return l:root[0]
|
||||
endif
|
||||
return getcwd()
|
||||
endfunction
|
||||
|
||||
function! SafeBdelete()
|
||||
if &filetype ==# 'netrw'
|
||||
echohl WarningMsg | echom 'Cannot delete buffer from netrw' | echohl None
|
||||
return
|
||||
endif
|
||||
|
||||
let l:buflisted = getbufinfo({'buflisted': 1})
|
||||
if len(l:buflisted) <= 1
|
||||
echohl WarningMsg | echom 'Cannot delete last buffer' | echohl None
|
||||
return
|
||||
endif
|
||||
|
||||
let l:buf = bufnr('%')
|
||||
bprevious
|
||||
execute 'bdelete ' . l:buf
|
||||
endfunction
|
||||
|
||||
" --- Plugin management ---
|
||||
nnoremap <leader>pu :PlugUpdate<CR>
|
||||
nnoremap <leader>pd :PlugUpgrade<CR>
|
||||
nnoremap <leader>ps :PlugStatus<CR>
|
||||
nnoremap <leader>pi :PlugInstall<CR>
|
||||
|
||||
" --- Search (anzu) ---
|
||||
nmap n <Plug>(anzu-n-with-echo)
|
||||
nmap N <Plug>(anzu-N-with-echo)
|
||||
nmap * <Plug>(anzu-star-with-echo)
|
||||
nmap # <Plug>(anzu-sharp-with-echo)
|
||||
nmap <Esc><Esc> <Plug>(anzu-clear-search-status)
|
||||
nnoremap <Esc> :noh<Bar>let @/=""<CR>
|
||||
|
||||
" --- Visual indentation ---
|
||||
vnoremap < <gv
|
||||
vnoremap > >gv
|
||||
|
||||
" --- Scrolling (centered) ---
|
||||
nnoremap <C-U> <C-U>zz
|
||||
nnoremap <C-D> <C-D>zz
|
||||
|
||||
" --- Window navigation (matches nvim <C-h/j/k/l>, skips netrw) ---
|
||||
nnoremap <C-h> :call SafeWincmd('h')<CR>
|
||||
nnoremap <C-j> :call SafeWincmd('j')<CR>
|
||||
nnoremap <C-k> :call SafeWincmd('k')<CR>
|
||||
nnoremap <C-l> :call SafeWincmd('l')<CR>
|
||||
|
||||
" --- Window resize (matches nvim <C-Arrow>) ---
|
||||
nnoremap <C-Right> :vertical resize +10<CR>
|
||||
nnoremap <C-Left> :vertical resize -10<CR>
|
||||
nnoremap <C-Up> :resize +10<CR>
|
||||
nnoremap <C-Down> :resize -10<CR>
|
||||
|
||||
" --- Window management ---
|
||||
nnoremap <leader>wc :close<CR>
|
||||
nnoremap <leader>ws :split<CR>
|
||||
nnoremap <leader>wv :vsplit<CR>
|
||||
nnoremap <leader>wm <C-w>_
|
||||
nnoremap <leader>ww :wincmd w<CR>
|
||||
nnoremap <leader>wW :wincmd W<CR>
|
||||
|
||||
" --- File explorer & search ---
|
||||
nnoremap <leader>e :call NetrwToggle()<CR>
|
||||
nnoremap <leader>/ :execute 'lcd ' . fnameescape(GitRoot()) <Bar> Rg<Space>
|
||||
nnoremap <leader>ff :execute 'lcd ' . fnameescape(GitRoot()) <Bar> Files<CR>
|
||||
nnoremap <leader>fp :History<CR>
|
||||
nnoremap <leader>fb :Buffers<CR>
|
||||
nnoremap <leader>? :History:<CR>
|
||||
|
||||
" --- Buffers ---
|
||||
nnoremap <leader>bd :call SafeBdelete()<CR>
|
||||
nnoremap H :bprevious<CR>
|
||||
nnoremap L :bnext<CR>
|
||||
|
||||
" --- Terminal ---
|
||||
nnoremap <leader>t :below terminal ++rows=10<CR>
|
||||
|
||||
" --- Misc ---
|
||||
nnoremap <Leader>ts :execute "normal! a" . strftime('[%b %d %H:%M:%S - BR]')<CR>
|
||||
Loading…
Add table
Add a link
Reference in a new issue