cleanup and vim filetypes

This commit is contained in:
Noah Masur 2021-05-05 10:48:04 -04:00
parent e616d30fb3
commit ae418fe5c7
5 changed files with 26 additions and 13 deletions

View File

@ -599,6 +599,8 @@ key_bindings:
- { key: R, mods : Super, chars: "\x05" } # CMD-R sends CTRL-E for fish/vim - { key: R, mods : Super, chars: "\x05" } # CMD-R sends CTRL-E for fish/vim
- { key: G, mods : Super, chars: "\x07" } # CMD-G sends CTRL-G for fish/vim - { key: G, mods : Super, chars: "\x07" } # CMD-G sends CTRL-G for fish/vim
- { key: L, mods : Super, chars: "\x1F" } # CMD-L sends null key for fish - { key: L, mods : Super, chars: "\x1F" } # CMD-L sends null key for fish
- { key: H, mods : Super|Shift, chars: "\x02P" } # CMD-SHIFT-H previous tmux window
- { key: L, mods : Super|Shift, chars: "\x02n" } # CMD-SHIFT-L next tmux window
- { key: Return, mods : Shift, chars: "\x1b[13;2u" } - { key: Return, mods : Shift, chars: "\x1b[13;2u" }
- { key: Return, mods : Control, chars: "\x1b[13;5u" } - { key: Return, mods : Control, chars: "\x1b[13;5u" }

View File

@ -19,7 +19,7 @@ cask "drawio" # Diagrams
cask "scroll-reverser" # Mouse vs. trackpad cask "scroll-reverser" # Mouse vs. trackpad
cask "meetingbar" # Scheduling cask "meetingbar" # Scheduling
cask "gitify" # GitHub notifications cask "gitify" # GitHub notifications
brew "basictex" # Small LaTeX distribution cask "basictex" # Small LaTeX distribution
# Fonts # Fonts
tap "homebrew/cask-fonts" tap "homebrew/cask-fonts"
@ -30,7 +30,6 @@ cask "authy" # Authentication
cask "keybase" # Encryption cask "keybase" # Encryption
cask "discord" # My chat cask "discord" # My chat
cask "steam" # Games cask "steam" # Games
cask "vlc" # Video player
cask "jira-client" cask "jira-client"
cask "wkhtmltopdf" cask "wkhtmltopdf"
@ -39,3 +38,4 @@ cask "wkhtmltopdf"
# cask "postman" # API testing # cask "postman" # API testing
# cask "lens" # Kubernetes manager # cask "lens" # Kubernetes manager
# cask "calibre" # Ebook manager # cask "calibre" # Ebook manager
# cask "vlc" # Video player

View File

@ -1,7 +1,7 @@
{ {
"rust-analyzer.serverPath": "/usr/local/bin/rust-analyzer", "rust-analyzer.serverPath": "/usr/local/bin/rust-analyzer",
"rust-analyzer.checkOnSave.enable": true, "rust-analyzer.checkOnSave.enable": true,
"diagnostic-languageserver.filetypes": { "diagnostic-languageserver.filetypes": {
"sh": "shellcheck" "sh": "shellcheck"
} }
} }

View File

@ -2,7 +2,7 @@
"-------- "--------
" Basic Settings " Basic Settings
filetype plugin on " Load the plugin for current filetype (vimwiki) filetype plugin on " Load the plugin for current filetype
syntax enable " Syntax highlighting syntax enable " Syntax highlighting
set termguicolors " Set to truecolor set termguicolors " Set to truecolor
colorscheme gruvbox " Installed in autoload/ and colors/ colorscheme gruvbox " Installed in autoload/ and colors/
@ -38,16 +38,12 @@ if has("autocmd")
endif endif
" Better backup, swap and undo storage " Better backup, swap and undo storage
set noswapfile " Instead of swaps, create backups (less annoying) set noswapfile " Instead of swaps, create backups
set backup " Easier to recover and more secure set backup " Easier to recover and more secure
set undofile " Keeps undos after quit set undofile " Keeps undos after quit
set backupdir=~/.config/nvim/dirs/backup set backupdir=~/.config/nvim/dirs/backup
set undodir=~/.config/nvim/dirs/undo set undodir=~/.config/nvim/dirs/undo
" Keep selection when tabbing
vnoremap < <gv
vnoremap > >gv
" Create backup directories if they don't exist " Create backup directories if they don't exist
if !isdirectory(&backupdir) if !isdirectory(&backupdir)
call mkdir(&backupdir, "p") call mkdir(&backupdir, "p")
@ -55,3 +51,15 @@ endif
if !isdirectory(&undodir) if !isdirectory(&undodir)
call mkdir(&undodir, "p") call mkdir(&undodir, "p")
endif endif
" Keep selection when tabbing
vnoremap < <gv
vnoremap > >gv
" Force filetype patterns that Vim doesn't know about
au BufRead,BufNewFile *.Brewfile setfiletype brewfile
au BufRead,BufNewFile tmux.conf* setfiletype tmux
au BufRead,BufNewFile *ignore.*link setfiletype gitignore
au BufRead,BufNewFile gitconfig.*link setfiletype gitconfig
au BufRead,BufNewFile *.toml.*link setfiletype toml
au BufRead,BufNewFile .env* set ft=text | set syntax=sh

View File

@ -17,6 +17,9 @@ bind j select-pane -D
bind K select-pane -U bind K select-pane -U
bind l select-pane -R bind l select-pane -R
# Another option for previous
bind P previous-window
# Split out pane # Split out pane
bind b break-pane bind b break-pane