From 559bcb4642b2c30142bba3d706ed7ac3875e94f2 Mon Sep 17 00:00:00 2001 From: Fabian Becker Date: Tue, 8 Feb 2022 10:56:26 +0100 Subject: [PATCH] Major update --- .config/nvim/init.lua | 8 +- .config/nvim/lua/autocmds.lua | 1 + .config/nvim/lua/globals.lua | 2 +- .config/nvim/lua/keymappings.lua | 25 +++--- .config/nvim/lua/lsp.lua | 114 +++++++++++++++++------- .config/nvim/lua/plugins.lua | 10 +++ .config/nvim/lua/plugins/cmp.lua | 53 ++++++++--- .config/nvim/lua/plugins/lualine.lua | 4 +- .config/nvim/lua/plugins/sneak.lua | 3 + .config/nvim/lua/plugins/telescope.lua | 4 +- .config/nvim/plugin/packer_compiled.lua | 109 ++++++++++++---------- .tmux.conf | 4 +- 12 files changed, 223 insertions(+), 114 deletions(-) create mode 100644 .config/nvim/lua/autocmds.lua diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 8ea78a2..91c31c3 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -6,13 +6,6 @@ require('plugins') require('colorscheme') require('lsp') ---require('lsp.docker-ls') ---require('lsp.python-ls') ---require('lsp.julia-ls') ---require('lsp.json-ls') ---require('lsp.elixir-ls') ---require('lsp.go-ls') ---require('lsp.terraform-ls') require('plugins.telescope') require('plugins.telescope-project') @@ -24,3 +17,4 @@ require('plugins.sneak') require('themes.nord') +require('autocmds') diff --git a/.config/nvim/lua/autocmds.lua b/.config/nvim/lua/autocmds.lua new file mode 100644 index 0000000..e908903 --- /dev/null +++ b/.config/nvim/lua/autocmds.lua @@ -0,0 +1 @@ +vim.cmd([[autocmd TermOpen * setlocal nonumber norelativenumber]]) diff --git a/.config/nvim/lua/globals.lua b/.config/nvim/lua/globals.lua index 56ddd1d..92f5183 100644 --- a/.config/nvim/lua/globals.lua +++ b/.config/nvim/lua/globals.lua @@ -6,7 +6,7 @@ O = { clipboard = unnamedplus, incsearch = true, termguicolors = true, - colorscheme = 'dracula', + colorscheme = 'nord', hidden_files = true, wrap_lines = false, number = true, diff --git a/.config/nvim/lua/keymappings.lua b/.config/nvim/lua/keymappings.lua index 6376a5e..96dc9d1 100644 --- a/.config/nvim/lua/keymappings.lua +++ b/.config/nvim/lua/keymappings.lua @@ -38,12 +38,6 @@ vim.cmd([[ vim.api.nvim_set_keymap('v', '<', '', '>gv', {noremap = true, silent = true}) --- I hate escape -vim.api.nvim_set_keymap('i', 'jk', '', {noremap = true, silent = true}) -vim.api.nvim_set_keymap('i', 'kj', '', {noremap = true, silent = true}) -vim.api.nvim_set_keymap('i', 'jj', '', {noremap = true, silent = true}) - - -- Tab switch buffer vim.api.nvim_set_keymap('n', '', ':bnext', {noremap = true, silent = true}) vim.api.nvim_set_keymap('n', '', ':bprevious', {noremap = true, silent = true}) @@ -55,12 +49,11 @@ vim.api.nvim_set_keymap('x', 'J', ':move \'>+1gv-gv', {noremap = true, silen vim.api.nvim_set_keymap('n', 'Q', '', {noremap = true, silent = true}) -- Telescope -vim.api.nvim_set_keymap('n', 'ps', ':lua require(\'telescope.builtin\').grep_string({ search = vim.fn.input("Grep For > ")})', {noremap = true}) -vim.api.nvim_set_keymap('n', '', ':lua require(\'telescope.builtin\').git_files()', {noremap = true}) -vim.api.nvim_set_keymap('n', 'pf', ':lua require(\'telescope.builtin\').find_files()', {noremap = true}) +vim.api.nvim_set_keymap('n', 'fs', ':lua require(\'telescope.builtin\').grep_string({ search = vim.fn.input("Grep For > ")})', {noremap = true}) +vim.api.nvim_set_keymap('n', 'ff', ':lua require(\'telescope.builtin\').find_files()', {noremap = true}) -vim.api.nvim_set_keymap('n', 'pw', ':lua require(\'telescope.builtin\').grep_string { search = vim.fn.expand("") }', {noremap = true}) -vim.api.nvim_set_keymap('n', 'pb', ':lua require(\'telescope.builtin\').buffers()', {noremap = true}) +vim.api.nvim_set_keymap('n', 'fw', ':lua require(\'telescope.builtin\').grep_string { search = vim.fn.expand("") }', {noremap = true}) +vim.api.nvim_set_keymap('n', 'fb', ':lua require(\'telescope.builtin\').buffers()', {noremap = true}) vim.api.nvim_set_keymap('n', 'vh', ':lua require(\'telescope.builtin\').help_tags()', {noremap = true}) vim.api.nvim_set_keymap('n', 'gw', ':lua require(\'telescope\').extensions.git_worktree.git_worktrees()', {noremap = true}) vim.api.nvim_set_keymap('n', 'gm', ':lua require(\'telescope\').extensions.git_worktree.create_git_worktree()', {noremap = true}) @@ -69,6 +62,13 @@ vim.api.nvim_set_keymap('n', 'gm', ':lua require(\'telescope\').extensio vim.api.nvim_set_keymap('n', 'tt', ':SymbolsOutline', {noremap = true}) vim.api.nvim_set_keymap('n', 'hl', ':nohl', {noremap = true}) +-- Vim Test +vim.api.nvim_set_keymap('n', 't', ':TestNearest', {noremap = true}) +vim.api.nvim_set_keymap('n', 'T', ':TestFile', {noremap = true}) +vim.api.nvim_set_keymap('n', 'a', ':TestSuite', {noremap = true}) +vim.api.nvim_set_keymap('n', 'l', ':TestLast', {noremap = true}) +vim.api.nvim_set_keymap('n', 'g', ':TestVisit', {noremap = true}) + -- LSP vim.cmd("nnoremap gd lua vim.lsp.buf.definition()") vim.cmd("nnoremap gD lua vim.lsp.buf.declaration()") @@ -76,6 +76,9 @@ vim.cmd("nnoremap gr lua vim.lsp.buf.references()") vim.cmd("nnoremap gi lua vim.lsp.buf.implementation()") vim.cmd("nnoremap ca :Lspsaga code_action") vim.cmd("nnoremap K :Lspsaga hover_doc") +vim.cmd("nnoremap rn lua vim.lsp.buf.rename()") +vim.cmd("nnoremap ff lua vim.lsp.buf.formatting()") + vim.cmd('nnoremap lua vim.lsp.buf.signature_help()') vim.cmd("nnoremap :Lspsaga diagnostic_jump_prev") vim.cmd("nnoremap :Lspsaga diagnostic_jump_next") diff --git a/.config/nvim/lua/lsp.lua b/.config/nvim/lua/lsp.lua index cabe77e..9b7aa82 100644 --- a/.config/nvim/lua/lsp.lua +++ b/.config/nvim/lua/lsp.lua @@ -86,33 +86,83 @@ vim.cmd([[ au BufRead,BufNewFile mix.lock set filetype=elixir ]]) -require("lspconfig").gopls.setup({ - cmd = { "gopls", "serve" }, - settings = { - gopls = { - analyses = { - unusedparams = true, - }, - staticcheck = true, - }, - }, -}) -require'lspconfig'.julials.setup{} -require'lspconfig'.pyright.setup{} +-- Diagnostic keymaps +vim.api.nvim_set_keymap('n', 'e', 'lua vim.diagnostic.open_float()', { noremap = true, silent = true }) +vim.api.nvim_set_keymap('n', '[d', 'lua vim.diagnostic.goto_prev()', { noremap = true, silent = true }) +vim.api.nvim_set_keymap('n', ']d', 'lua vim.diagnostic.goto_next()', { noremap = true, silent = true }) +vim.api.nvim_set_keymap('n', 'q', 'lua vim.diagnostic.setloclist()', { noremap = true, silent = true }) -require("lspconfig").rust_analyzer.setup({ - cmd = { "rustup", "run", "nightly", "rust-analyzer"}, - --[[ - settings = { - rust = { - unstable_features = true, - build_on_save = false, - all_features = true, - }, +-- LSP settings +local lspconfig = require 'lspconfig' +local on_attach = function(_, bufnr) + local opts = { noremap = true, silent = true } + vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gD', 'lua vim.lsp.buf.declaration()', opts) + vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gd', 'lua vim.lsp.buf.definition()', opts) + vim.api.nvim_buf_set_keymap(bufnr, 'n', 'K', 'lua vim.lsp.buf.hover()', opts) + vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gi', 'lua vim.lsp.buf.implementation()', opts) + vim.api.nvim_buf_set_keymap(bufnr, 'n', '', 'lua vim.lsp.buf.signature_help()', opts) + vim.api.nvim_buf_set_keymap(bufnr, 'n', 'wa', 'lua vim.lsp.buf.add_workspace_folder()', opts) + vim.api.nvim_buf_set_keymap(bufnr, 'n', 'wr', 'lua vim.lsp.buf.remove_workspace_folder()', opts) + vim.api.nvim_buf_set_keymap(bufnr, 'n', 'wl', 'lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))', opts) + vim.api.nvim_buf_set_keymap(bufnr, 'n', 'D', 'lua vim.lsp.buf.type_definition()', opts) + vim.api.nvim_buf_set_keymap(bufnr, 'n', 'rn', 'lua vim.lsp.buf.rename()', opts) + vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gr', 'lua vim.lsp.buf.references()', opts) + vim.api.nvim_buf_set_keymap(bufnr, 'n', 'ca', 'lua vim.lsp.buf.code_action()', opts) + vim.api.nvim_buf_set_keymap(bufnr, 'n', 'so', [[lua require('telescope.builtin').lsp_document_symbols()]], opts) + vim.cmd [[ command! Format execute 'lua vim.lsp.buf.formatting()' ]] +end + +-- nvim-cmp supports additional completion capabilities +local capabilities = vim.lsp.protocol.make_client_capabilities() +capabilities = require('cmp_nvim_lsp').update_capabilities(capabilities) + +-- Enable the following language servers +local servers = { 'gopls', 'julials', 'rust_analyzer', 'pyright', 'elixirls' } +for _, lsp in ipairs(servers) do + lspconfig[lsp].setup { + on_attach = on_attach, + capabilities = capabilities, + } +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({ + tools = { + inlay_hints = { + parameter_hints_prefix = "← ", + other_hints_prefix = "➜ ", + } } - --]] }) vim.g.symbols_outline = { @@ -123,12 +173,12 @@ vim.g.symbols_outline = { width = 25, } -vim.cmd([[ - augroup - autocmd! - autocmd BufWritePre *.go lua vim.lsp.buf.formatting_sync(nil, 100) - autocmd BufWritePre *.rs lua vim.lsp.buf.formatting_sync(nil, 100) - autocmd BufWritePre *.ex,*.exs lua vim.lsp.buf.formatting_sync(nil, 100) - autocmd BufWritePre *.py lua vim.lsp.buf.formatting_sync(nil, 100) - augroup END -]]) +--vim.cmd([[ + --augroup + --autocmd! + --autocmd BufWritePre *.go lua vim.lsp.buf.formatting_sync(nil, 100) + --autocmd BufWritePre *.rs lua vim.lsp.buf.formatting_sync(nil, 100) + --autocmd BufWritePre *.ex,*.exs lua vim.lsp.buf.formatting_sync(nil, 100) + --autocmd BufWritePre *.py lua vim.lsp.buf.formatting_sync(nil, 100) + --augroup END +--]]) diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua index 8b37ab0..c9e3729 100644 --- a/.config/nvim/lua/plugins.lua +++ b/.config/nvim/lua/plugins.lua @@ -46,6 +46,11 @@ return require("packer").startup( -- Goodies use {'tpope/vim-fugitive'} use {'tpope/vim-surround'} -- ✅ + use {'tpope/vim-dispatch'} + + -- Testing + use {'vim-test/vim-test'} + -- Treesitter use {"nvim-treesitter/nvim-treesitter", run = ":TSUpdate"} @@ -81,9 +86,12 @@ return require("packer").startup( use {'hrsh7th/nvim-cmp'} use {'tzachar/cmp-tabnine', run = './install.sh'} use {'onsails/lspkind-nvim'} -- Display symbol with cmp suggestions + use {'L3MON4D3/LuaSnip'} + use {'saadparwaiz1/cmp_luasnip'} use {'tami5/lspsaga.nvim'} + -- Used to display LSP status in Lualine use {'nvim-lua/lsp-status.nvim'} --use {'simrat39/symbols-outline.nvim'} @@ -102,6 +110,7 @@ return require("packer").startup( use {'neoclide/jsonc.vim'} use {'rust-lang/rust.vim'} + use {'simrat39/rust-tools.nvim'} -- Debugger support via dap use { "rcarriga/nvim-dap-ui", requires = {"mfussenegger/nvim-dap"} } @@ -123,3 +132,4 @@ return require("packer").startup( require_plugin('julia-vim') end ) + diff --git a/.config/nvim/lua/plugins/cmp.lua b/.config/nvim/lua/plugins/cmp.lua index 51c7a9a..0b44861 100644 --- a/.config/nvim/lua/plugins/cmp.lua +++ b/.config/nvim/lua/plugins/cmp.lua @@ -1,5 +1,6 @@ local cmp = require'cmp' local lspkind = require('lspkind') +local luasnip = require 'luasnip' local source_mapping = { buffer = "[Buffer]", @@ -19,18 +20,50 @@ cmp.setup({ -- -- require'snippy'.expand_snippet(args.body) -- For `snippy` users. -- end, -- }, + --mapping = { + --[''] = cmp.mapping(cmp.mapping.scroll_docs(-4), { 'i', 'c' }), + --[''] = cmp.mapping(cmp.mapping.scroll_docs(4), { 'i', 'c' }), + --[''] = cmp.mapping(cmp.mapping.complete(), { 'i', 'c' }), + --[''] = cmp.mapping.confirm({ select = true }), + --}, + snippet = { + expand = function(args) + require'luasnip'.lsp_expand(args.body) + end, + }, mapping = { - [''] = cmp.mapping(cmp.mapping.scroll_docs(-4), { 'i', 'c' }), - [''] = cmp.mapping(cmp.mapping.scroll_docs(4), { 'i', 'c' }), - [''] = cmp.mapping(cmp.mapping.complete(), { 'i', 'c' }), - [''] = cmp.mapping.confirm({ select = true }), + [''] = cmp.mapping.select_prev_item(), + [''] = cmp.mapping.select_next_item(), + [''] = cmp.mapping.scroll_docs(-4), + [''] = cmp.mapping.scroll_docs(4), + [''] = cmp.mapping.complete(), + [''] = cmp.mapping.close(), + [''] = cmp.mapping.confirm { + behavior = cmp.ConfirmBehavior.Replace, + select = true, + }, + [''] = function(fallback) + if cmp.visible() then + cmp.select_next_item() + elseif luasnip.expand_or_jumpable() then + luasnip.expand_or_jump() + else + fallback() + end + end, + [''] = 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({ - { name = 'cmp_tabnine' }, - { name = 'nvim_lsp' }, - }, - { - { name = 'buffer' }, + { name = 'cmp_tabnine' }, + { name = 'nvim_lsp' }, }), formatting = { format = function(entry, vim_item) @@ -74,7 +107,7 @@ tabnine:setup({ snippet_placeholder = '..'; ignored_file_types = { -- default is not to ignore -- uncomment to ignore in lua: - -- lua = true + lua = true }; }) diff --git a/.config/nvim/lua/plugins/lualine.lua b/.config/nvim/lua/plugins/lualine.lua index 3a8601a..5becaf3 100644 --- a/.config/nvim/lua/plugins/lualine.lua +++ b/.config/nvim/lua/plugins/lualine.lua @@ -1,7 +1,7 @@ require'lualine'.setup { options = { icons_enabled = true, - theme = 'dracula', + theme = 'auto', --component_separators = {'', ''}, --section_separators = {'', ''}, disabled_filetypes = {} @@ -9,7 +9,7 @@ require'lualine'.setup { sections = { lualine_a = {'mode'}, lualine_b = {'branch'}, - lualine_c = {'filename', require'lsp-status'.status}, + lualine_c = { 'filename', 'data', "require'lsp-status'.status()" }, lualine_x = {'filetype'}, lualine_y = {'progress'}, lualine_z = {'location'} diff --git a/.config/nvim/lua/plugins/sneak.lua b/.config/nvim/lua/plugins/sneak.lua index 1a2bdf6..d1faae8 100644 --- a/.config/nvim/lua/plugins/sneak.lua +++ b/.config/nvim/lua/plugins/sneak.lua @@ -2,4 +2,7 @@ vim.cmd([[ let g:sneak#label = 1 let g:sneak#prompt = '🔎' let g:sneak#s_next = 1 + + let test#strategy = "neovim" + let test#neovim#term_position = "vert rightbelow 50" ]]) diff --git a/.config/nvim/lua/plugins/telescope.lua b/.config/nvim/lua/plugins/telescope.lua index 3f42119..6712045 100644 --- a/.config/nvim/lua/plugins/telescope.lua +++ b/.config/nvim/lua/plugins/telescope.lua @@ -19,7 +19,7 @@ require('telescope').setup { file_ignore_patterns = {}, generic_sorter = require'telescope.sorters'.get_generic_fuzzy_sorter, shorten_path = true, - winblend = 0, + winblend = 0, width = 0.75, preview_cutoff = 120, results_height = 1, @@ -32,7 +32,7 @@ require('telescope').setup { file_previewer = require'telescope.previewers'.vim_buffer_cat.new, grep_previewer = require'telescope.previewers'.vim_buffer_vimgrep.new, qflist_previewer = require'telescope.previewers'.vim_buffer_qflist.new, - + layout_strategy = "horizontal", -- Developer configurations: Not meant for general override buffer_previewer_maker = require'telescope.previewers'.buffer_previewer_maker, mappings = { diff --git a/.config/nvim/plugin/packer_compiled.lua b/.config/nvim/plugin/packer_compiled.lua index 335c1b1..426446c 100644 --- a/.config/nvim/plugin/packer_compiled.lua +++ b/.config/nvim/plugin/packer_compiled.lua @@ -44,8 +44,8 @@ local function save_profiles(threshold) end time([[Luarocks path setup]], true) -local package_path_str = "/Users/fbecker18/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?.lua;/Users/fbecker18/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?/init.lua;/Users/fbecker18/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?.lua;/Users/fbecker18/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?/init.lua" -local install_cpath_pattern = "/Users/fbecker18/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/lua/5.1/?.so" +local package_path_str = "/Users/halfdan/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?.lua;/Users/halfdan/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?/init.lua;/Users/halfdan/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?.lua;/Users/halfdan/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?/init.lua" +local install_cpath_pattern = "/Users/halfdan/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/lua/5.1/?.so" if not string.find(package.path, package_path_str, 1, true) then package.path = package.path .. ';' .. package_path_str end @@ -71,223 +71,238 @@ time([[Defining packer_plugins]], true) _G.packer_plugins = { ["JuliaFormatter.vim"] = { loaded = true, - path = "/Users/fbecker18/.local/share/nvim/site/pack/packer/start/JuliaFormatter.vim", + path = "/Users/halfdan/.local/share/nvim/site/pack/packer/start/JuliaFormatter.vim", url = "https://github.com/kdheepak/JuliaFormatter.vim" }, + LuaSnip = { + loaded = true, + path = "/Users/halfdan/.local/share/nvim/site/pack/packer/start/LuaSnip", + url = "https://github.com/L3MON4D3/LuaSnip" + }, ["cmp-buffer"] = { loaded = true, - path = "/Users/fbecker18/.local/share/nvim/site/pack/packer/start/cmp-buffer", + path = "/Users/halfdan/.local/share/nvim/site/pack/packer/start/cmp-buffer", url = "https://github.com/hrsh7th/cmp-buffer" }, ["cmp-cmdline"] = { loaded = true, - path = "/Users/fbecker18/.local/share/nvim/site/pack/packer/start/cmp-cmdline", + path = "/Users/halfdan/.local/share/nvim/site/pack/packer/start/cmp-cmdline", url = "https://github.com/hrsh7th/cmp-cmdline" }, ["cmp-nvim-lsp"] = { loaded = true, - path = "/Users/fbecker18/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp", + path = "/Users/halfdan/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp", url = "https://github.com/hrsh7th/cmp-nvim-lsp" }, ["cmp-path"] = { loaded = true, - path = "/Users/fbecker18/.local/share/nvim/site/pack/packer/start/cmp-path", + path = "/Users/halfdan/.local/share/nvim/site/pack/packer/start/cmp-path", url = "https://github.com/hrsh7th/cmp-path" }, ["cmp-tabnine"] = { loaded = true, - path = "/Users/fbecker18/.local/share/nvim/site/pack/packer/start/cmp-tabnine", + path = "/Users/halfdan/.local/share/nvim/site/pack/packer/start/cmp-tabnine", url = "https://github.com/tzachar/cmp-tabnine" }, + cmp_luasnip = { + loaded = true, + path = "/Users/halfdan/.local/share/nvim/site/pack/packer/start/cmp_luasnip", + url = "https://github.com/saadparwaiz1/cmp_luasnip" + }, ["darcula-solid.nvim"] = { loaded = true, - path = "/Users/fbecker18/.local/share/nvim/site/pack/packer/start/darcula-solid.nvim", + path = "/Users/halfdan/.local/share/nvim/site/pack/packer/start/darcula-solid.nvim", url = "https://github.com/briones-gabriel/darcula-solid.nvim" }, dracula = { loaded = true, - path = "/Users/fbecker18/.local/share/nvim/site/pack/packer/start/dracula", + path = "/Users/halfdan/.local/share/nvim/site/pack/packer/start/dracula", url = "https://github.com/dracula/vim" }, ["editorconfig-vim"] = { loaded = true, - path = "/Users/fbecker18/.local/share/nvim/site/pack/packer/start/editorconfig-vim", + path = "/Users/halfdan/.local/share/nvim/site/pack/packer/start/editorconfig-vim", url = "https://github.com/editorconfig/editorconfig-vim" }, everforest = { loaded = true, - path = "/Users/fbecker18/.local/share/nvim/site/pack/packer/start/everforest", + path = "/Users/halfdan/.local/share/nvim/site/pack/packer/start/everforest", url = "https://github.com/sainnhe/everforest" }, ["git-worktree.nvim"] = { loaded = true, - path = "/Users/fbecker18/.local/share/nvim/site/pack/packer/start/git-worktree.nvim", + path = "/Users/halfdan/.local/share/nvim/site/pack/packer/start/git-worktree.nvim", url = "https://github.com/theprimeagen/git-worktree.nvim" }, ["jsonc.vim"] = { loaded = true, - path = "/Users/fbecker18/.local/share/nvim/site/pack/packer/start/jsonc.vim", + path = "/Users/halfdan/.local/share/nvim/site/pack/packer/start/jsonc.vim", url = "https://github.com/neoclide/jsonc.vim" }, ["julia-vim"] = { loaded = false, needs_bufread = true, - path = "/Users/fbecker18/.local/share/nvim/site/pack/packer/opt/julia-vim", + path = "/Users/halfdan/.local/share/nvim/site/pack/packer/opt/julia-vim", url = "https://github.com/JuliaEditorSupport/julia-vim" }, ["lsp-status.nvim"] = { loaded = true, - path = "/Users/fbecker18/.local/share/nvim/site/pack/packer/start/lsp-status.nvim", + path = "/Users/halfdan/.local/share/nvim/site/pack/packer/start/lsp-status.nvim", url = "https://github.com/nvim-lua/lsp-status.nvim" }, ["lspkind-nvim"] = { loaded = true, - path = "/Users/fbecker18/.local/share/nvim/site/pack/packer/start/lspkind-nvim", + path = "/Users/halfdan/.local/share/nvim/site/pack/packer/start/lspkind-nvim", url = "https://github.com/onsails/lspkind-nvim" }, ["lspsaga.nvim"] = { loaded = true, - path = "/Users/fbecker18/.local/share/nvim/site/pack/packer/start/lspsaga.nvim", + path = "/Users/halfdan/.local/share/nvim/site/pack/packer/start/lspsaga.nvim", url = "https://github.com/tami5/lspsaga.nvim" }, ["lualine.nvim"] = { loaded = true, - path = "/Users/fbecker18/.local/share/nvim/site/pack/packer/start/lualine.nvim", + path = "/Users/halfdan/.local/share/nvim/site/pack/packer/start/lualine.nvim", url = "https://github.com/nvim-lualine/lualine.nvim" }, ["lush.nvim"] = { loaded = true, - path = "/Users/fbecker18/.local/share/nvim/site/pack/packer/start/lush.nvim", + path = "/Users/halfdan/.local/share/nvim/site/pack/packer/start/lush.nvim", url = "https://github.com/rktjmp/lush.nvim" }, moonlight = { loaded = true, - path = "/Users/fbecker18/.local/share/nvim/site/pack/packer/start/moonlight", + path = "/Users/halfdan/.local/share/nvim/site/pack/packer/start/moonlight", url = "https://github.com/shaunsingh/moonlight.nvim" }, nerdcommenter = { loaded = true, - path = "/Users/fbecker18/.local/share/nvim/site/pack/packer/start/nerdcommenter", + path = "/Users/halfdan/.local/share/nvim/site/pack/packer/start/nerdcommenter", url = "https://github.com/preservim/nerdcommenter" }, ["nord-vim"] = { loaded = true, - path = "/Users/fbecker18/.local/share/nvim/site/pack/packer/start/nord-vim", + path = "/Users/halfdan/.local/share/nvim/site/pack/packer/start/nord-vim", url = "https://github.com/arcticicestudio/nord-vim" }, ["nvim-cmp"] = { loaded = true, - path = "/Users/fbecker18/.local/share/nvim/site/pack/packer/start/nvim-cmp", + path = "/Users/halfdan/.local/share/nvim/site/pack/packer/start/nvim-cmp", url = "https://github.com/hrsh7th/nvim-cmp" }, ["nvim-dap"] = { loaded = true, - path = "/Users/fbecker18/.local/share/nvim/site/pack/packer/start/nvim-dap", + path = "/Users/halfdan/.local/share/nvim/site/pack/packer/start/nvim-dap", url = "https://github.com/mfussenegger/nvim-dap" }, ["nvim-dap-ui"] = { loaded = true, - path = "/Users/fbecker18/.local/share/nvim/site/pack/packer/start/nvim-dap-ui", + path = "/Users/halfdan/.local/share/nvim/site/pack/packer/start/nvim-dap-ui", url = "https://github.com/rcarriga/nvim-dap-ui" }, ["nvim-lsp-installer"] = { loaded = true, - path = "/Users/fbecker18/.local/share/nvim/site/pack/packer/start/nvim-lsp-installer", + path = "/Users/halfdan/.local/share/nvim/site/pack/packer/start/nvim-lsp-installer", url = "https://github.com/williamboman/nvim-lsp-installer" }, ["nvim-lspconfig"] = { loaded = true, - path = "/Users/fbecker18/.local/share/nvim/site/pack/packer/start/nvim-lspconfig", + path = "/Users/halfdan/.local/share/nvim/site/pack/packer/start/nvim-lspconfig", url = "https://github.com/neovim/nvim-lspconfig" }, ["nvim-treesitter"] = { loaded = true, - path = "/Users/fbecker18/.local/share/nvim/site/pack/packer/start/nvim-treesitter", + path = "/Users/halfdan/.local/share/nvim/site/pack/packer/start/nvim-treesitter", url = "https://github.com/nvim-treesitter/nvim-treesitter" }, ["nvim-web-devicons"] = { loaded = true, - path = "/Users/fbecker18/.local/share/nvim/site/pack/packer/start/nvim-web-devicons", + path = "/Users/halfdan/.local/share/nvim/site/pack/packer/start/nvim-web-devicons", url = "https://github.com/kyazdani42/nvim-web-devicons" }, ["onedark.vim"] = { loaded = true, - path = "/Users/fbecker18/.local/share/nvim/site/pack/packer/start/onedark.vim", + path = "/Users/halfdan/.local/share/nvim/site/pack/packer/start/onedark.vim", url = "https://github.com/joshdick/onedark.vim" }, ["packer.nvim"] = { loaded = true, - path = "/Users/fbecker18/.local/share/nvim/site/pack/packer/start/packer.nvim", + path = "/Users/halfdan/.local/share/nvim/site/pack/packer/start/packer.nvim", url = "https://github.com/wbthomason/packer.nvim" }, ["plenary.nvim"] = { loaded = true, - path = "/Users/fbecker18/.local/share/nvim/site/pack/packer/start/plenary.nvim", + path = "/Users/halfdan/.local/share/nvim/site/pack/packer/start/plenary.nvim", url = "https://github.com/nvim-lua/plenary.nvim" }, ["popup.nvim"] = { loaded = true, - path = "/Users/fbecker18/.local/share/nvim/site/pack/packer/start/popup.nvim", + path = "/Users/halfdan/.local/share/nvim/site/pack/packer/start/popup.nvim", url = "https://github.com/nvim-lua/popup.nvim" }, + ["rust-tools.nvim"] = { + loaded = true, + path = "/Users/halfdan/.local/share/nvim/site/pack/packer/start/rust-tools.nvim", + url = "https://github.com/simrat39/rust-tools.nvim" + }, ["rust.vim"] = { loaded = true, - path = "/Users/fbecker18/.local/share/nvim/site/pack/packer/start/rust.vim", + path = "/Users/halfdan/.local/share/nvim/site/pack/packer/start/rust.vim", url = "https://github.com/rust-lang/rust.vim" }, ["symbols-outline.nvim"] = { loaded = true, - path = "/Users/fbecker18/.local/share/nvim/site/pack/packer/start/symbols-outline.nvim", - url = "https://github.com/simrat39/symbols-outline.nvim" + path = "/Users/halfdan/.local/share/nvim/site/pack/packer/start/symbols-outline.nvim", + url = "https://github.com/marcuscaisey/symbols-outline.nvim" }, tagbar = { loaded = true, - path = "/Users/fbecker18/.local/share/nvim/site/pack/packer/start/tagbar", + path = "/Users/halfdan/.local/share/nvim/site/pack/packer/start/tagbar", url = "https://github.com/preservim/tagbar" }, ["telescope-fzy-native.nvim"] = { loaded = true, - path = "/Users/fbecker18/.local/share/nvim/site/pack/packer/start/telescope-fzy-native.nvim", + path = "/Users/halfdan/.local/share/nvim/site/pack/packer/start/telescope-fzy-native.nvim", url = "https://github.com/nvim-telescope/telescope-fzy-native.nvim" }, ["telescope-project.nvim"] = { loaded = true, - path = "/Users/fbecker18/.local/share/nvim/site/pack/packer/start/telescope-project.nvim", + path = "/Users/halfdan/.local/share/nvim/site/pack/packer/start/telescope-project.nvim", url = "https://github.com/nvim-telescope/telescope-project.nvim" }, ["telescope.nvim"] = { loaded = true, - path = "/Users/fbecker18/.local/share/nvim/site/pack/packer/start/telescope.nvim", + path = "/Users/halfdan/.local/share/nvim/site/pack/packer/start/telescope.nvim", url = "https://github.com/nvim-telescope/telescope.nvim" }, ["vim-easy-align"] = { loaded = true, - path = "/Users/fbecker18/.local/share/nvim/site/pack/packer/start/vim-easy-align", + path = "/Users/halfdan/.local/share/nvim/site/pack/packer/start/vim-easy-align", url = "https://github.com/junegunn/vim-easy-align" }, ["vim-fugitive"] = { loaded = true, - path = "/Users/fbecker18/.local/share/nvim/site/pack/packer/start/vim-fugitive", + path = "/Users/halfdan/.local/share/nvim/site/pack/packer/start/vim-fugitive", url = "https://github.com/tpope/vim-fugitive" }, ["vim-gitgutter"] = { loaded = true, - path = "/Users/fbecker18/.local/share/nvim/site/pack/packer/start/vim-gitgutter", + path = "/Users/halfdan/.local/share/nvim/site/pack/packer/start/vim-gitgutter", url = "https://github.com/airblade/vim-gitgutter" }, ["vim-highlightedyank"] = { loaded = true, - path = "/Users/fbecker18/.local/share/nvim/site/pack/packer/start/vim-highlightedyank", + path = "/Users/halfdan/.local/share/nvim/site/pack/packer/start/vim-highlightedyank", url = "https://github.com/machakann/vim-highlightedyank" }, ["vim-sneak"] = { loaded = true, - path = "/Users/fbecker18/.local/share/nvim/site/pack/packer/start/vim-sneak", + path = "/Users/halfdan/.local/share/nvim/site/pack/packer/start/vim-sneak", url = "https://github.com/justinmk/vim-sneak" }, ["vim-surround"] = { loaded = true, - path = "/Users/fbecker18/.local/share/nvim/site/pack/packer/start/vim-surround", + path = "/Users/halfdan/.local/share/nvim/site/pack/packer/start/vim-surround", url = "https://github.com/tpope/vim-surround" } } diff --git a/.tmux.conf b/.tmux.conf index 06ca571..52b79dc 100644 --- a/.tmux.conf +++ b/.tmux.conf @@ -64,10 +64,10 @@ bind -n WheelUpPane if-shell -F -t = "#{mouse_any_flag}" "send-keys -M" "if -Ft= # Enables italics in tmux #set -g default-terminal "tmux-256color" -set -g default-terminal "tmux-256color" +set -g default-terminal "xterm-256color" # Terminal type configuration -set -ga terminal-overrides ",tmux-256color:RGB" +set -ga terminal-overrides ",xterm-256color:RGB" # Start window numbering at specific num set -g base-index 1