From 618a1e6841f8330bc9b1021d17d3ad3ec011e1b0 Mon Sep 17 00:00:00 2001 From: mokou Date: Sun, 13 Mar 2022 23:07:52 +0100 Subject: [PATCH] augh --- .chezmoiignore | 1 + dot_config/fish/executable_config.fish | 1 + dot_config/foot/foot.ini | 65 ++++++-------- dot_config/nvim/init.lua | 4 + dot_config/nvim/lua/plugins.lua | 15 ++++ dot_config/nvim/lua/plugins/completion.lua | 37 ++++++++ dot_config/nvim/lua/plugins/lsp.lua | 7 +- dot_config/nvim/plugin/packer_compiled.lua | 98 ---------------------- 8 files changed, 87 insertions(+), 141 deletions(-) create mode 100644 dot_config/nvim/lua/plugins/completion.lua delete mode 100644 dot_config/nvim/plugin/packer_compiled.lua diff --git a/.chezmoiignore b/.chezmoiignore index 25abe00..208cea6 100644 --- a/.chezmoiignore +++ b/.chezmoiignore @@ -1,2 +1,3 @@ LICENSE cool_cli_tools.md +packer_compiled.lua diff --git a/dot_config/fish/executable_config.fish b/dot_config/fish/executable_config.fish index c187c56..b7a5883 100644 --- a/dot_config/fish/executable_config.fish +++ b/dot_config/fish/executable_config.fish @@ -127,6 +127,7 @@ end if command --search nvim > /dev/null do alias vim "nvim" + set -x EDITOR "nvim" end # Some neat GPG shorthands diff --git a/dot_config/foot/foot.ini b/dot_config/foot/foot.ini index 7884ec2..bcfd8c7 100644 --- a/dot_config/foot/foot.ini +++ b/dot_config/foot/foot.ini @@ -8,8 +8,8 @@ # title=foot # locked-title=no -font=curie:pixelsize=12 -font-bold=curie:style=bold:pixelsize=12 +font=UW Ttyp0:pixelsize=16 +font-bold=UW Ttyp0:pixelsize=16:style=Bold # font-italic= # font-bold-italic= # line-height= @@ -63,47 +63,30 @@ pad=15x7 # optionally append 'center' # hide-when-typing=no # alternate-scroll-mode=yes +# Base16 Eighties - foot color config +# Chris Kempson (http://chriskempson.com) [colors] -# alpha=1.0 -# foreground=dcdccc -# background=111111 +foreground=d3d0c8 +background=2d2d2d +regular0=2d2d2d # black +regular1=f2777a # red +regular2=99cc99 # green +regular3=ffcc66 # yellow +regular4=6699cc # blue +regular5=cc99cc # magenta +regular6=66cccc # cyan +regular7=d3d0c8 # white +bright0=747369 # bright black +bright1=f99157 # bright red +bright2=393939 # bright green +bright3=515151 # bright yellow +bright4=a09f93 # bright blue +bright5=e8e6df # bright magenta +bright6=d27b53 # bright cyan +bright7=f2f0ec # bright white -## Normal/regular colors (color palette 0-7) -# regular0=222222 # black -# regular1=cc9393 # red -# regular2=7f9f7f # green -# regular3=d0bf8f # yellow -# regular4=6ca0a3 # blue -# regular5=dc8cc3 # magenta -# regular6=93e0e3 # cyan -# regular7=dcdccc # white - -## Bright colors (color palette 8-15) -# bright0=666666 # bright black -# bright1=dca3a3 # bright red -# bright2=bfebbf # bright green -# bright3=f0dfaf # bright yellow -# bright4=8cd0d3 # bright blue -# bright5=fcace3 # bright magenta -# bright6=b3ffff # bright cyan -# bright7=ffffff # bright white - -## dimmed colors (see foot.ini(5) man page) -# dim0= -# ... -# dim7= - -## The remaining 256-color palette -# 16 = <256-color palette #16> -# ... -# 255 = <256-color palette #255> - -## Misc colors -# selection-foreground= -# selection-background= -# jump-labels= -# urls= -# scrollback-indicator= +[cursor] +color=2d2d2d d3d0c8 [csd] # preferred=server diff --git a/dot_config/nvim/init.lua b/dot_config/nvim/init.lua index 2ac0267..147d5d8 100644 --- a/dot_config/nvim/init.lua +++ b/dot_config/nvim/init.lua @@ -3,3 +3,7 @@ require("options") require("utils") require("plugins") + +-- Initialize all of the boring plugins +require("rust-tools").setup({}) +require("fidget").setup({}) diff --git a/dot_config/nvim/lua/plugins.lua b/dot_config/nvim/lua/plugins.lua index d4ab62b..7e8ef0d 100644 --- a/dot_config/nvim/lua/plugins.lua +++ b/dot_config/nvim/lua/plugins.lua @@ -19,4 +19,19 @@ return require("packer").startup(function(use) -- LSP stuff use({"neovim/nvim-lspconfig", config = function() require("plugins.lsp") end}) + use "simrat39/rust-tools.nvim" + use "stevearc/aerial.nvim" + use "j-hui/fidget.nvim" + + -- Completion + use "hrsh7th/cmp-nvim-lsp" + use "hrsh7th/cmp-buffer" + use "hrsh7th/cmp-path" + use "hrsh7th/cmp-cmdline" + use({"hrsh7th/nvim-cmp", config = function() require("plugins.completion") end}) + + -- Fancy UI stuff + use "RRethy/nvim-base16" + use "stevearc/dressing.nvim" end) + diff --git a/dot_config/nvim/lua/plugins/completion.lua b/dot_config/nvim/lua/plugins/completion.lua new file mode 100644 index 0000000..93688fb --- /dev/null +++ b/dot_config/nvim/lua/plugins/completion.lua @@ -0,0 +1,37 @@ +local cmp = require("cmp") + +cmp.setup({ + 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.config.disable, -- Specify `cmp.config.disable` if you want to remove the default `` mapping. + [''] = cmp.mapping({ + i = cmp.mapping.abort(), + c = cmp.mapping.close(), + }), + [''] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items. + }, + sources = cmp.config.sources({ + {name = "nvim_lsp"}, + }, { + {name = "buffer"}, + }), +}) + +cmp.setup.cmdline(":", { + sources = cmp.config.sources({ + {name = "path"}, + }, { + {name = "buffer"}, + }), +}) + +-- Setup lspconfig. +local capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp.protocol.make_client_capabilities()) +local lsps = {"sumneko_lua", "rust_analyzer"} +for _, lsp in pairs(lsps) do + require('lspconfig')[lsp].setup { + capabilities = capabilities + } +end diff --git a/dot_config/nvim/lua/plugins/lsp.lua b/dot_config/nvim/lua/plugins/lsp.lua index 02d53ab..ad5370f 100644 --- a/dot_config/nvim/lua/plugins/lsp.lua +++ b/dot_config/nvim/lua/plugins/lsp.lua @@ -9,7 +9,7 @@ Utils.nmap("]d", "lua vim.diagnostic.goto_next()") Utils.nmap("q", "lua vim.diagnostic.setloclist()") -- Set the following keybinds only after LSP attachment -local on_attach = function(_, bufnr) +local on_attach = function(client, bufnr) -- Enable completion triggered by vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc') @@ -28,10 +28,12 @@ local on_attach = function(_, bufnr) vim.api.nvim_buf_set_keymap(bufnr, 'n', 'ca', 'lua vim.lsp.buf.code_action()', opts) vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gr', 'lua vim.lsp.buf.references()', opts) vim.api.nvim_buf_set_keymap(bufnr, 'n', 'f', 'lua vim.lsp.buf.formatting()', opts) + + require("aerial").on_attach(client, bufnr) end -- Initialize servers that don't need any extra config -local simple_servers = {"rust_analyzer"} +local simple_servers = {} for _, lsp in pairs(simple_servers) do require("lspconfig")[lsp].setup { on_attach = on_attach, @@ -47,6 +49,7 @@ table.insert(runtime_path, "lua/?.lua") table.insert(runtime_path, "lua/?/init.lua") require("lspconfig").sumneko_lua.setup { + on_attach = on_attach, settings = { Lua = { runtime = { diff --git a/dot_config/nvim/plugin/packer_compiled.lua b/dot_config/nvim/plugin/packer_compiled.lua deleted file mode 100644 index 7e9aefa..0000000 --- a/dot_config/nvim/plugin/packer_compiled.lua +++ /dev/null @@ -1,98 +0,0 @@ --- Automatically generated packer.nvim plugin loader code - -if vim.api.nvim_call_function('has', {'nvim-0.5'}) ~= 1 then - vim.api.nvim_command('echohl WarningMsg | echom "Invalid Neovim version for packer.nvim! | echohl None"') - return -end - -vim.api.nvim_command('packadd packer.nvim') - -local no_errors, error_msg = pcall(function() - - local time - local profile_info - local should_profile = false - if should_profile then - local hrtime = vim.loop.hrtime - profile_info = {} - time = function(chunk, start) - if start then - profile_info[chunk] = hrtime() - else - profile_info[chunk] = (hrtime() - profile_info[chunk]) / 1e6 - end - end - else - time = function(chunk, start) end - end - -local function save_profiles(threshold) - local sorted_times = {} - for chunk_name, time_taken in pairs(profile_info) do - sorted_times[#sorted_times + 1] = {chunk_name, time_taken} - end - table.sort(sorted_times, function(a, b) return a[2] > b[2] end) - local results = {} - for i, elem in ipairs(sorted_times) do - if not threshold or threshold and elem[2] > threshold then - results[i] = elem[1] .. ' took ' .. elem[2] .. 'ms' - end - end - - _G._packer = _G._packer or {} - _G._packer.profile_output = results -end - -time([[Luarocks path setup]], true) -local package_path_str = "/home/lu/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?.lua;/home/lu/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?/init.lua;/home/lu/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?.lua;/home/lu/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?/init.lua" -local install_cpath_pattern = "/home/lu/.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 - -if not string.find(package.cpath, install_cpath_pattern, 1, true) then - package.cpath = package.cpath .. ';' .. install_cpath_pattern -end - -time([[Luarocks path setup]], false) -time([[try_loadstring definition]], true) -local function try_loadstring(s, component, name) - local success, result = pcall(loadstring(s), name, _G.packer_plugins[name]) - if not success then - vim.schedule(function() - vim.api.nvim_notify('packer.nvim: Error running ' .. component .. ' for ' .. name .. ': ' .. result, vim.log.levels.ERROR, {}) - end) - end - return result -end - -time([[try_loadstring definition]], false) -time([[Defining packer_plugins]], true) -_G.packer_plugins = { - ["nvim-lspconfig"] = { - config = { "\27LJ\2\n+\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\16plugins.lsp\frequire\0" }, - loaded = true, - path = "/home/lu/.local/share/nvim/site/pack/packer/start/nvim-lspconfig", - url = "https://github.com/neovim/nvim-lspconfig" - }, - ["packer.nvim"] = { - loaded = false, - needs_bufread = false, - path = "/home/lu/.local/share/nvim/site/pack/packer/opt/packer.nvim", - url = "https://github.com/wbthomason/packer.nvim" - } -} - -time([[Defining packer_plugins]], false) --- Config for: nvim-lspconfig -time([[Config for nvim-lspconfig]], true) -try_loadstring("\27LJ\2\n+\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\16plugins.lsp\frequire\0", "config", "nvim-lspconfig") -time([[Config for nvim-lspconfig]], false) -if should_profile then save_profiles() end - -end) - -if not no_errors then - error_msg = error_msg:gsub('"', '\\"') - vim.api.nvim_command('echohl ErrorMsg | echom "Error in packer_compiled: '..error_msg..'" | echom "Please check your config for correctness" | echohl None') -end