dotfiles

commit 1cbff5595bc8f279d1f74a83089333efefabdb51
parent e7ce86b5d610e7b75caed30de5dcfe84de6f6ec0
Author: Michał Sapka <michal@sapka.me>
Date:   Thu,  6 Oct 2022 22:26:12 +0200

fix: make nvim work

Diffstat:
M
nvim/.config/nvim/init.lua
 | 
5
+++++
M
nvim/.config/nvim/lua/user/config.lua
 | 
6
------
M
nvim/.config/nvim/lua/user/lsp/lspsaga.lua
 | 
7
+++++++
M
nvim/.config/nvim/plugin/packer_compiled.lua
 | 
4
++--
M
setup/ubuntu.sh
 | 
3
++-

5 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua
@@ -7,6 +7,11 @@ require "user.cmp"
 require "user.plugins"
 
 -- Style
+local status_ok, _ = pcall(require, "gruvbox")
+if not status_ok then
+  return
+end
+
 vim.cmd('colorscheme gruvbox')
 require('lualine').setup{
   options = { theme = 'gruvbox' }
diff --git a/nvim/.config/nvim/lua/user/config.lua b/nvim/.config/nvim/lua/user/config.lua
@@ -48,12 +48,6 @@ api.nvim_set_keymap("n", "<leader>fb", ":lua require('telescope.builtin').buffer
 api.nvim_set_keymap("n", "<leader>fr", ":lua require('telescope.builtin').resume()<CR>", opts)
 api.nvim_set_keymap("n", "<leader>fp", ":Telescope ghq list<CR>", opts)
 
--- Mappings.
--- See `:help vim.diagnostic.*` for documentation on any of the below functions
-keymap.set('n', '<space>e', vim.diagnostic.open_float, opts)
-keymap.set('n', '[d', vim.diagnostic.goto_prev, opts)
-keymap.set('n', ']d', vim.diagnostic.goto_next, opts)
-keymap.set('n', '<space>q', vim.diagnostic.setloclist, opts)
 
 vim.cmd('hi Normal guibg=NONE ctermbg=NONE')
 
diff --git a/nvim/.config/nvim/lua/user/lsp/lspsaga.lua b/nvim/.config/nvim/lua/user/lsp/lspsaga.lua
@@ -15,3 +15,10 @@ vim.keymap.set('n', 'gp', '<Cmd>Lspsaga preview_definition<CR>', opts)
 vim.keymap.set('n', 'gr', '<Cmd>Lspsaga rename<CR>', opts)
 vim.keymap.set("n", "<leader>ca", "<cmd>Lspsaga code_action<CR>", opts)
 vim.keymap.set("v", "<leader>ca", "<cmd><C-U>saga range_code_action<CR>", opts)
+
+-- Mappings.
+-- See `:help vim.diagnostic.*` for documentation on any of the below functions
+vim.keymap.set('n', '<space>e', vim.diagnostic.open_float, opts)
+vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, opts)
+vim.keymap.set('n', ']d', vim.diagnostic.goto_next, opts)
+vim.keymap.set('n', '<space>q', vim.diagnostic.setloclist, opts)
diff --git a/nvim/.config/nvim/plugin/packer_compiled.lua b/nvim/.config/nvim/plugin/packer_compiled.lua
@@ -115,7 +115,7 @@ _G.packer_plugins = {
     url = "https://github.com/rafamadriz/friendly-snippets"
   },
   ["gitsigns.nvim"] = {
-    config = { "\27LJ\2\n6\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\rgitsigns\frequire\0" },
+    config = { "\27LJ\2\0026\0\0\2\0\3\0\0066\0\0\0'\1\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\rgitsigns\frequire\0" },
     loaded = true,
     path = "/home/msapka/.local/share/nvim/site/pack/packer/start/gitsigns.nvim",
     url = "https://github.com/lewis6991/gitsigns.nvim"
@@ -226,7 +226,7 @@ _G.packer_plugins = {
 time([[Defining packer_plugins]], false)
 -- Config for: gitsigns.nvim
 time([[Config for gitsigns.nvim]], true)
-try_loadstring("\27LJ\2\n6\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\rgitsigns\frequire\0", "config", "gitsigns.nvim")
+try_loadstring("\27LJ\2\0026\0\0\2\0\3\0\0066\0\0\0'\1\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\rgitsigns\frequire\0", "config", "gitsigns.nvim")
 time([[Config for gitsigns.nvim]], false)
 
 _G._packer.inside_compile = false
diff --git a/setup/ubuntu.sh b/setup/ubuntu.sh
@@ -10,6 +10,7 @@ flatpak install \
 	-y
 
 sudo apt-add-repository ppa:fish-shell/release-3
+sudo add-apt-repository ppa:neovim-ppa/stable
 
 sudo apt update && sudo apt upgrade
 sudo apt install \
@@ -23,10 +24,10 @@ sudo apt install \
 	ripgrep \
 	fzf \
 	stow \
-	neovim \
 	exa \
 	starship \
 	tldr \
+  neovim \
 	-y
 
 curl -sS https://starship.rs/install.sh | sh