From 16234cf74ac878d07cde2a88baf79d1c17f18fec Mon Sep 17 00:00:00 2001
From: Alec Goncharow <alec@goncharow.dev>
Date: Thu, 14 Dec 2023 18:06:22 -0500
Subject: sync

---
 .config/alacritty/alacritty.yml |  6 +++---
 .config/nvim/init.lua           |  1 +
 .config/nvim/lua/fzf.lua        |  7 +++++++
 .config/nvim/lua/lsp.lua        |  2 ++
 .config/nvim/lua/mappings.lua   | 20 +++++++++-----------
 .config/nvim/lua/plugins.lua    | 10 ++++++++++
 .config/sway/config             |  3 +++
 7 files changed, 35 insertions(+), 14 deletions(-)
 create mode 100644 .config/nvim/lua/fzf.lua

(limited to '.config')

diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml
index 81943a4..8efac3f 100644
--- a/.config/alacritty/alacritty.yml
+++ b/.config/alacritty/alacritty.yml
@@ -4,19 +4,19 @@ font:
   size: 12
   # The normal (roman) font face to use.
   normal:
-    family: JetBrainsMono Nerd Font
+    family: JetBrainsMono NFP
     # Style can be specified to pick a specific face.
     style: Regular
 
   # The bold font face
   bold:
-    family: JetBrainsMono Nerd Font
+    family: JetBrainsMono NFP
     # Style can be specified to pick a specific face.
     # style: Bold
 
   # The italic font face
   italic:
-    family: JetBrainsMono Nerd Font
+    family: JetBrainsMono NFP
     #  ()
     # Style can be specified to pick a specific face.
     # style: Italic
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index 898674a..d1440f9 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -1,6 +1,7 @@
 require('plugins')
 require('settings')
 require('mappings')
+require('fzf')
 require('lsp')
 require('treesitter')
 require('highlighting')
diff --git a/.config/nvim/lua/fzf.lua b/.config/nvim/lua/fzf.lua
new file mode 100644
index 0000000..fcde341
--- /dev/null
+++ b/.config/nvim/lua/fzf.lua
@@ -0,0 +1,7 @@
+
+local fzf = require('fzf-lua')
+vim.keymap.set('n', '<leader>ff', fzf.files, {})
+vim.keymap.set('n', '<leader>fg', fzf.live_grep, {})
+vim.keymap.set('n', '<leader>fw', fzf.grep_cword, {})
+
+
diff --git a/.config/nvim/lua/lsp.lua b/.config/nvim/lua/lsp.lua
index a24173f..1cbfb5e 100644
--- a/.config/nvim/lua/lsp.lua
+++ b/.config/nvim/lua/lsp.lua
@@ -31,8 +31,10 @@ local on_attach = function(client, bufnr)
   vim.keymap.set('n', '<space>D', vim.lsp.buf.type_definition, bufopts)
   vim.keymap.set('n', '<space>rn', vim.lsp.buf.rename, bufopts)
   vim.keymap.set('n', '<space>ca', vim.lsp.buf.code_action, bufopts)
+  vim.keymap.set('v', '<space>ca', vim.lsp.buf.code_action, bufopts)
   vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts)
   vim.keymap.set('n', '<space>f', function() vim.lsp.buf.format { async = true } end, bufopts)
+  vim.keymap.set('v', '<space>f', function() vim.lsp.buf.format { async = true } end, bufopts)
 end
 -- Setup buffer-local keymaps / options for LSP buffers
 local capabilities = require("cmp_nvim_lsp").default_capabilities()
diff --git a/.config/nvim/lua/mappings.lua b/.config/nvim/lua/mappings.lua
index 5cf1654..549573a 100644
--- a/.config/nvim/lua/mappings.lua
+++ b/.config/nvim/lua/mappings.lua
@@ -27,14 +27,12 @@ end
 
 
 -- PLUGINS
--- Find files using Telescope command-line sugar.
-nmap("<C-p>", "<cmd>Telescope find_files<cr>")
-nmap("<leader>f", "<cmd>Telescope live_grep<cr>")
-nmap("<leader>bb", "<cmd>Telescope buffers<cr>")
-nmap("<leader>hh", "<cmd>Telescope help_tags<cr>")
-
--- LSP
-nmap('K', '<cmd>Lspsaga hover_doc<cr>')
-imap('<C-k>', '<cmd>Lspsaga hover_doc<cr>')
-nmap('gh', '<cmd>Lspsaga lsp_finder<cr>')
-nmap('<C-e>', '<cmd>Lspsaga show_line_diagnostics<CR>')
+--local builtin = require('telescope.builtin')
+--vim.keymap.set('n', '<leader>ff', builtin.find_files, {})
+--vim.keymap.set('n', '<leader>fg', builtin.live_grep, {})
+--vim.api.nvim_set_keymap( 'n', '<leader>fw', '<cmd>lua require(\'telescope.builtin\').grep_string({search = vim.fn.expand("<cword>")})<cr>', {})
+--vim.keymap.set('n', '<leader>fb', builtin.buffers, {})
+--vim.keymap.set('n', '<leader>fh', builtin.help_tags, {})
+
+
+
diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua
index 0374e22..5a11126 100644
--- a/.config/nvim/lua/plugins.lua
+++ b/.config/nvim/lua/plugins.lua
@@ -79,6 +79,11 @@ return require('packer').startup(function()
   use 'tpope/vim-surround' -- surround characters shortcuts
   use 'tpope/vim-vinegar' -- file browser
   use 'kyazdani42/nvim-web-devicons' -- icons when searching
+  use { "ibhagwan/fzf-lua",
+    -- optional for icon support
+    requires = { "nvim-tree/nvim-web-devicons" }
+  }
+
 
   -- zig
   use 'ziglang/zig.vim'
@@ -97,6 +102,11 @@ return require('packer').startup(function()
   use 'nvim-lua/plenary.nvim'
   use 'mfussenegger/nvim-dap'
 
+  -- jai
+  use 'rluba/jai.vim'
+
+  use 'wsdjeg/vim-fetch'
+
   use { "johmsalas/text-case.nvim",
   config = function()
     require('textcase').setup {}
diff --git a/.config/sway/config b/.config/sway/config
index bed8d92..38fe443 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -222,6 +222,9 @@ gaps outer 0
 
 for_window {
   [class="firefox"] border none
+  [class="firefox"] border none
+  [app_id="firefox"] border none
+  [class="Godot"] floating enable
   [window_role="pop-up"] floating enable
   [window_role="bubble"] floating enable
   [window_role="dialog"] floating enable
-- 
cgit v1.2.3-70-g09d2