From b423014b0e51a8324e7ff0fb925d7e7c4000cd45 Mon Sep 17 00:00:00 2001 From: yuzu-eva Date: Mon, 30 Oct 2023 14:11:13 +0100 Subject: update for new system --- .config/nvim/init.lua | 1 + .config/nvim/lua/user/keymaps.lua | 8 +++++ .config/nvim/lua/user/options.lua | 49 +++++++++++++-------------- .config/nvim/lua/user/plugins.lua | 1 - .config/nvim/lua/user/plugins/lspconfig.lua | 51 +++++++++++------------------ .config/nvim/plugin/packer_compiled.lua | 41 ++++++++++------------- 6 files changed, 72 insertions(+), 79 deletions(-) (limited to '.config/nvim') diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index f71bdb7..49556fb 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -10,5 +10,6 @@ require('user.options') require('user.plugins') require('user.keymaps') require('user.misc') +-- require('user.dvorak') --vim: nospell diff --git a/.config/nvim/lua/user/keymaps.lua b/.config/nvim/lua/user/keymaps.lua index b174f65..777d099 100644 --- a/.config/nvim/lua/user/keymaps.lua +++ b/.config/nvim/lua/user/keymaps.lua @@ -2,6 +2,7 @@ local keymap = require 'lib.utils'.keymap vim.g.mapleader = ' ' vim.g.maplocalleader = ' ' +vim.g.tmux_navigator_no_mappings=1 keymap('n', 'Q', ':bufdo bdelete') @@ -23,3 +24,10 @@ keymap('i', 'jj', '') keymap('n', 'cd', ':cd %:p:h:pwd') keymap('n', 'E', ':EslintFixAll') + +-- Change tmux-navigator keybinds +keymap('n', '', ':TmuxNavigateLeft') +keymap('n', '', ':TmuxNavigateDown') +keymap('n', '', ':TmuxNavigateUp') +keymap('n', '', ':TmuxNavigateRight') +keymap('n', '', ':TmuxNavigatePrevious') diff --git a/.config/nvim/lua/user/options.lua b/.config/nvim/lua/user/options.lua index 53fbe43..510485f 100644 --- a/.config/nvim/lua/user/options.lua +++ b/.config/nvim/lua/user/options.lua @@ -1,24 +1,25 @@ -vim.o.guicursor = 'a:block' -vim.o.expandtab = true -vim.o.shiftwidth = 4 -vim.o.tabstop = 4 -vim.o.signcolumn = 'yes:2' -vim.o.relativenumber = true -vim.o.number = true -vim.o.termguicolors = true -vim.o.ignorecase = true -vim.o.smartcase = true -vim.o.wildmode = 'longest:full,full' -vim.o.wrap = false -vim.o.scrolloff = 8 -vim.o.sidescrolloff = 8 -vim.o.cursorline = 1 -vim.o.splitright = 1 -vim.o.splitbelow = 1 -vim.o.clipboard = 'unnamedplus' -- Use Linux system clipboard -vim.o.updatetime = 250 -- Decrease CursorHold delay -vim.o.redrawtime = 10000 -- Allow more time for loading syntax -vim.o.foldmethod = "expr" -vim.o.foldlevelstart = 10 -vim.o.foldexpr = "nvim_treesitter#foldexpr()" -vim.o.hlsearch = 0 +vim.o.guicursor='a:block' +vim.o.expandtab=true +vim.o.shiftwidth=4 +vim.o.softtabstop=4 +vim.o.tabstop=4 +vim.o.signcolumn='yes:2' +vim.o.relativenumber=true +vim.o.number=true +vim.o.termguicolors=true +vim.o.ignorecase=true +vim.o.smartcase=true +vim.o.wildmode='longest:full,full' +vim.o.wrap=false +vim.o.scrolloff=8 +vim.o.sidescrolloff=8 +vim.o.cursorline=true +vim.o.splitright=true +vim.o.splitbelow=true +vim.o.clipboard='unnamedplus' +vim.o.updatetime=250 +vim.o.redrawtime=10000 +vim.o.foldmethod="expr" +vim.o.foldlevelstart=10 +vim.o.foldexpr="nvim_treesitter#foldexpr()" +vim.o.hlsearch=false diff --git a/.config/nvim/lua/user/plugins.lua b/.config/nvim/lua/user/plugins.lua index 07f8f42..ae21e4f 100644 --- a/.config/nvim/lua/user/plugins.lua +++ b/.config/nvim/lua/user/plugins.lua @@ -3,7 +3,6 @@ require('packer').startup(function() use { 'tpope/vim-commentary' } use { 'tpope/vim-surround' } use { 'tpope/vim-eunuch' } - use { 'tpope/vim-sleuth' } use { 'christoomey/vim-tmux-navigator' } use { diff --git a/.config/nvim/lua/user/plugins/lspconfig.lua b/.config/nvim/lua/user/plugins/lspconfig.lua index 39f27c3..67d82a7 100644 --- a/.config/nvim/lua/user/plugins/lspconfig.lua +++ b/.config/nvim/lua/user/plugins/lspconfig.lua @@ -59,38 +59,27 @@ require 'lspconfig'.emmet_ls.setup { filetypes = { 'html', 'javascript', 'typescript', 'javascriptreact', 'typescriptreact', 'eruby' } } -local runtime_path = vim.split(package.path, ';') -table.insert(runtime_path, "lua/?.lua") -table.insert(runtime_path, "lua/?/init.lua") -require 'lspconfig'.lua_ls.setup { - on_attach = on_attach, - capabilities = capabilities, - flags = { - debounce_text_changes = 150, - }, - cmd = { "/home/cafebabe/.local/share/lua-language-server/bin/lua-language-server", "-E", "/home/cafebabe/.local/share/lua-language-server/bin/main.lua" }; - settings = { - Lua = { - runtime = { - -- Tell language server which version of lua is used. - version = 'LuaJIT', - -- Setup lua path - path = runtime_path, - }, - diagnostics = { - -- Recognize globals - globals = { 'vim', 'use', 'parse' }, - }, - workspace = { - -- Make server aware of Neovim runtime files - library = vim.api.nvim_get_runtime_file("", true), - }, - -- Do not send telemetry data - telemetry = { - enable = false, - }, +require'lspconfig'.lua_ls.setup { + on_init = function(client) + local path = client.workspace_folders[1].name + if not vim.loop.fs_stat(path..'/.luarc.json') and not vim.loop.fs_stat(path..'/.luarc.jsonc') then + client.config.settings = vim.tbl_deep_extend('force', client.config.settings.Lua, { + runtime = { + -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim) + version = 'LuaJIT' }, - }, + -- Make the server aware of Neovim runtime files + workspace = { + library = { vim.env.VIMRUNTIME } + -- or pull in all of 'runtimepath'. NOTE: this is a lot slower + -- library = vim.api.nvim_get_runtime_file("", true) + } + }) + + client.notify("workspace/didChangeConfiguration", { settings = client.config.settings }) + end + return true + end } require 'lspconfig'.bashls.setup { diff --git a/.config/nvim/plugin/packer_compiled.lua b/.config/nvim/plugin/packer_compiled.lua index d97b824..a009beb 100644 --- a/.config/nvim/plugin/packer_compiled.lua +++ b/.config/nvim/plugin/packer_compiled.lua @@ -49,8 +49,8 @@ local function save_profiles(threshold) end time([[Luarocks path setup]], true) -local package_path_str = "/home/cafebabe/.cache/nvim/packer_hererocks/2.1.1692616192/share/lua/5.1/?.lua;/home/cafebabe/.cache/nvim/packer_hererocks/2.1.1692616192/share/lua/5.1/?/init.lua;/home/cafebabe/.cache/nvim/packer_hererocks/2.1.1692616192/lib/luarocks/rocks-5.1/?.lua;/home/cafebabe/.cache/nvim/packer_hererocks/2.1.1692616192/lib/luarocks/rocks-5.1/?/init.lua" -local install_cpath_pattern = "/home/cafebabe/.cache/nvim/packer_hererocks/2.1.1692616192/lib/lua/5.1/?.so" +local package_path_str = "/home/cafebabe/.cache/nvim/packer_hererocks/2.1.1697887905/share/lua/5.1/?.lua;/home/cafebabe/.cache/nvim/packer_hererocks/2.1.1697887905/share/lua/5.1/?/init.lua;/home/cafebabe/.cache/nvim/packer_hererocks/2.1.1697887905/lib/luarocks/rocks-5.1/?.lua;/home/cafebabe/.cache/nvim/packer_hererocks/2.1.1697887905/lib/luarocks/rocks-5.1/?/init.lua" +local install_cpath_pattern = "/home/cafebabe/.cache/nvim/packer_hererocks/2.1.1697887905/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 @@ -229,11 +229,6 @@ _G.packer_plugins = { path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/vim-eunuch", url = "https://github.com/tpope/vim-eunuch" }, - ["vim-sleuth"] = { - loaded = true, - path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/vim-sleuth", - url = "https://github.com/tpope/vim-sleuth" - }, ["vim-surround"] = { loaded = true, path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/vim-surround", @@ -247,14 +242,18 @@ _G.packer_plugins = { } time([[Defining packer_plugins]], false) --- Config for: nvim-ts-autotag -time([[Config for nvim-ts-autotag]], true) -try_loadstring("\27LJ\2\n=\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\20nvim-ts-autotag\frequire\0", "config", "nvim-ts-autotag") -time([[Config for nvim-ts-autotag]], false) +-- Config for: nvim-autopairs +time([[Config for nvim-autopairs]], true) +try_loadstring("\27LJ\2\n<\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\19nvim-autopairs\frequire\0", "config", "nvim-autopairs") +time([[Config for nvim-autopairs]], false) -- Config for: nvim-lspconfig time([[Config for nvim-lspconfig]], true) try_loadstring("\27LJ\2\n6\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\27user.plugins.lspconfig\frequire\0", "config", "nvim-lspconfig") time([[Config for nvim-lspconfig]], false) +-- Config for: nvim-ts-autotag +time([[Config for nvim-ts-autotag]], true) +try_loadstring("\27LJ\2\n=\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\20nvim-ts-autotag\frequire\0", "config", "nvim-ts-autotag") +time([[Config for nvim-ts-autotag]], false) -- Config for: lualine.nvim time([[Config for lualine.nvim]], true) try_loadstring("\27LJ\2\n4\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\25user.plugins.lualine\frequire\0", "config", "lualine.nvim") @@ -263,26 +262,22 @@ time([[Config for lualine.nvim]], false) time([[Config for nvim-tree.lua]], true) try_loadstring("\27LJ\2\n6\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\27user.plugins.nvim-tree\frequire\0", "config", "nvim-tree.lua") time([[Config for nvim-tree.lua]], false) --- Config for: nvim-treesitter -time([[Config for nvim-treesitter]], true) -try_loadstring("\27LJ\2\n]\0\0\3\0\4\0\t6\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\0016\0\0\0'\2\3\0B\0\2\1K\0\1\0\28user.plugins.treesitter\nsetup\16spellsitter\frequire\0", "config", "nvim-treesitter") -time([[Config for nvim-treesitter]], false) --- Config for: nvim-cmp -time([[Config for nvim-cmp]], true) -try_loadstring("\27LJ\2\n0\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\21user.plugins.cmp\frequire\0", "config", "nvim-cmp") -time([[Config for nvim-cmp]], false) -- Config for: LuaSnip time([[Config for LuaSnip]], true) try_loadstring("\27LJ\2\n4\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\25user.plugins.luasnip\frequire\0", "config", "LuaSnip") time([[Config for LuaSnip]], false) --- Config for: nvim-autopairs -time([[Config for nvim-autopairs]], true) -try_loadstring("\27LJ\2\n<\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\19nvim-autopairs\frequire\0", "config", "nvim-autopairs") -time([[Config for nvim-autopairs]], false) +-- Config for: nvim-treesitter +time([[Config for nvim-treesitter]], true) +try_loadstring("\27LJ\2\n]\0\0\3\0\4\0\t6\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\0016\0\0\0'\2\3\0B\0\2\1K\0\1\0\28user.plugins.treesitter\nsetup\16spellsitter\frequire\0", "config", "nvim-treesitter") +time([[Config for nvim-treesitter]], false) -- Config for: telescope.nvim time([[Config for telescope.nvim]], true) try_loadstring("\27LJ\2\n6\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\27user.plugins.telescope\frequire\0", "config", "telescope.nvim") time([[Config for telescope.nvim]], false) +-- Config for: nvim-cmp +time([[Config for nvim-cmp]], true) +try_loadstring("\27LJ\2\n0\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\21user.plugins.cmp\frequire\0", "config", "nvim-cmp") +time([[Config for nvim-cmp]], false) -- Config for: dracula time([[Config for dracula]], true) try_loadstring("\27LJ\2\n4\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\25user.plugins.dracula\frequire\0", "config", "dracula") -- cgit v1.2.3