From 99c942cc3baadec31be98c76c2e46b839e81b04b Mon Sep 17 00:00:00 2001
From: mokou <mokou@fastmail.com>
Date: Sun, 13 Mar 2022 21:00:12 +0100
Subject: [PATCH] add fundamental nvim and vim configs

---
 dot_config/fish/executable_config.fish     |  4 +
 dot_config/nvim/init.lua                   |  5 ++
 dot_config/nvim/lua/options.lua            | 41 +++++++++
 dot_config/nvim/lua/plugins.lua            | 22 +++++
 dot_config/nvim/lua/plugins/lsp.lua        | 67 +++++++++++++++
 dot_config/nvim/lua/utils.lua              | 12 +++
 dot_config/nvim/plugin/packer_compiled.lua | 98 ++++++++++++++++++++++
 dot_vimrc                                  | 25 ++++++
 8 files changed, 274 insertions(+)
 create mode 100644 dot_config/nvim/init.lua
 create mode 100644 dot_config/nvim/lua/options.lua
 create mode 100644 dot_config/nvim/lua/plugins.lua
 create mode 100644 dot_config/nvim/lua/plugins/lsp.lua
 create mode 100644 dot_config/nvim/lua/utils.lua
 create mode 100644 dot_config/nvim/plugin/packer_compiled.lua
 create mode 100644 dot_vimrc

diff --git a/dot_config/fish/executable_config.fish b/dot_config/fish/executable_config.fish
index c3f3427..c187c56 100644
--- a/dot_config/fish/executable_config.fish
+++ b/dot_config/fish/executable_config.fish
@@ -125,6 +125,10 @@ if command --search exa > /dev/null do
   alias ls "exa"
 end
 
+if command --search nvim > /dev/null do
+  alias vim "nvim"
+end
+
 # Some neat GPG shorthands
 function secret
   set output ~/$argv[1].(date +%s).enc
