Skip to content

Commit 3fecc12

Browse files
committed
Update dotfiles
1 parent 7b163c3 commit 3fecc12

File tree

12 files changed

+70
-11
lines changed

12 files changed

+70
-11
lines changed

nvim/.config/nvim/ftdetect/astro.vim

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
autocmd BufRead,BufEnter *.astro set filetype=astro

nvim/.config/nvim/ftplugin/astro.vim

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
nnoremap <leader>r :!tmux send-keys -t 1 C-c "clear; npm run dev" C-m<CR><C-L>

nvim/.config/nvim/ftplugin/go.vim

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ let g:go_highlight_build_constraints = 1
1313
let g:go_def_mode='gopls'
1414
let g:go_info_mode='gopls'
1515
let g:go_def_mapping_enabled = 0
16+
let g:go_fmt_autosave = 1
1617

1718
autocmd BufNewFile,BufRead *.go setlocal noexpandtab tabstop=2 shiftwidth=2
1819

nvim/.config/nvim/ftplugin/zig.vim

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
nnoremap <leader>r :!tmux send-keys -t 1 C-c "clear; zig build run" C-m<CR><C-L>

nvim/.config/nvim/init.vim

+3-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Plug 'tpope/vim-fugitive'
1717
Plug 'airblade/vim-gitgutter'
1818
Plug 'prettier/vim-prettier', {
1919
\ 'do': 'npm install',
20-
\ 'for': ['javascript', 'typescript', 'typescriptreact', 'javascriptreact'] }
20+
\ 'for': ['javascript', 'typescript', 'typescriptreact', 'javascriptreact', 'astro'] }
2121
Plug 'jparise/vim-graphql'
2222
Plug 'elixir-editors/vim-elixir'
2323
Plug 'pantharshit00/vim-prisma'
@@ -31,6 +31,8 @@ Plug 'akinsho/nvim-bufferline.lua'
3131
Plug 'hoob3rt/lualine.nvim'
3232

3333
Plug 'hashivim/vim-terraform'
34+
Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
35+
Plug 'williamboman/nvim-lsp-installer'
3436
call plug#end()
3537

3638
if has('termguicolors')

nvim/.config/nvim/plugin/lsp.lua

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
local lsp = require('lspconfig')
2+
3+
lsp.rust_analyzer.setup{ }
4+
lsp.tsserver.setup {
5+
on_attach = on_attach,
6+
root_dir = lsp.util.root_pattern("package.json"),
7+
}
8+
lsp.denols.setup {
9+
on_attach = on_attach,
10+
root_dir = lsp.util.root_pattern("deno.json", "deno.jsonc"),
11+
}
12+
lsp.gopls.setup{ }
13+
lsp.graphql.setup{ }
14+
lsp.dockerls.setup{ }
15+
lsp.elixirls.setup{ cmd = { "/Users/tim/Documents/elixir-ls/language_server.sh" }; }
16+
lsp.prismals.setup{ }
17+
lsp.astro.setup{}
18+
lsp.zls.setup{ cmd = { "/Users/tim/zls/zls" }; }

nvim/.config/nvim/plugin/lsp.vim

-8
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,3 @@ let g:compe.source.vsnip = v:false
3333
inoremap <silent><expr> <C-Space> compe#complete()
3434
inoremap <silent><expr> <CR> compe#confirm('<CR>')
3535
inoremap <silent><expr> <C-e> compe#close('<C-e>')
36-
37-
lua require'lspconfig'.rust_analyzer.setup{ }
38-
lua require'lspconfig'.tsserver.setup{ }
39-
lua require'lspconfig'.gopls.setup{ }
40-
lua require'lspconfig'.graphql.setup{ }
41-
lua require'lspconfig'.dockerls.setup{ }
42-
lua require'lspconfig'.elixirls.setup{ cmd = { "/Users/tim/Documents/elixir-ls/language_server.sh" }; }
43-
lua require'lspconfig'.prismals.setup{ }

nvim/.config/nvim/plugin/prettier.vim

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
" let g:prettier#exec_cmd_async = 1
22

3-
autocmd BufWritePre *.jsx,*.js,*.tsx,*.ts Prettier
3+
autocmd BufWritePre *.jsx,*.js,*.tsx,*.ts,*.astro Prettier
+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
local status_ok, configs = pcall(require, "nvim-treesitter.configs")
2+
3+
if not status_ok then
4+
vim.notify("nvim-treesitter not found!")
5+
return
6+
end
7+
8+
configs.setup {
9+
sync_install = false, -- install languages synchronously (only applied to `ensure_installed`)
10+
ignore_install = { "" }, -- List of parsers to ignore installing
11+
autopairs = {
12+
enable = true,
13+
},
14+
highlight = {
15+
enable = true, -- false will disable the whole extension
16+
disable = { "typescript", "javascript", "rust", "go" }, -- list of language that will be disabled
17+
additional_vim_regex_highlighting = true,
18+
},
19+
indent = { enable = true, disable = { "yaml" } },
20+
context_commentstring = {
21+
enable = true,
22+
enable_autocmd = false,
23+
},
24+
rainbow = {
25+
enable = true,
26+
extended_mode = true, -- Also highlight non-bracket delimiters like html tags, boolean or table: lang -> boolean
27+
max_file_lines = nil, -- Do not enable for files with more than n lines, int
28+
},
29+
}

tmux/.tmux.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ set -g default-terminal "xterm-256color-italic"
22
set -g mouse on
33

44
set -g status-left "#[fg=white,bg=#1D2632] #S "
5-
set -g status-right "#[fg=white,bg=#1D2632] #H #(/bin/bash $HOME/.tmux/kube.tmux 250 cyan white) "
5+
set -g status-right "#[fg=white,bg=#1D2632] #(/bin/bash $HOME/.tmux/kube.tmux 250 cyan white) "
66
set -g window-status-format "#[fg=white,bg=black] #W#F "
77
set -g window-status-current-format "#[fg=black,bg=#53ACB8] #W#F "
88
set -g window-status-separator ""

zsh/.alias

+2
Original file line numberDiff line numberDiff line change
@@ -64,3 +64,5 @@ alias kn="kubens"
6464
alias kc="kubectx"
6565

6666
alias todo="ack \"TODO\(timcole\):\" --ignore-dir=.next --ignore-dir=node_modules --ignore-dir=target --ignore-dir=dist --ignore-dir=build"
67+
68+
alias idrac="/usr/local/bin/javaws -nosecurity ~/Desktop/viewer.jnlp"

zsh/.zshrc

+12
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,15 @@ export PATH="/Users/tim/bin/:$PATH"
3535
export PATH="/usr/local/opt/node@14/bin:$PATH"
3636
export PATH="/usr/local/opt/mysql-client/bin:$PATH"
3737
export PATH="${KREW_ROOT:-$HOME/.krew}/bin:$PATH"
38+
39+
# bun completions
40+
[ -s "/Users/tim/.bun/_bun" ] && source "/Users/tim/.bun/_bun"
41+
42+
# bun
43+
export BUN_INSTALL="/Users/tim/.bun"
44+
export PATH="$BUN_INSTALL/bin:$PATH"
45+
46+
export NOMAD_ADDR=http://10.10.0.16:4646
47+
export CONSUL_HTTP_ADDR=http://10.10.0.16:8500
48+
export VAULT_ADDR=https://10.10.0.16:8200
49+
export VAULT_SKIP_VERIFY=True

0 commit comments

Comments
 (0)