diff --git a/neovim/.config/nvim/init.lua b/neovim/.config/nvim/init.lua index 1e9c594..cfb34c7 100644 --- a/neovim/.config/nvim/init.lua +++ b/neovim/.config/nvim/init.lua @@ -8,8 +8,12 @@ require('completion') vim.opt.tabstop = 2 vim.opt.shiftwidth = 2 vim.opt.number = true +vim.opt.expandtab = true vim.opt.relativenumber = true vim.opt.clipboard = 'unnamedplus' vim.opt.smartindent = true vim.opt.swapfile = false vim.opt.signcolumn = "yes" + +vim.g.loaded_perl_provider = 0 +vim.g.loaded_ruby_provider = 0 diff --git a/neovim/.config/nvim/lua/completion.lua b/neovim/.config/nvim/lua/completion.lua index cbfea3e..3b0e544 100644 --- a/neovim/.config/nvim/lua/completion.lua +++ b/neovim/.config/nvim/lua/completion.lua @@ -24,6 +24,3 @@ cmp.setup({ { name = 'buffer' }, }) }) - -require('copilot').setup() -require('copilot_cmp').setup() diff --git a/neovim/.config/nvim/lua/development.lua b/neovim/.config/nvim/lua/development.lua index 975d8f3..a7b36b3 100644 --- a/neovim/.config/nvim/lua/development.lua +++ b/neovim/.config/nvim/lua/development.lua @@ -6,6 +6,14 @@ require('lspconfig').pyright.setup{ } require('lspconfig').tsserver.setup {} +require'lspconfig'.terraformls.setup{} +vim.api.nvim_create_autocmd({"BufWritePre"}, { + pattern = {"*.tf", "*.tfvars"}, + callback = function() + vim.lsp.buf.format() + end, +}) + require('dap-python').setup('~/.local/share/virtualenvs/debugpy/bin/python') require('dap-python').test_runner = 'pytest' @@ -59,37 +67,3 @@ require("coverage").setup({ -- customize language specific settings }, }) -require("rest-nvim").setup({ - -- Open request results in a horizontal split - result_split_horizontal = false, - -- Keep the http file buffer above|left when split horizontal|vertical - result_split_in_place = true, - -- Skip SSL verification, useful for unknown certificates - skip_ssl_verification = false, - -- Encode URL before making request - encode_url = true, - -- Highlight request on run - highlight = { - enabled = true, - timeout = 150, - }, - result = { - -- toggle showing URL, HTTP info, headers at top the of result window - show_url = true, - show_http_info = true, - show_headers = true, - -- executables or functions for formatting response body [optional] - -- set them to false if you want to disable them - formatters = { - json = "jq", - html = function(body) - return vim.fn.system({"tidy", "-i", "-q", "-"}, body) - end - }, - }, - -- Jump to request line on run - jump_to_request = false, - env_file = '.env', - custom_dynamic_variables = {}, - yank_dry_run = true, -}) diff --git a/neovim/.config/nvim/lua/plugins.lua b/neovim/.config/nvim/lua/plugins.lua index 77014a9..07dffdf 100644 --- a/neovim/.config/nvim/lua/plugins.lua +++ b/neovim/.config/nvim/lua/plugins.lua @@ -23,7 +23,7 @@ return require('packer').startup(function(use) -- Handling use { - 'nvim-telescope/telescope.nvim', tag = '0.1.1', + 'nvim-telescope/telescope.nvim', tag = '0.1.5', requires = { {'nvim-lua/plenary.nvim'} } } use 'ggandor/leap.nvim' @@ -44,12 +44,15 @@ return require('packer').startup(function(use) use 'akinsho/toggleterm.nvim' -- Completion - use 'github/copilot.vim' +-- use 'github/copilot.vim' use 'hrsh7th/nvim-cmp' - use 'L3MON4D3/LuaSnip' + use({ + "L3MON4D3/LuaSnip", + run = "make install_jsregexp" + }) use 'saadparwaiz1/cmp_luasnip' - use 'zbirenbaum/copilot.lua' - use 'zbirenbaum/copilot-cmp' +-- use 'zbirenbaum/copilot.lua' +-- use 'zbirenbaum/copilot-cmp' use 'hrsh7th/cmp-nvim-lsp' -- Development @@ -58,18 +61,15 @@ return require('packer').startup(function(use) use 'mfussenegger/nvim-dap-python' use 'rcarriga/nvim-dap-ui' use 'theHamsta/nvim-dap-virtual-text' - use { - 'rest-nvim/rest.nvim', - requires = {'nvim-lua/plenary.nvim'} - } use { "nvim-neotest/neotest", requires = { - "nvim-neotest/neotest-python", - "nvim-neotest/neotest-plenary", - "nvim-lua/plenary.nvim", - "nvim-treesitter/nvim-treesitter", - "antoinemadec/FixCursorHold.nvim" + "nvim-neotest/nvim-nio", + "nvim-neotest/neotest-python", + "nvim-neotest/neotest-plenary", + "nvim-lua/plenary.nvim", + "nvim-treesitter/nvim-treesitter", + "antoinemadec/FixCursorHold.nvim" } } use({ diff --git a/neovim/.config/nvim/lua/test.py b/neovim/.config/nvim/lua/test.py index 5abf4a8..8810904 100644 --- a/neovim/.config/nvim/lua/test.py +++ b/neovim/.config/nvim/lua/test.py @@ -5,4 +5,3 @@ def __main__(): if __name__ == "__main__": __main__() print("Hello World") - return 0 # This is a comment diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf index c218abe..e53a4c4 100644 --- a/tmux/.tmux.conf +++ b/tmux/.tmux.conf @@ -1,9 +1,13 @@ -set-option -g default-shell /bin/zsh +set-option -g default-shell /bin/bash set -g default-terminal 'screen-256color' -set-option -sa terminal-overrides ',xterm-termite:RGB:smcup@:rmcup@' +set-option -sa terminal-features ',xterm-256color:RGB:smcup@:rmcup@' set-option -sg escape-time 10 set-option -g set-titles on set-option -g set-titles-string "tmux - #W" +set-option -g focus-events on +unbind C-b +set-option -g prefix C-a +bind-key C-a send-prefix set -g status-bg black set -g status-fg white set -g window-status-current-style bg=blue