More

home-manager/home.nix

@@ -149,10 +149,9 @@
     enable = true;
     plugins = [
       {
-        plugin = nixpkgs.vimPlugins.molokai;
-        config = ''
-          colorscheme molokai
-        '';
+        plugin = nixpkgs.vimPlugins.tokyonight-nvim;
+        config = builtins.readFile ./nvim/tokyonight.lua;
+        type = "lua";
       }
       {
         plugin = nixpkgs.vimPlugins.nvim-treesitter.withAllGrammars;

home-manager/nvim/init.vim

@@ -1,5 +1,4 @@
 set nu
-colorscheme molokai
 
 set mouse=
 

home-manager/nvim/lspconfig.lua

@@ -21,3 +21,41 @@ require('lspconfig').nil_ls.setup (coq.lsp_ensure_capabilities({
         },
     },
 }))
+
+-- Global mappings.
+-- See `:help vim.diagnostic.*` for documentation on any of the below functions
+vim.keymap.set('n', '<space>e', vim.diagnostic.open_float)
+vim.keymap.set('n', '[d', vim.diagnostic.goto_prev)
+vim.keymap.set('n', ']d', vim.diagnostic.goto_next)
+vim.keymap.set('n', '<space>q', vim.diagnostic.setloclist)
+
+-- Use LspAttach autocommand to only map the following keys
+-- after the language server attaches to the current buffer
+vim.api.nvim_create_autocmd('LspAttach', {
+  group = vim.api.nvim_create_augroup('UserLspConfig', {}),
+  callback = function(ev)
+    -- Enable completion triggered by <c-x><c-o>
+    vim.bo[ev.buf].omnifunc = 'v:lua.vim.lsp.omnifunc'
+
+    -- Buffer local mappings.
+    -- See `:help vim.lsp.*` for documentation on any of the below functions
+    local opts = { buffer = ev.buf }
+    vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, opts)
+    vim.keymap.set('n', 'gd', vim.lsp.buf.definition, opts)
+    vim.keymap.set('n', 'K', vim.lsp.buf.hover, opts)
+    vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, opts)
+    vim.keymap.set('n', '<C-k>', vim.lsp.buf.signature_help, opts)
+    vim.keymap.set('n', '<space>wa', vim.lsp.buf.add_workspace_folder, opts)
+    vim.keymap.set('n', '<space>wr', vim.lsp.buf.remove_workspace_folder, opts)
+    vim.keymap.set('n', '<space>wl', function()
+      print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
+    end, opts)
+    vim.keymap.set('n', '<space>D', vim.lsp.buf.type_definition, opts)
+    vim.keymap.set('n', '<space>rn', vim.lsp.buf.rename, opts)
+    vim.keymap.set({ 'n', 'v' }, '<space>ca', vim.lsp.buf.code_action, opts)
+    vim.keymap.set('n', 'gr', vim.lsp.buf.references, opts)
+    vim.keymap.set('n', '<space>f', function()
+      vim.lsp.buf.format { async = true }
+    end, opts)
+  end,
+})

home-manager/nvim/tokyonight.lua

@@ -0,0 +1,5 @@
+require("tokyonight").setup({
+    style = "night",
+})
+
+vim.cmd[[colorscheme tokyonight]]