mirror of
				https://github.com/halfdan/dotfiles.git
				synced 2025-10-31 12:36:12 +00:00 
			
		
		
		
	Multiple changes
This commit is contained in:
		| @@ -55,11 +55,10 @@ vim.api.nvim_set_keymap('n', '<Leader>ff', ':lua require(\'telescope.builtin\'). | |||||||
| vim.api.nvim_set_keymap('n', '<leader>fw', ':lua require(\'telescope.builtin\').grep_string { search = vim.fn.expand("<cword>") }<CR>', {noremap = true}) | vim.api.nvim_set_keymap('n', '<leader>fw', ':lua require(\'telescope.builtin\').grep_string { search = vim.fn.expand("<cword>") }<CR>', {noremap = true}) | ||||||
| vim.api.nvim_set_keymap('n', '<leader>fb', ':lua require(\'telescope.builtin\').buffers()<CR>', {noremap = true}) | vim.api.nvim_set_keymap('n', '<leader>fb', ':lua require(\'telescope.builtin\').buffers()<CR>', {noremap = true}) | ||||||
| vim.api.nvim_set_keymap('n', '<leader>vh', ':lua require(\'telescope.builtin\').help_tags()<CR>', {noremap = true}) | vim.api.nvim_set_keymap('n', '<leader>vh', ':lua require(\'telescope.builtin\').help_tags()<CR>', {noremap = true}) | ||||||
| vim.api.nvim_set_keymap('n', '<leader>gw', ':lua require(\'telescope\').extensions.git_worktree.git_worktrees()<CR>', {noremap = true}) | vim.api.nvim_set_keymap('n', '<leader>gwl', ':lua require(\'telescope\').extensions.git_worktree.git_worktrees()<CR>', {noremap = true}) | ||||||
| vim.api.nvim_set_keymap('n', '<leader>gm', ':lua require(\'telescope\').extensions.git_worktree.create_git_worktree()<CR>', {noremap = true}) | vim.api.nvim_set_keymap('n', '<leader>gwc', ':lua require(\'telescope\').extensions.git_worktree.create_git_worktree()<CR>', {noremap = true}) | ||||||
|  |  | ||||||
| -- Tagbar | -- Tagbar | ||||||
| vim.api.nvim_set_keymap('n', '<Leader>tt', ':SymbolsOutline<CR>', {noremap = true}) |  | ||||||
| vim.api.nvim_set_keymap('n', '<Leader>hl', ':nohl<CR>', {noremap = true}) | vim.api.nvim_set_keymap('n', '<Leader>hl', ':nohl<CR>', {noremap = true}) | ||||||
|  |  | ||||||
| -- Vim Test | -- Vim Test | ||||||
|   | |||||||
| @@ -77,8 +77,6 @@ local function documentHighlight(client, bufnr) | |||||||
|     end |     end | ||||||
| end | end | ||||||
|  |  | ||||||
| require'lspconfig'.elixirls.setup{} |  | ||||||
|  |  | ||||||
| -- needed for the LSP to recognize elixir files (alternativly just use elixir-editors/vim-elixir) | -- needed for the LSP to recognize elixir files (alternativly just use elixir-editors/vim-elixir) | ||||||
| vim.cmd([[ | vim.cmd([[ | ||||||
|   au BufRead,BufNewFile *.ex,*.exs set filetype=elixir |   au BufRead,BufNewFile *.ex,*.exs set filetype=elixir | ||||||
| @@ -118,8 +116,15 @@ end | |||||||
| local capabilities = vim.lsp.protocol.make_client_capabilities() | local capabilities = vim.lsp.protocol.make_client_capabilities() | ||||||
| capabilities = require('cmp_nvim_lsp').update_capabilities(capabilities) | capabilities = require('cmp_nvim_lsp').update_capabilities(capabilities) | ||||||
|  |  | ||||||
|  |  | ||||||
|  | lspconfig['elixirls'].setup{ | ||||||
|  |     cmd = { "/Users/fbecker18/opt/elixir-ls/language_server.sh"}, | ||||||
|  |     on_attach = on_attach, | ||||||
|  |     capabilities = capabilities, | ||||||
|  | } | ||||||
|  |  | ||||||
| -- Enable the following language servers | -- Enable the following language servers | ||||||
| local servers = { 'gopls', 'julials', 'rust_analyzer', 'pyright', 'elixirls' } | local servers = { 'gopls', 'julials', 'rust_analyzer', 'pyright' } | ||||||
| for _, lsp in ipairs(servers) do | for _, lsp in ipairs(servers) do | ||||||
|   lspconfig[lsp].setup { |   lspconfig[lsp].setup { | ||||||
|     on_attach = on_attach, |     on_attach = on_attach, | ||||||
| @@ -127,35 +132,6 @@ for _, lsp in ipairs(servers) do | |||||||
|   } |   } | ||||||
| end | end | ||||||
|  |  | ||||||
| --require("lspconfig").gopls.setup({ |  | ||||||
| 	--cmd = { "gopls", "serve" }, |  | ||||||
| 	--settings = { |  | ||||||
| 		--gopls = { |  | ||||||
| 			--analyses = { |  | ||||||
| 				--unusedparams = true, |  | ||||||
| 			--}, |  | ||||||
| 			--staticcheck = true, |  | ||||||
| 		--}, |  | ||||||
| 	--}, |  | ||||||
| --}) |  | ||||||
|  |  | ||||||
| --require'lspconfig'.julials.setup{} |  | ||||||
|  |  | ||||||
| --require'lspconfig'.pyright.setup{} |  | ||||||
|  |  | ||||||
| --require("lspconfig").rust_analyzer.setup({ |  | ||||||
|     ----cmd = { "rustup", "run", "nightly", "rust-analyzer"}, |  | ||||||
|     --[> |  | ||||||
|     --settings = { |  | ||||||
|             --rust = { |  | ||||||
|             --unstable_features = true, |  | ||||||
|             --build_on_save = false, |  | ||||||
|             --all_features = true, |  | ||||||
|         --}, |  | ||||||
|     --} |  | ||||||
|     ----]] |  | ||||||
| --}) |  | ||||||
|  |  | ||||||
| require('rust-tools').setup({ | require('rust-tools').setup({ | ||||||
|     tools = { |     tools = { | ||||||
|         inlay_hints = { |         inlay_hints = { | ||||||
| @@ -165,14 +141,6 @@ require('rust-tools').setup({ | |||||||
|     } |     } | ||||||
| }) | }) | ||||||
|  |  | ||||||
| vim.g.symbols_outline = { |  | ||||||
|     auto_close = true, |  | ||||||
|     highlight_hovered_item = true, |  | ||||||
|     show_guides = true, |  | ||||||
|     relative_width = true, |  | ||||||
|     width = 25, |  | ||||||
| } |  | ||||||
|  |  | ||||||
| --vim.cmd([[ | --vim.cmd([[ | ||||||
|     --augroup |     --augroup | ||||||
|         --autocmd! |         --autocmd! | ||||||
|   | |||||||
| @@ -70,9 +70,6 @@ return require("packer").startup( | |||||||
|         use {'machakann/vim-highlightedyank'} |         use {'machakann/vim-highlightedyank'} | ||||||
|         -- let g:highlightedyank_highlight_duration = 100 |         -- let g:highlightedyank_highlight_duration = 100 | ||||||
|  |  | ||||||
|         -- Easy commenting for Vim |  | ||||||
|         use {'preservim/nerdcommenter'} |  | ||||||
|  |  | ||||||
|         -- LSP / Language Server Protocol |         -- LSP / Language Server Protocol | ||||||
|         use { |         use { | ||||||
|             'neovim/nvim-lspconfig', |             'neovim/nvim-lspconfig', | ||||||
| @@ -95,8 +92,12 @@ return require("packer").startup( | |||||||
|         use {'nvim-lua/lsp-status.nvim'} |         use {'nvim-lua/lsp-status.nvim'} | ||||||
|  |  | ||||||
|         --use {'simrat39/symbols-outline.nvim'} |         --use {'simrat39/symbols-outline.nvim'} | ||||||
|         use {'marcuscaisey/symbols-outline.nvim', branch = 'relative-width'} |         use { | ||||||
|  |             'numToStr/Comment.nvim', | ||||||
|  |             config = function() | ||||||
|  |                 require('Comment').setup() | ||||||
|  |             end | ||||||
|  |         } | ||||||
|         -- Telescope fuzzy find files/grep |         -- Telescope fuzzy find files/grep | ||||||
|         use {'nvim-lua/popup.nvim'} |         use {'nvim-lua/popup.nvim'} | ||||||
|         use {'nvim-lua/plenary.nvim'} |         use {'nvim-lua/plenary.nvim'} | ||||||
|   | |||||||
| @@ -40,26 +40,8 @@ cmp.setup({ | |||||||
|         ['<C-e>'] = cmp.mapping.close(), |         ['<C-e>'] = cmp.mapping.close(), | ||||||
|         ['<CR>'] = cmp.mapping.confirm { |         ['<CR>'] = cmp.mapping.confirm { | ||||||
|             behavior = cmp.ConfirmBehavior.Replace, |             behavior = cmp.ConfirmBehavior.Replace, | ||||||
|             select = true, |             select = false, -- only replace if explicitly selected | ||||||
|         }, |         }, | ||||||
|         ['<Tab>'] = function(fallback) |  | ||||||
|             if cmp.visible() then |  | ||||||
|                 cmp.select_next_item() |  | ||||||
|             elseif luasnip.expand_or_jumpable() then |  | ||||||
|                 luasnip.expand_or_jump() |  | ||||||
|             else |  | ||||||
|                 fallback() |  | ||||||
|             end |  | ||||||
|         end, |  | ||||||
|         ['<S-Tab>'] = function(fallback) |  | ||||||
|             if cmp.visible() then |  | ||||||
|                 cmp.select_prev_item() |  | ||||||
|             elseif luasnip.jumpable(-1) then |  | ||||||
|                 luasnip.jump(-1) |  | ||||||
|             else |  | ||||||
|                 fallback() |  | ||||||
|             end |  | ||||||
|         end, |  | ||||||
|     }, |     }, | ||||||
|     sources = cmp.config.sources({ |     sources = cmp.config.sources({ | ||||||
|         { name = 'cmp_tabnine' }, |         { name = 'cmp_tabnine' }, | ||||||
|   | |||||||
| @@ -5,7 +5,7 @@ require('nvim-treesitter.configs').setup({ | |||||||
|         enable = true |         enable = true | ||||||
|     }, |     }, | ||||||
|     indent = { |     indent = { | ||||||
|         enable = true |         enable = false | ||||||
|     }, |     }, | ||||||
|     incremental_selection = { |     incremental_selection = { | ||||||
|         enable = true, |         enable = true, | ||||||
|   | |||||||
| @@ -3,7 +3,7 @@ | |||||||
| if [[ $# -eq 1 ]]; then | if [[ $# -eq 1 ]]; then | ||||||
|     selected=$1 |     selected=$1 | ||||||
| else | else | ||||||
|     selected=$(find ~/code -mindepth 1 -maxdepth 1 -type d | fzf) |     selected=$(find ~/code ~/personal -mindepth 1 -maxdepth 1 -type d | fzf) | ||||||
| fi | fi | ||||||
|  |  | ||||||
| if [[ -z $selected ]]; then | if [[ -z $selected ]]; then | ||||||
|   | |||||||
| @@ -1,7 +1,14 @@ | |||||||
| elixir 1.6 | elixir 1.13.1 | ||||||
| kubectl 1.18.2 | kubectl 1.18.2 | ||||||
| helm 2.9.1 | helm 2.9.1 | ||||||
| eksctl 0.2.1 | eksctl 0.2.1 | ||||||
| terraform 0.14.6 | terraform 0.14.6 | ||||||
| terragrunt 0.23.31 | terragrunt 0.23.31 | ||||||
| kustomize 3.10.0 | kustomize 3.10.0 | ||||||
|  | golang 1.17.5 | ||||||
|  | saml2aws 2.27.1 | ||||||
|  | awscli 2.1.38 | ||||||
|  | kubectx 0.9.3 | ||||||
|  | argo 2.12.10 | ||||||
|  | erlang 24.2 | ||||||
|  | python 3.8.6 | ||||||
|   | |||||||
							
								
								
									
										1
									
								
								.zshenv
									
									
									
									
									
								
							
							
						
						
									
										1
									
								
								.zshenv
									
									
									
									
									
								
							| @@ -11,6 +11,7 @@ alias vim="nvim" | |||||||
| alias v="nvim" | alias v="nvim" | ||||||
| alias wget="wget -q -c -w 3 --show-progress" | alias wget="wget -q -c -w 3 --show-progress" | ||||||
| alias p="python" | alias p="python" | ||||||
|  | alias va=". .venv/bin/activate" | ||||||
|  |  | ||||||
| ## Second Measure | ## Second Measure | ||||||
| alias pa="aws-okta exec prod-admin -- " | alias pa="aws-okta exec prod-admin -- " | ||||||
|   | |||||||
							
								
								
									
										7
									
								
								.zshrc
									
									
									
									
									
								
							
							
						
						
									
										7
									
								
								.zshrc
									
									
									
									
									
								
							| @@ -15,6 +15,7 @@ export PYENV_ROOT="$HOME/.pyenv" | |||||||
| export PATH="$PYENV_ROOT/shims:$PATH" | export PATH="$PYENV_ROOT/shims:$PATH" | ||||||
| export GOPATH=$HOME/go | export GOPATH=$HOME/go | ||||||
| export PATH=$PATH:$GOPATH/bin | export PATH=$PATH:$GOPATH/bin | ||||||
|  | export PATH="$HOME/.local/bin:$PATH" | ||||||
| export PATH="$HOME/.cargo/bin:$PATH" | export PATH="$HOME/.cargo/bin:$PATH" | ||||||
| export PATH="$HOME/.poetry/bin:$PATH" | export PATH="$HOME/.poetry/bin:$PATH" | ||||||
| export PATH=$PATH:~/.local/bin | export PATH=$PATH:~/.local/bin | ||||||
| @@ -36,3 +37,9 @@ eval "$(starship init zsh)" | |||||||
|  |  | ||||||
| . $HOME/.asdf/asdf.sh | . $HOME/.asdf/asdf.sh | ||||||
| . $HOME/.asdf/completions/asdf.bash | . $HOME/.asdf/completions/asdf.bash | ||||||
|  |  | ||||||
|  |  | ||||||
|  | ####  smctl@bootstrap.sm_shell_helpers-start | ||||||
|  | . $HOME/.sm.zshrc | ||||||
|  | ####  smctl@bootstrap.sm_shell_helpers-end | ||||||
|  |  | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user