diff --git a/dot_config/nvim/init.lua b/dot_config/nvim/init.lua
new file mode 100644
index 0000000..2ac0267
--- /dev/null
+++ b/dot_config/nvim/init.lua
@@ -0,0 +1,5 @@
+-- Load all required files
+
+require("options")
+require("utils")
+require("plugins")
diff --git a/dot_config/nvim/lua/options.lua b/dot_config/nvim/lua/options.lua
new file mode 100644
index 0000000..fb32961
--- /dev/null
+++ b/dot_config/nvim/lua/options.lua
@@ -0,0 +1,41 @@
+-- Visual
+vim.o.conceallevel = 0
+vim.o.cmdheight = 1
+vim.o.pumheight = 10
+vim.o.showmode = false
+vim.o.title = true
+vim.o.termguicolors = true
+vim.wo.number = true
+vim.wo.signcolumn = "yes"
+
+-- Behaviour
+vim.o.hlsearch = true
+vim.o.ignorecase = true
+vim.o.smartcase = true
+vim.o.smarttab = true
+vim.o.smartindent = true
+vim.o.expandtab = true
+vim.o.tabstop = 2
+vim.o.softtabstop = 2
+vim.o.shiftwidth = 2
+vim.o.splitbelow = true
+vim.o.splitright = true
+vim.o.scrolloff = 12
+vim.o.sidescrolloff = 8
+vim.o.mouse = "a"
+
+-- Vim specific
+vim.o.hidden = true
+vim.o.fileencoding = "utf-8"
+vim.o.spell = false
+vim.o.completeopt = "menuone,noinsert,noselect"
+vim.o.wildmode = "longest,full"
+vim.o.updatetime = 300
+
+-- Disable inline error messages
+vim.diagnostic.config {
+  virtual_text = false,
+  underline = false,
+  signs = true,
+}
+
diff --git a/dot_config/nvim/lua/plugins.lua b/dot_config/nvim/lua/plugins.lua
new file mode 100644
index 0000000..d4ab62b
--- /dev/null
+++ b/dot_config/nvim/lua/plugins.lua
@@ -0,0 +1,22 @@
+-- Plugin definitions and loading
+local cmd = vim.cmd
+
+-- Rerun packer install when this file changes
+cmd([[
+  augroup packer_user_config
+    autocmd!
+    autocmd BufWritePost plugins.lua source <afile> | PackerCompile
+  augroup end
+]])
+
+-- Load packer
+cmd([[packadd packer.nvim]])
+
+-- Get plugins
+return require("packer").startup(function(use)
+  -- Dogfood packer
+  use({"wbthomason/packer.nvim", opt = true})
+
+  -- LSP stuff
+  use({"neovim/nvim-lspconfig", config = function() require("plugins.lsp") end})
+end)
diff --git a/dot_config/nvim/lua/plugins/lsp.lua b/dot_config/nvim/lua/plugins/lsp.lua
new file mode 100644
index 0000000..02d53ab
--- /dev/null
+++ b/dot_config/nvim/lua/plugins/lsp.lua
@@ -0,0 +1,67 @@
+-- LSP-related configuration
+local Utils = require("utils")
+local opts = {noremap = true, silent = true}
+
+-- Set some useful keybinds
+Utils.nmap("<space>e", "<cmd>lua vim.diagnostic.open_float()<CR>")
+Utils.nmap("[d", "<cmd>lua vim.diagnostic.goto_prev()<CR>")
+Utils.nmap("]d", "<cmd>lua vim.diagnostic.goto_next()<CR>")
+Utils.nmap("<space>q", "<cmd>lua vim.diagnostic.setloclist()<CR>")
+
+-- Set the following keybinds only after LSP attachment
+local on_attach = function(_, bufnr)
+   -- Enable completion triggered by <c-x><c-o>
+  vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
+
+  -- Mappings.
+  -- See `:help vim.lsp.*` for documentation on any of the below functions
+  vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<CR>', opts)
+  vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gd', '<cmd>lua vim.lsp.buf.definition()<CR>', opts)
+  vim.api.nvim_buf_set_keymap(bufnr, 'n', 'K', '<cmd>lua vim.lsp.buf.hover()<CR>', opts)
+  vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<CR>', opts)
+  vim.api.nvim_buf_set_keymap(bufnr, 'n', '<C-k>', '<cmd>lua vim.lsp.buf.signature_help()<CR>', opts)
+  vim.api.nvim_buf_set_keymap(bufnr, 'n', '<space>wa', '<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>', opts)
+  vim.api.nvim_buf_set_keymap(bufnr, 'n', '<space>wr', '<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>', opts)
+  vim.api.nvim_buf_set_keymap(bufnr, 'n', '<space>wl', '<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>', opts)
+  vim.api.nvim_buf_set_keymap(bufnr, 'n', '<space>D', '<cmd>lua vim.lsp.buf.type_definition()<CR>', opts)
+  vim.api.nvim_buf_set_keymap(bufnr, 'n', '<space>rn', '<cmd>lua vim.lsp.buf.rename()<CR>', opts)
+  vim.api.nvim_buf_set_keymap(bufnr, 'n', '<space>ca', '<cmd>lua vim.lsp.buf.code_action()<CR>', opts)
+  vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gr', '<cmd>lua vim.lsp.buf.references()<CR>', opts)
+  vim.api.nvim_buf_set_keymap(bufnr, 'n', '<space>f', '<cmd>lua vim.lsp.buf.formatting()<CR>', opts)
+end
+
+-- Initialize servers that don't need any extra config
+local simple_servers = {"rust_analyzer"}
+for _, lsp in pairs(simple_servers) do
+  require("lspconfig")[lsp].setup {
+    on_attach = on_attach,
+    flags = {
+      debounce_text_changes = 150,
+    }
+  }
+end
+
+-- LSP: Lua (Sumneko)
+local runtime_path = vim.split(package.path, ";")
+table.insert(runtime_path, "lua/?.lua")
+table.insert(runtime_path, "lua/?/init.lua")
+
+require("lspconfig").sumneko_lua.setup {
+  settings = {
+    Lua = {
+      runtime = {
+        version = "LuaJIT",
+        path = runtime_path,
+      },
+      diagnostics = {
+        globals = {"vim"},
+      },
+      workspace = {
+        library = vim.api.nvim_get_runtime_file("", true),
+      },
+      telemetry = {
+        enable = false,
+      },
+    },
+  },
+}
diff --git a/dot_config/nvim/lua/utils.lua b/dot_config/nvim/lua/utils.lua
new file mode 100644
index 0000000..a752943
--- /dev/null
+++ b/dot_config/nvim/lua/utils.lua
@@ -0,0 +1,12 @@
+-- General utilities
+
+local M = {}
+
+function M.map(mode, lhs, rhs)
+  vim.api.nvim_set_keymap(mode, lhs, rhs, {silent = true})
+end
+
+function M.nmap(lhs, rhs) M.map("n", lhs, rhs) end
+function M.xmap(lhs, rhs) M.map("x", lhs, rhs) end
+
+return M
diff --git a/dot_config/nvim/plugin/packer_compiled.lua b/dot_config/nvim/plugin/packer_compiled.lua
new file mode 100644
index 0000000..7e9aefa
--- /dev/null
+++ b/dot_config/nvim/plugin/packer_compiled.lua
@@ -0,0 +1,98 @@
+-- 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
diff --git a/dot_vimrc b/dot_vimrc
new file mode 100644
index 0000000..05a7476
--- /dev/null
+++ b/dot_vimrc
@@ -0,0 +1,25 @@
+syntax enable
+set number	
+set ruler
+set linebreak
+set showbreak=+++ 
+set textwidth=80
+set showmatch
+set visualbell
+ 
+set hlsearch
+set smartcase
+set ignorecase
+set incsearch
+ 
+set autoindent
+set shiftwidth=2
+set smartindent
+set smarttab
+set softtabstop=2
+ 
+set ruler	
+ 
+set undolevels=1000
+set backspace=indent,eol,start	
+