From 5d458bf9a4773ac77b38883b8d7736497b8251e3 Mon Sep 17 00:00:00 2001
From: Alec Goncharow <algo@cloudflare.com>
Date: Wed, 10 Jan 2024 13:05:50 -0500
Subject: yaks cannot be stopped

---
 .config/alacritty/alacritty.toml  |  2 +-
 .config/nvim/lua/autocomplete.lua |  4 ++--
 .config/nvim/lua/fzf.lua          |  2 ++
 .config/nvim/lua/ls.lua           |  2 +-
 .config/nvim/lua/lspsaga_conf.lua | 40 +++++++++++++++++++++++++++++++++++++++
 .config/nvim/lua/powerline.lua    | 10 +++++-----
 6 files changed, 51 insertions(+), 9 deletions(-)

diff --git a/.config/alacritty/alacritty.toml b/.config/alacritty/alacritty.toml
index 9b1683f..14a9578 100644
--- a/.config/alacritty/alacritty.toml
+++ b/.config/alacritty/alacritty.toml
@@ -1,5 +1,5 @@
 [font]
-size = 11.25
+size = 12
 
 [font.bold]
 family = "FiraMono"
diff --git a/.config/nvim/lua/autocomplete.lua b/.config/nvim/lua/autocomplete.lua
index 62cee98..eef1625 100644
--- a/.config/nvim/lua/autocomplete.lua
+++ b/.config/nvim/lua/autocomplete.lua
@@ -18,8 +18,8 @@ cmp.setup({
     ghost_text = true,
   },
   window = {
-    completion = cmp.config.window.bordered(),
-    documentation = cmp.config.window.bordered(),
+    completion = cmp.config.window.bordered({border = 'none'}),
+    documentation = cmp.config.window.bordered({border = 'none'}),
   },
   mapping = cmp.mapping.preset.insert({
     ['<C-b>'] = cmp.mapping.scroll_docs(-4),
diff --git a/.config/nvim/lua/fzf.lua b/.config/nvim/lua/fzf.lua
index aa016a1..7d2c50c 100644
--- a/.config/nvim/lua/fzf.lua
+++ b/.config/nvim/lua/fzf.lua
@@ -4,3 +4,5 @@ vim.keymap.set('n', '<leader>fg', fzf.live_grep, {})
 vim.keymap.set('n', '<leader>fw', fzf.grep_cword, {})
 vim.keymap.set('n', '<leader>fW', fzf.grep_cWORD, {})
 vim.keymap.set('v', '<leader>ff', fzf.grep_visual, {})
+
+vim.keymap.set('n', '<c-f>', fzf.grep_curbuf, {})
diff --git a/.config/nvim/lua/ls.lua b/.config/nvim/lua/ls.lua
index 5484611..7a93ec4 100644
--- a/.config/nvim/lua/ls.lua
+++ b/.config/nvim/lua/ls.lua
@@ -66,4 +66,4 @@ require 'jabs'.setup {
 }
 
 
-Nmap('<c-f>', ':JABSOpen<CR>')
+Nmap('<c-b>', ':JABSOpen<CR>')
diff --git a/.config/nvim/lua/lspsaga_conf.lua b/.config/nvim/lua/lspsaga_conf.lua
index dabd040..fccbda8 100644
--- a/.config/nvim/lua/lspsaga_conf.lua
+++ b/.config/nvim/lua/lspsaga_conf.lua
@@ -1,6 +1,9 @@
 vim.g.matchup_matchparen_offscreen = { method = {} }
 
 require('lspsaga').setup({
+  ui = {
+    border = 'none',
+  },
   outline = {
     win_position = 'right',
     auto_preview = true,
@@ -14,6 +17,43 @@ require('lspsaga').setup({
       jump = 'e',
     },
   },
+  diagnostic = {
+    show_code_action = true,
+    show_layout = 'float',
+    show_normal_height = 10,
+    jump_num_shortcut = true,
+    max_width = 0.8,
+    max_height = 0.6,
+    max_show_width = 0.9,
+    max_show_height = 0.6,
+    text_hl_follow = true,
+    border_follow = true,
+    wrap_long_lines = true,
+    extend_relatedInformation = false,
+    diagnostic_only_current = false,
+    keys = {
+      exec_action = 'o',
+      quit = 'q',
+      toggle_or_jump = '<CR>',
+      quit_in_show = { 'q', '<ESC>' },
+    },
+  },
+  code_action = {
+    num_shortcut = true,
+    show_server_name = false,
+    extend_gitsigns = true,
+    only_in_cursor = false,
+    max_height = 0.3,
+    keys = {
+      quit = { 'q', '<ESC>' },
+      exec = '<CR>',
+    },
+  },
 })
 
 Nmap('<c-d>', ':Lspsaga outline<CR>')
+Nmap('<c-e>', ':Lspsaga show_buf_diagnostics<CR>')
+Nmap('<c-a>', ':Lspsaga code_action<CR>')
+
+
+Nmap('t', ':Lspsaga term_toggle<CR>')
diff --git a/.config/nvim/lua/powerline.lua b/.config/nvim/lua/powerline.lua
index f7394e2..9c29b12 100644
--- a/.config/nvim/lua/powerline.lua
+++ b/.config/nvim/lua/powerline.lua
@@ -1,9 +1,9 @@
 require('lualine').setup {
   options = {
     icons_enabled = true,
-    theme = 'gruvbox_dark',
-    component_separators = { left = '', right = '' },
-    section_separators = { left = '', right = '' },
+    theme = 'everforest',
+    component_separators = { left = '', right = '' },
+    section_separators = { left = '', right = '' },
     disabled_filetypes = {
       statusline = {},
       winbar = {},
@@ -19,9 +19,9 @@ require('lualine').setup {
   },
   sections = {
     lualine_a = { 'mode' },
-    lualine_b = { 'branch', 'diff', 'diagnostics' },
+    lualine_b = { 'branch', 'diff' },
     lualine_c = { { 'filename', path = 1 } },
-    lualine_x = { 'encoding', 'fileformat', 'filetype' },
+    lualine_x = { 'diagnostics', 'encoding', 'fileformat', 'filetype' },
     lualine_y = { 'progress' },
     lualine_z = { 'location' }
   },
-- 
cgit v1.2.3-70-g09d2