diff --git a/home/config/nvim/init.lua b/home/config/nvim/init.lua index 35ad868..5f2008e 100644 --- a/home/config/nvim/init.lua +++ b/home/config/nvim/init.lua @@ -141,8 +141,8 @@ return require('packer').startup(function(use) }) - -- KEYS -- Vimspector + -- KEYS vim.cmd([[ nmap call vimspector#Launch() nmap call vimspector#StepOver() @@ -154,12 +154,10 @@ return require('packer').startup(function(use) nmap Dw :call vimspector#AddWatch() nmap De :call vimspector#Evaluate() ]]) - -- OPTS vim.opt.completeopt = {'menuone', 'noselect', 'noinsert'} vim.opt.shortmess = vim.opt.shortmess + { c = true} vim.api.nvim_set_option('updatetime', 300) - -- Fixed column for diagnostics to appear -- Show autodiagnostic popup on cursor hover_range -- Goto previous / next diagnostic warning / error @@ -168,9 +166,6 @@ return require('packer').startup(function(use) set signcolumn=yes autocmd CursorHold * lua vim.diagnostic.open_float(nil, { focusable = false }) ]]) - - - vim.cmd([[ let g:vimspector_sidebar_width = 85 let g:vimspector_bottombar_height = 15 diff --git a/home/config/nvim/lua/plugins.lua b/home/config/nvim/lua/plugins.lua index 98674ed..7ef38b1 100644 --- a/home/config/nvim/lua/plugins.lua +++ b/home/config/nvim/lua/plugins.lua @@ -1,40 +1,34 @@ vim.cmd([[autocmd BufWritePost plugins.lua PackerCompile]]) return function(use) - use({"SirVer/ultisnips"}) - use({"honza/vim-snippets"}) + use({'nvim-treesitter/nvim-treesitter', run = ':TSUpdate' }) + use({'SirVer/ultisnips'}) + use({'honza/vim-snippets'}) - use({"williamboman/mason.nvim"}) + use({'williamboman/mason.nvim'}) use({'williamboman/mason-lspconfig.nvim'}) use({'neovim/nvim-lspconfig'}) - require'lspconfig'.gopls.setup{ "gopls" } + require'lspconfig'.gopls.setup{ 'gopls' } use({'simrat39/rust-tools.nvim'}) use({'hrsh7th/nvim-cmp'}) - -- LSP completion source: use({'hrsh7th/cmp-nvim-lsp'}) - -- Useful completion sources: use({'hrsh7th/cmp-nvim-lua'}) use({'hrsh7th/cmp-nvim-lsp-signature-help'}) use({'hrsh7th/cmp-vsnip'}) use({'hrsh7th/cmp-path'}) use({'hrsh7th/cmp-buffer'}) use({'hrsh7th/vim-vsnip'}) - use { - 'nvim-treesitter/nvim-treesitter', - run = ':TSUpdate' -} + -- use({'atelierbram/vim-colors_atelier-schemes'}) + -- use({'liuchengxu/space-vim-dark'}) - use({'atelierbram/vim-colors_atelier-schemes'}) use({'robertmeta/nofrils'}) use({'vim-test/vim-test'}) use({'hashivim/vim-terraform'}) use({'rmagatti/auto-session'}) use({'ludovicchabant/vim-gutentags'}) - -- use({'ervandew/supertab'}) use({'preservim/nerdtree'}) - use({'liuchengxu/space-vim-dark'}) use({'junegunn/fzf', dir='~/.fzf'}) use({'junegunn/fzf.vim'}) use({'mhinz/vim-startify'}) @@ -42,12 +36,9 @@ return function(use) use({'ap/vim-buftabline'}) use({'airblade/vim-gitgutter'}) use({'majutsushi/tagbar'}) - use { - 'nvim-lualine/lualine.nvim', - requires = { 'kyazdani42/nvim-web-devicons', opt = true } - } + use {'nvim-lualine/lualine.nvim', requires = { 'kyazdani42/nvim-web-devicons', opt = true } } use({'arkav/lualine-lsp-progress'}) - require('lualine').setup { + require('lualine').setup({ options = { theme = 'palenight' }, sections = { lualine_b ={ {'filename', path=1} }, @@ -62,8 +53,7 @@ return function(use) lualine_d = {}, lualine_e = {}, } - - } + }) use({'voldikss/vim-floaterm'}) use({'fatih/vim-go'}) use({'whatyouhide/vim-gotham'}) @@ -74,44 +64,33 @@ return function(use) use({'gf3/peg.vim'}) use({'nvim-lua/plenary.nvim'}) - - use({ - 'nvim-telescope/telescope.nvim', - --commit="c1a2af0", - config = function () require('telescope').setup{ file_ignore_patterns = {"node_modules","./venv/"} } end - }) + use({ 'nvim-telescope/telescope.nvim', config = function () require('telescope').setup{ file_ignore_patterns = {'node_modules','./venv/'} } end }) use({'nvim-telescope/telescope-project.nvim'}) -- require'telescope'.load_extension('project') - - use({'puremourning/vimspector'}) use({'nvim-treesitter/nvim-treesitter-refactor'}) use({'RRethy/nvim-treesitter-textsubjects'}) - -- use({'airblade/vim-rooter'}) + use({'airblade/vim-rooter'}) -- Debugging use 'mfussenegger/nvim-dap' - local rt = require("rust-tools") - + local rt = require('rust-tools') rt.setup({ server = { on_attach = function(_, bufnr) -- Hover actions - vim.keymap.set("n", "", rt.hover_actions.hover_actions, { buffer = bufnr }) + vim.keymap.set('n', '', rt.hover_actions.hover_actions, { buffer = bufnr }) -- Code action groups - vim.keymap.set("n", "a", rt.code_action_group.code_action_group, { buffer = bufnr }) + vim.keymap.set('n', 'a', rt.code_action_group.code_action_group, { buffer = bufnr }) end, }, }) + use({'lukas-reineke/indent-blankline.nvim'}) - use({"lukas-reineke/indent-blankline.nvim"}) - - - - use({"fredeeb/tardis.nvim", config = true }) - require('tardis-nvim').setup { + use({'fredeeb/tardis.nvim', config = true }) + require('tardis-nvim').setup({ keymap = { next = '', -- next entry in log (older) prev = '', -- previous entry in log (newer) @@ -119,6 +98,6 @@ return function(use) commit_message = 'm', -- show commit message for current commit in buffer }, commits = 32, -- max number of commits to read - } + }) end diff --git a/home/jobs/redlattice.sh b/home/jobs/redlattice.sh index da0a15e..f9b0e91 100644 --- a/home/jobs/redlattice.sh +++ b/home/jobs/redlattice.sh @@ -8,3 +8,9 @@ function rl() { done } + +function gsub() { + git submodule update --init --recursive --remote +} + +alias portalshell="docker-compose -f docker-compose.yml exec portald bash"