diff --git a/flake.lock b/flake.lock
index 1d1dad0..8f07eb6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -29,11 +29,11 @@
"zig": "zig"
},
"locked": {
- "lastModified": 1730688195,
- "narHash": "sha256-wXK1/gOImxv0vHpUc9qgno1AY8c64j17/UFIiT7zH1g=",
+ "lastModified": 1730776162,
+ "narHash": "sha256-ODmmTWz3jqaPmJ1UiJgHD3oy90BTEd871GZHyT5Xn9M=",
"ref": "refs/heads/main",
- "rev": "737dc0896dc266a98c889e122b5c900636e589c9",
- "revCount": 7874,
+ "rev": "f9199a46118f173ac7a005130f871fdf050f94d1",
+ "revCount": 7881,
"type": "git",
"url": "ssh://git@github.com/ghostty-org/ghostty"
},
@@ -95,11 +95,11 @@
},
"nixpkgs-stable": {
"locked": {
- "lastModified": 1730327045,
- "narHash": "sha256-xKel5kd1AbExymxoIfQ7pgcX6hjw9jCgbiBjiUfSVJ8=",
+ "lastModified": 1730741070,
+ "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "080166c15633801df010977d9d7474b4a6c549d7",
+ "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3",
"type": "github"
},
"original": {
diff --git a/home/common/nvim/default.nix b/home/common/nvim/default.nix
index ac0578f..f8e4cb1 100644
--- a/home/common/nvim/default.nix
+++ b/home/common/nvim/default.nix
@@ -10,8 +10,10 @@
withRuby = false;
extraLuaConfig = lib.fileContents ./init.lua;
+
extraPackages = with pkgs; [
black
+ cue
go
gopls
gotools
diff --git a/home/common/nvim/init.lua b/home/common/nvim/init.lua
index ba179d8..d91ad1f 100644
--- a/home/common/nvim/init.lua
+++ b/home/common/nvim/init.lua
@@ -8,18 +8,32 @@ vim.opt.laststatus = 0
vim.opt.number = true
vim.opt.relativenumber = true
vim.opt.ruler = true
-vim.opt.rulerformat = "" -- FIXME: fancify!
-vim.opt.rulerformat = "%36(%5l,%-6(%c%V%) %t%)%*"
vim.opt.syntax = "on"
vim.opt.termguicolors = true
+-- Ruler
+function GetIndicators()
+ local bufnr = vim.api.nvim_get_current_buf()
+ local counts = vim.diagnostic.count(bufnr)
+ local errors = counts[vim.diagnostic.severity.ERROR] or 0
+ local warnings = counts[vim.diagnostic.severity.WARN] or 0
+ local warn_string = warnings > 0 and "%#DiagnosticWarn# " .. warnings .. " " or " "
+ local error_string = errors > 0 and "%#DiagnosticError# " .. errors .. " " or " "
+ return warn_string .. error_string
+end
+function GetRulerIcon()
+ local icon = vim.bo.modified and "" or ""
+ return "%#CustomRulerSeparator#%#CustomRulerIcon#" .. icon .. " "
+end
+vim.opt.rulerformat = "%40(%=%{%v:lua.GetIndicators()%}%#Label#│ %t %)"
+
-- Search
vim.opt.ignorecase = true
vim.opt.smartcase = true
-- Tab completion
-- vim.opt.wildmode="list:longest,full"
-vim.opt.wildignore="*.swp,*.o,*.so,*.exe,*.dll"
+vim.opt.wildignore = '*.swp,*.o,*.so,*.exe,*.dll'
-- Whitespaces
vim.opt.breakindent = true
@@ -32,14 +46,14 @@ vim.opt.smartindent = true
vim.opt.tabstop = 2
vim.opt.wrap = false
vim.opt.list = true
-vim.opt.listchars="tab:»·,trail:·"
+im.opt.listchars = "tab:»·,trail:·"
-- Folds
vim.opt.foldenable = false
vim.opt.foldtext = "v:lua.vim.treesitter.foldtext()"
vim.opt.foldmethod = "expr"
vim.opt.foldexpr = "nvim_treesitter#foldexpr()"
-
+qqq
--
vim.o.autochdir = true
@@ -61,29 +75,29 @@ vim.o.grepprg = [[rg --glob "!.jj" --glob "!.git" --no-heading --vimgrep --follo
vim.opt.grepformat = vim.opt.grepformat ^ { "%f:%l:%c:%m" }
vim.fn.sign_define(
- "DiagnosticSignError",
- { text = "", hl = "DiagnosticSignError", texthl = "DiagnosticSignError", culhl = "DiagnosticSignErrorLine" }
+ "DiagnosticSignError",
+ { text = "", hl = "DiagnosticSignError", texthl = "DiagnosticSignError", culhl = "DiagnosticSignErrorLine" }
)
vim.fn.sign_define(
- "DiagnosticSignWarn",
- { text = "", hl = "DiagnosticSignWarn", texthl = "DiagnosticSignWarn", culhl = "DiagnosticSignWarnLine" }
+ "DiagnosticSignWarn",
+ { text = "", hl = "DiagnosticSignWarn", texthl = "DiagnosticSignWarn", culhl = "DiagnosticSignWarnLine" }
)
vim.fn.sign_define(
- "DiagnosticSignInfo",
- { text = "", hl = "DiagnosticSignInfo", texthl = "DiagnosticSignInfo", culhl = "DiagnosticSignInfoLine" }
+ "DiagnosticSignInfo",
+ { text = "", hl = "DiagnosticSignInfo", texthl = "DiagnosticSignInfo", culhl = "DiagnosticSignInfoLine" }
)
vim.fn.sign_define(
- "DiagnosticSignHint",
- { text = "", hl = "DiagnosticSignHint", texthl = "DiagnosticSignHint", culhl = "DiagnosticSignHintLine" }
+ "DiagnosticSignHint",
+ { text = "", hl = "DiagnosticSignHint", texthl = "DiagnosticSignHint", culhl = "DiagnosticSignHintLine" }
)
-- Make <Tab> work for snippets
vim.keymap.set({ "i", "s" }, "<Tab>", function()
- if vim.snippet.active({ direction = 1 }) then
- return "<cmd>lua vim.snippet.jump(1)<cr>"
- else
- return "<Tab>"
- end
+ if vim.snippet.active({ direction = 1 }) then
+ return "<cmd>lua vim.snippet.jump(1)<cr>"
+ else
+ return "<Tab>"
+ end
end, { expr = true })
vim.keymap.set({ "n" }, "<c-/>", "gcc", { remap = true })
diff --git a/home/common/nvim/lsp.lua b/home/common/nvim/lsp.lua
index c2ae113..096b556 100644
--- a/home/common/nvim/lsp.lua
+++ b/home/common/nvim/lsp.lua
@@ -35,12 +35,13 @@ vim.api.nvim_create_autocmd("LspAttach", {
vim.keymap.set("n", "<space>r", vim.lsp.buf.rename, opts("Rename Symbol"))
vim.keymap.set({ "n", "v" }, "<space>a", vim.lsp.buf.code_action, opts("Code Action"))
vim.keymap.set("n", "gr", vim.lsp.buf.references, opts("Buffer References"))
- vim.keymap.set("n", "<localleader>f", function()
+ vim.keymap.set("n", "<space>cf", function()
vim.lsp.buf.format({ async = true })
end, opts("Format Buffer"))
end,
})
+local configs = require('lspconfig.configs')
local lspconfig = require("lspconfig")
local capabilities = vim.lsp.protocol.make_client_capabilities()
diff --git a/home/common/nvim/mini.lua b/home/common/nvim/mini.lua
index cba6c4c..960c660 100644
--- a/home/common/nvim/mini.lua
+++ b/home/common/nvim/mini.lua
@@ -9,8 +9,6 @@
require('mini.extra').setup()
require('mini.icons').setup()
require('mini.jump').setup()
- -- require('mini.pairs').setup()
- -- require('mini.statusline').setup()
require('mini.surround').setup()
require('mini.splitjoin').setup()
@@ -54,8 +52,9 @@
MiniPick.registry.files_root = function(local_opts)
local root_patterns = { ".jj", ".git" }
local root_dir = vim.fs.dirname(vim.fs.find(root_patterns, { upward = true })[1])
- local opts = { source = { cwd = root_dir, tool = "rg" } }
+ local opts = { source = { cwd = root_dir, tool = "ripgrep"} }
local_opts.cwd = root_dir
+ local_opts.tool = "rg"
return MiniPick.builtin.files(local_opts, opts)
end
MiniPick.registry.grep_live_root = function(local_opts)