config updates

git/.config/git/config

@@ -26,7 +26,7 @@
 [pull]
     ff = only
 [init]
-    defaultBranch = master
+    defaultBranch = main
 [safe]
     directory = /etc/nixos
 [sendemail]

nvim.lua/.config/nvim/after/ftplugin/rust.lua

@@ -0,0 +1,18 @@
+local bufnr = vim.api.nvim_get_current_buf()
+vim.keymap.set(
+    "n",
+    "<leader>a",
+    function()
+        vim.cmd.RustLsp('codeAction') -- supports rust-analyzer's grouping
+        -- or vim.lsp.buf.codeAction() if you don't want grouping.
+    end,
+    { silent = true, buffer = bufnr }
+)
+vim.keymap.set(
+    "n",
+    "K",  -- Override Neovim's built-in hover keymap with rustaceanvim's hover actions
+    function()
+        vim.cmd.RustLsp({'hover', 'actions'})
+    end,
+    { silent = true, buffer = bufnr }
+)

nvim.lua/.config/nvim/init.lua

@@ -16,7 +16,7 @@ set langmap=ФИСВУАПРШОЛДЬТЩЗЙКЫЕГМЦЧНЯ;ABCDEFGHIJKLMNO
 " Incrementally show effects of :s, :smagic, :snomagic
 set icm=split
 
-set number
+set number relativenumber
 
 set nobackup nowritebackup
 set noswapfile

nvim.lua/.config/nvim/lua/lsp_setup.lua

@@ -71,20 +71,3 @@ for _, serv in ipairs(servers) do
         capabilities = capabilities,
     }
 end
-
--- Rust: using rust tools package
-local rt = require("rust-tools")
-rt.setup({
-    server = {
-        on_attach = on_attach,
-        flags = lsp_flags,
-        capabilities = capabilities,
-        settings = {
-            ["rust-analyzer"] = {
-                cargo = {
-                    allFeatures = true,
-                },
-            },
-        },
-    },
-})

nvim.lua/.config/nvim/lua/lualine_setup.lua

@@ -4,8 +4,8 @@ vim.cmd([[set noshowmode]])
 return require('lualine').setup {
     options = {
         icons_enabled = true,
-        --theme = 'everforest',
-        -- section_separators = '',
-        -- component_seaparators = '',
+        theme = 'everforest',
+        section_separators = '',
+        component_seaparators = '',
     }
 }

nvim.lua/.config/nvim/lua/plugins.lua

@@ -62,16 +62,6 @@ return require('packer').startup(function(use)
         end,
     }
 
-    -- pretty bits
-    -- use {
-    --     '/home/grue/projects/zen-footburn.nvim',
-    --     config = function()
-    --         vim.cmd([[
-    --         set termguicolors
-    --         colorscheme zenburn
-    --         ]])
-    --     end,
-    -- }
     use {
         'sainnhe/everforest',
         config = function()
@@ -82,14 +72,7 @@ return require('packer').startup(function(use)
             ]])
         end,
     }
-    -- use {
-    --     'jeffkreeftmeijer/vim-dim',
-    --     config = function()
-    --         vim.cmd([[
-    --         colorscheme dim
-    --         ]])
-    --     end,
-    -- }
+
     use {
         'johnfrankmorgan/whitespace.nvim',
         config = function ()
@@ -106,17 +89,7 @@ return require('packer').startup(function(use)
         requires = { 'kyazdani42/nvim-web-devicons', opt = true },
         -- after = { 'zen-footburn.nvim' },
         config = function()
-            -- this now handled by the lualine
-            vim.cmd([[set noshowmode]])
-
-            return require('lualine').setup {
-                options = {
-                    icons_enabled = true,
-                    theme = 'auto',
-                    -- section_separators = '',
-                    -- component_seaparators = '',
-                }
-            }
+            require('lualine_setup')
         end,
     }
 
@@ -132,24 +105,30 @@ return require('packer').startup(function(use)
 
     -- Nifty stuff
     use 'tpope/vim-surround'
-    -- use 'airblade/vim-rooter'
+    -- use {
+    --     'ibhagwan/fzf-lua',
+    --     config = setup_fzf(),
+    -- }
     use {
-        'nvim-telescope/telescope.nvim',
-        branch = '0.1.x',
+        'nvim-telescope/telescope.nvim', tag = '0.1.8',
         requires = { {'nvim-lua/plenary.nvim'} },
         config = function()
-            require('telescope').setup{
-                pickers = {
-                    find_files = {
-                        theme = "dropdown",
-                    }
-                }
-            }
+            local actions = require("telescope.actions")
+            require("telescope").setup({
+                defaults = {
+                    mappings = {
+                        i = {
+                            ["<esc>"] = actions.close,
+                        },
+                    },
+                },
+            })
             local builtin = require('telescope.builtin')
-            vim.keymap.set('n', '<leader>ff', builtin.find_files, {})
-            vim.keymap.set('n', '<leader>fg', builtin.live_grep, {})
-            vim.keymap.set('n', '<leader>b', builtin.buffers, {})
-            vim.keymap.set('n', '<leader>fh', builtin.help_tags, {})
+            vim.keymap.set('n', '<leader>fg', builtin.live_grep, { desc = 'Telescope live grep' })
+            vim.keymap.set('n', '<leader>ff', builtin.find_files, { desc = 'Telescope find files' })
+            vim.keymap.set('n', '<leader>fG', builtin.git_files, { desc = 'Telescope find git ls-files' })
+            vim.keymap.set('n', '<leader>fb', builtin.buffers, { desc = 'Telescope buffers' })
+            vim.keymap.set('n', '<leader>fh', builtin.help_tags, { desc = 'Telescope help tags' })
         end,
     }
 
@@ -194,10 +173,10 @@ return require('packer').startup(function(use)
     use {
         'neovim/nvim-lspconfig',
         after = { 'nvim-cmp' },
-        requires = { 'simrat39/rust-tools.nvim' },
         config = function()
-            require'lsp_setup'
+            require'lsp_setup';
         end,
+        requires = { 'mrcjkb/rustaceanvim' },
     }
 
     use {