diff --git a/flake.lock b/flake.lock index ce3daf7..b0a752d 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1735576092, - "narHash": "sha256-fxj82J3BHVaxUG1/umATdyeLq4xiw2DowJo3g3EeYl4=", + "lastModified": 1735757293, + "narHash": "sha256-mbbr7m8kfDF8bG1R8VFooLw6pHzylsCGlE+q35S6lVg=", "owner": "aylur", "repo": "astal", - "rev": "ce9ba0d07b44c52700fef44ea6c9cbad33c3fe44", + "rev": "d6c3c9c179eba0c9536a1beaaeb0525a63e752f3", "type": "github" }, "original": { @@ -92,11 +92,11 @@ ] }, "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "lastModified": 1735774679, + "narHash": "sha256-soePLBazJk0qQdDVhdbM98vYdssfs3WFedcq+raipRI=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "rev": "f2f7418ce0ab4a5309a4596161d154cfc877af66", "type": "github" }, "original": { @@ -190,17 +190,17 @@ "zig": "zig" }, "locked": { - "lastModified": 1735592568, - "narHash": "sha256-fFZMG9CF4BG2dG0RqSqx4FbSX0TrlTmyqxqB8osyPzA=", - "ref": "refs/heads/main", - "rev": "d54817607c63603ac70ca3c3cb141f6d22bb07e0", - "revCount": 8668, - "type": "git", - "url": "ssh://git@github.com/mitchellh/ghostty" + "lastModified": 1735765328, + "narHash": "sha256-f4LI34cXP8nOTi4Va6GPUFaJYf0qGbabk+OeUddsfuk=", + "owner": "mitchellh", + "repo": "ghostty", + "rev": "94599102e9fb8247af08cbbbcb7ee25e3d31e1bd", + "type": "github" }, "original": { - "type": "git", - "url": "ssh://git@github.com/mitchellh/ghostty" + "owner": "mitchellh", + "repo": "ghostty", + "type": "github" } }, "git-hooks": { @@ -261,11 +261,11 @@ ] }, "locked": { - "lastModified": 1733333617, - "narHash": "sha256-nMMQXREGvLOLvUa0ByhYFdaL0Jov0t1wzLbKjr05P2w=", + "lastModified": 1735695978, + "narHash": "sha256-cwk53OX1S1bCFY09zydubZNmmwcx9l5XEba8mVYuNE4=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "56f8ea8d502c87cf62444bec4ee04512e8ea24ea", + "rev": "f6233b5cfbada692d93a73d6ed35bdbfd0fdb9c4", "type": "github" }, "original": { @@ -281,11 +281,11 @@ ] }, "locked": { - "lastModified": 1735381016, - "narHash": "sha256-CyCZFhMUkuYbSD6bxB/r43EdmDE7hYeZZPTCv0GudO4=", + "lastModified": 1735774425, + "narHash": "sha256-C73gLFnEh8ZI0uDijUgCDWCd21T6I6tsaWgIBHcfAXg=", "owner": "nix-community", "repo": "home-manager", - "rev": "10e99c43cdf4a0713b4e81d90691d22c6a58bdf2", + "rev": "5f6aa268e419d053c3d5025da740e390b12ac936", "type": "github" }, "original": { @@ -329,11 +329,11 @@ "lz-nvim": { "flake": false, "locked": { - "lastModified": 1735151625, - "narHash": "sha256-XROyv0DgH+1ZWA7Z+OdNd41ufqtl8PoAfwZtSjPFem0=", + "lastModified": 1735765151, + "narHash": "sha256-4dWyC2CW3DSv31QBVdT5qJUmtBHY/tgN98g3KpA7N+g=", "owner": "zoriya", "repo": "lz.n", - "rev": "e9ee565439706d86b4dd63e20aef1fc231e0570b", + "rev": "bfe810e15a80930630817e62f664466b1eb4e59a", "type": "github" }, "original": { @@ -355,11 +355,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1735517129, - "narHash": "sha256-ibHgAkr8OXAP8MRBo4Z7AIaVdOHywGR2J8R50vZCQjI=", + "lastModified": 1735801710, + "narHash": "sha256-Z6Pl8LWYbPnqSinpSxrylfCpa4XkEVhzpfnfqiD0Kv8=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "fd381a5a19f553c2466dc437fb94fcf799d77e82", + "rev": "57a05ea557689b9d85dd594a9a26778b6842a18a", "type": "github" }, "original": { @@ -371,11 +371,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1735489459, - "narHash": "sha256-PMeWazyxGxpA6UeVrWH/ur8WuqliGxXlRjTTQdMiYVc=", + "lastModified": 1735771362, + "narHash": "sha256-+HxTD7TxeIySWsE++VKDWBMQK5OqTv391wADaZ8UDuo=", "owner": "neovim", "repo": "neovim", - "rev": "e4bc8b5967d22840c1e52c97acab0f77107cd48c", + "rev": "6dc0eb9f41e6453fe003dd3a28c58b701fd003c9", "type": "github" }, "original": { @@ -391,11 +391,11 @@ ] }, "locked": { - "lastModified": 1735478292, - "narHash": "sha256-Ys9pSP9ch0SthhpbjnkCSJ9ZLfaNKnt/dcy7swjmS1A=", + "lastModified": 1735685839, + "narHash": "sha256-62xAPSs5VRZoPH7eRanUn5S5vZEd+8vM4bD5I+zxokc=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "71a3a075e3229a7518d76636bb762aef2bcb73ac", + "rev": "6a1fdb2a1204c0de038847b601cff5012e162b5e", "type": "github" }, "original": { @@ -552,11 +552,11 @@ ] }, "locked": { - "lastModified": 1735135567, - "narHash": "sha256-8T3K5amndEavxnludPyfj3Z1IkcFdRpR23q+T0BVeZE=", + "lastModified": 1735653038, + "narHash": "sha256-Q6xAmciTXDtZfUxf6c15QqtRR8BvX4edYPstF/uoqMk=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "9e09d30a644c57257715902efbb3adc56c79cf28", + "rev": "56c0ecd79f7ba01a0ec027da015df751d6ca3ae7", "type": "github" }, "original": { @@ -588,11 +588,11 @@ ] }, "locked": { - "lastModified": 1735446997, - "narHash": "sha256-Er9Jftp09FPMya0qpb2H+PKBkVgTbGSayNes2sQd9hQ=", + "lastModified": 1735617939, + "narHash": "sha256-5kaPvKkWx5okEePzI3KvDpBYn9CGJ/1QUhIX44R5Ny0=", "owner": "youwen5", "repo": "zen-browser-flake", - "rev": "12bba4871d25e1f51d0ccb1967a49ade45811849", + "rev": "48130c8dd35a0f65c6b2eac5b54889ebf58cb9eb", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 8a6af84..84609eb 100644 --- a/flake.nix +++ b/flake.nix @@ -20,7 +20,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; ghostty = { - url = "git+ssh://git@github.com/mitchellh/ghostty"; + url = "github:mitchellh/ghostty"; inputs.nixpkgs-stable.follows = "nixpkgs"; inputs.nixpkgs-unstable.follows = "nixpkgs"; }; diff --git a/nvim/default.nix b/nvim/default.nix index de448cb..4730a78 100644 --- a/nvim/default.nix +++ b/nvim/default.nix @@ -100,7 +100,7 @@ in mini-icons which-key-nvim nvim-colorizer-lua - nvim-pqf + quicker-nvim lualine-nvim nvim-navic virt-column-nvim diff --git a/nvim/lua/plugins/mini.lua b/nvim/lua/plugins/mini.lua index aed3fbf..3f5f8d3 100644 --- a/nvim/lua/plugins/mini.lua +++ b/nvim/lua/plugins/mini.lua @@ -1,6 +1,7 @@ return { { "mini.icons", + enabled = vim.g.have_nerd_font, after = function() require("mini.icons").setup(); MiniIcons.mock_nvim_web_devicons() diff --git a/nvim/lua/plugins/ui.lua b/nvim/lua/plugins/ui.lua index 7d091e6..d1ef7a5 100644 --- a/nvim/lua/plugins/ui.lua +++ b/nvim/lua/plugins/ui.lua @@ -10,6 +10,9 @@ return { "which-key.nvim", opts = { plugins = { spelling = true }, + icons = { + mappings = vim.g.have_nerd_font, + }, }, after = function(plug) require("which-key").setup(plug.opts) @@ -44,19 +47,29 @@ return { }, { - "nvim-pqf", - after = function() - require("pqf").setup() - vim.api.nvim_create_autocmd("FileType", { - pattern = { "qf" }, - desc = "Set nolist on quickfix", - group = vim.api.nvim_create_augroup("qf-nolist", { clear = true }), - callback = function() - -- or setl nolist - vim.opt_local.list = false - end, - }) - vim.cmd("autocmd FileType qf setl nolist") + "quicker.nvim", + ft = "qf", + opts = { + opts = { + list = false + }, + highlight = { + load_buffers = false, + }, + max_filename_width = function() + return math.floor(math.min(50, vim.o.columns / 2)) + end + }, + after = function(plug) + local signs = vim.diagnostic.config().signs.text + plug.opts.type_icons = { + E = signs[vim.diagnostic.severity.ERROR], + W = signs[vim.diagnostic.severity.WARN], + I = signs[vim.diagnostic.severity.INFO], + N = signs[vim.diagnostic.severity.INFO], + H = signs[vim.diagnostic.severity.HINT], + } + require("quicker").setup(plug.opts) end, }, diff --git a/nvim/lua/settings.lua b/nvim/lua/settings.lua index 028cbd5..891eb48 100644 --- a/nvim/lua/settings.lua +++ b/nvim/lua/settings.lua @@ -97,7 +97,7 @@ end) -- Lsp mapping that should become defaults vim.keymap.set("n", "gd", function() vim.lsp.buf.definition() end, { desc = "Go to definition" }) vim.keymap.set("n", "gD", function() vim.lsp.buf.declaration() end, { desc = "Go to declaration" }) -vim.keymap.set("n", "gs", function() vim.lsp.buf.type_definition() end, { desc = "Go to type definition" }) +vim.keymap.set("n", "grs", function() vim.lsp.buf.type_definition() end, { desc = "Go to type definition" }) vim.api.nvim_create_autocmd("TextYankPost", {