aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlec Goncharow <alec@goncharow.dev>2025-02-09 10:54:12 -0500
committerAlec Goncharow <alec@goncharow.dev>2025-05-28 16:27:41 -0400
commitb00e962b7b96e758081c619be3173e5f45284762 (patch)
treeac9885584d52d160d23d2e378f5a3290a06c1a4e
parentb675386b09ac63564557703f13e817790a8dbee1 (diff)
many things.
-rw-r--r--.config/nvim/lua/fzf.lua2
-rw-r--r--.config/nvim/lua/lsp.lua28
-rw-r--r--.config/nvim/lua/plugins.lua27
-rw-r--r--.config/sway/config4
4 files changed, 59 insertions, 2 deletions
diff --git a/.config/nvim/lua/fzf.lua b/.config/nvim/lua/fzf.lua
index 3dd5645..21341f1 100644
--- a/.config/nvim/lua/fzf.lua
+++ b/.config/nvim/lua/fzf.lua
@@ -1,6 +1,6 @@
local fzf = require('fzf-lua')
vim.keymap.set('n', '<c-b>', fzf.buffers, {})
-vim.keymap.set('n', '<c-t>', fzf.marks, {})
+vim.keymap.set('n', '<c-m>', fzf.marks, {})
vim.keymap.set('n', '<leader>fb', fzf.lines, {})
vim.keymap.set('n', '<leader>ff', fzf.files, {})
vim.keymap.set('n', '<leader>fg', fzf.live_grep, {})
diff --git a/.config/nvim/lua/lsp.lua b/.config/nvim/lua/lsp.lua
index 47677bc..9ba3926 100644
--- a/.config/nvim/lua/lsp.lua
+++ b/.config/nvim/lua/lsp.lua
@@ -188,6 +188,34 @@ if not configs.jails then
end
lspconfig.jails.setup({})
vim.filetype.add({ extension = { jai = "jai", } })
+-- local lsp = require 'lspconfig'
+-- local configs = require 'lspconfig.configs'
+
+-- if not configs.jai_lsp then
+-- configs.jai_lsp = {
+-- default_config = {
+-- cmd = { 'jails' },
+-- filetypes = { 'jai' },
+-- }
+-- }
+-- end
+
+-- lspconfig.jai_lsp.setup({
+-- on_attach = on_attach,
+-- capabilities = capabilities,
+-- })
+
+lspconfig.ols.setup({
+ on_attach = on_attach,
+ capabilities = capabilities,
+ init_options = {
+ enable_references = true,
+ enable_rename = true,
+ enable_semantic_tokens = true,
+ enable_checker_only_saved = true,
+ enable_inlay_hints = true,
+ }
+})
vim.api.nvim_create_autocmd('BufWritePre', {
pattern = '*.go',
diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua
index 45d7988..f1ce125 100644
--- a/.config/nvim/lua/plugins.lua
+++ b/.config/nvim/lua/plugins.lua
@@ -154,5 +154,32 @@ return require('lazy').setup({
vim.g.lsp_zero_extend_cmp = 0
vim.g.lsp_zero_extend_lspconfig = 0
end,
+ "folke/todo-comments.nvim",
+ dependencies = { "nvim-lua/plenary.nvim" },
+ opts = {
+ keywords = {
+ FIX = {
+ icon = " ", -- icon used for the sign, and in search results
+ color = "error", -- can be a hex color, or a named color (see below)
+ alt = { "FIXME", "BUG", "FIXIT", "ISSUE" }, -- a set of other keywords that all map to this FIX keywords
+ -- signs = false, -- configure signs for some keywords individually
+ },
+ TODO = { icon = " ", color = "info", alt = { "nocheckin" } },
+ HACK = { icon = " ", color = "warning" },
+ WARN = { icon = " ", color = "warning", alt = { "WARNING", "XXX" } },
+ PERF = { icon = " ", alt = { "OPTIM", "PERFORMANCE", "OPTIMIZE" } },
+ NOTE = { icon = " ", color = "hint", alt = { "INFO" } },
+ TEST = { icon = "⏲ ", color = "test", alt = { "TESTING", "PASSED", "FAILED" } },
+ },
+ }
+ },
+
+ -- movement
+ 'ggandor/leap.nvim',
+ {
+ "chentoast/marks.nvim",
+ event = "VeryLazy",
+ opts = {
+ },
},
})
diff --git a/.config/sway/config b/.config/sway/config
index ebd4196..17e8290 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -287,7 +287,9 @@ output eDP-2 {
scale 1.25
}
output eDP-1 {
- position 4000,640
+ # position 4000,640
+ #position 3840,0
+ position 0,0
scale 1.25
}