refactor(nix-hm): specify pinentryFlavor for gpg-agent

docs(nvim): update deadline for CI
fix(zathura): make text under selections visible
2024-03-08 13:12:58 -06:00 · 2024-03-07 21:18:12 -06:00 · 2024-03-07 20:40:25 -06:00 · 2024-03-07 15:56:28 -06:00 · 2024-03-07 15:54:48 -06:00 · 2024-03-07 15:52:07 -06:00
8 changed files with 127 additions and 119 deletions
--- a/config/default.nix
+++ b/config/default.nix
@ -1,4 +1,4 @@
-{ self, pkgs, config, inputs, lib, ... }:
+{ pkgs, config, lib, ... }:
 let
  dotsDir = "${config.home.homeDirectory}/.config/home-manager/dots";
  softLinkDots = dir:
@ -11,7 +11,6 @@ let
    })
    # HACK: We don't use the absolute path in readDir to respect pure evaluation in nix flakes.
      (builtins.attrNames (builtins.readDir ../dots/${dir}))));
-  gtkStyle = "gtk2";
  nixGLWrap = pkg:
    pkgs.runCommand "${pkg.name}-nixgl-wrapper" { } ''
      mkdir $out
@ -60,7 +59,6 @@ in {
        fzf
        delta
        eza
-        nixd
        luajit
        ripgrep
        fd
@ -279,11 +277,11 @@ in {
      enable = true;
      enableSshSupport = true;
      enableZshIntegration = true;
+      pinentryFlavor = "gtk2";
      maxCacheTtl = 14400;
      maxCacheTtlSsh = 14400;
      sshKeys = [ "530D3EC95C32AB9EC33714AAF865738D6E77680A" ];
      extraConfig = ''
-        pinentry-program /usr/bin/pinentry-gtk-2
        allow-loopback-pinentry
      '';
    };
--- a/dots/.config/nvim/README.org
+++ b/dots/.config/nvim/README.org
@ -19,5 +19,5 @@ SCHEDULED: <2024-02-23 Fri> DEADLINE: <2024-02-25 Sun>
    requires manual movement of the cursor position 🫤

 * TODO CI Automation
-SCHEDULED: <2024-02-21 Wed> DEADLINE: <2024-02-25 Sun>
+SCHEDULED: <2024-03-04 Mon> DEADLINE: <2024-03-15 Fri>
 - [ ] Configure a pipeline to enforce formatting via Stylua
--- a/dots/.config/nvim/lazy-lock.json
+++ b/dots/.config/nvim/lazy-lock.json
@ -1,17 +1,17 @@
 {
  "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" },
  "FixCursorHold.nvim": { "branch": "master", "commit": "1900f89dc17c603eec29960f57c00bd9ae696495" },
-  "LuaSnip": { "branch": "master", "commit": "f3b3d3446bcbfa62d638b1903ff00a78b2b730a1" },
+  "LuaSnip": { "branch": "master", "commit": "a7a4b4682c4b3e2ba82b82a4e6e5f5a0e79dec32" },
  "actions-preview.nvim": { "branch": "master", "commit": "5c240e6356156b72cfbf7c05feefadae61d7a06f" },
  "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" },
  "bufdelete.nvim": { "branch": "master", "commit": "f6bcea78afb3060b198125256f897040538bcb81" },
-  "ccc.nvim": { "branch": "main", "commit": "0ca30a4fd8429bffb6394f4ee27166fb4ff29fbf" },
+  "ccc.nvim": { "branch": "main", "commit": "2ef48b4c2f19c9516ff9c76c1410d32bcc83ca70" },
  "cmp-async-path": { "branch": "main", "commit": "9d581eec5acf812316913565c135b0d1ee2c9a71" },
  "cmp-calc": { "branch": "main", "commit": "ce91d14d2e7a8b3f6ad86d85e34d41c1ae6268d9" },
  "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" },
  "cmp-cmdline-history": { "branch": "master", "commit": "003573b72d4635ce636234a826fa8c4ba2895ffe" },
  "cmp-conventionalcommits": { "branch": "master", "commit": "a4dfacf0601130b7f8afa7c948d735c27802fb7f" },
-  "cmp-emoji": { "branch": "main", "commit": "19075c36d5820253d32e2478b6aaf3734aeaafa0" },
+  "cmp-emoji": { "branch": "main", "commit": "0acd702358230abeb6576769f7116e766bca28a0" },
  "cmp-fuzzy-buffer": { "branch": "main", "commit": "ada6352bc7e3c32471ab6c08f954001870329de1" },
  "cmp-git": { "branch": "main", "commit": "8d8993680d627c8f13bd85094eba84604107dbdd" },
  "cmp-npm": { "branch": "main", "commit": "2337f109f51a09297596dd6b538b70ccba92b4e4" },
@ -28,9 +28,9 @@
  "formatter.nvim": { "branch": "master", "commit": "cb4778b8432f1ae86dae4634c0b611cb269a4c2f" },
  "friendly-snippets": { "branch": "main", "commit": "dcd4a586439a1c81357d5b9d26319ae218cc9479" },
  "fuzzy.nvim": { "branch": "master", "commit": "67a42ad2fa6d5ff41f0ef3cf69bb247410da5d7a" },
-  "gitlinker.nvim": { "branch": "master", "commit": "6fac13be2eff09b53821bed72638cc1cd9092fb4" },
+  "gitlinker.nvim": { "branch": "master", "commit": "090a1667a573a7e23737ce008ba86b61f2d7ef84" },
  "gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" },
-  "go.nvim": { "branch": "master", "commit": "25d3060f61fba87a81f364b382b0bc1ea47c1fd6" },
+  "go.nvim": { "branch": "master", "commit": "00f154ccd27e4ea497d9f242535f49d34b27aecb" },
  "guihua.lua": { "branch": "master", "commit": "9fb6795474918b492d9ab01b1ebaf85e8bf6fe0b" },
  "gx.nvim": { "branch": "main", "commit": "78070bbd8e7e15a1623cdd6832a9529d2ee63e0c" },
  "headlines.nvim": { "branch": "master", "commit": "618ef1b2502c565c82254ef7d5b04402194d9ce3" },
@ -38,25 +38,25 @@
  "highlight-undo.nvim": { "branch": "main", "commit": "50a6884a8476be04ecce8f1c4ed692c5000ef0a1" },
  "hlargs.nvim": { "branch": "main", "commit": "0f2dbf02ff948e8fc8ebe07b215f3174a12bbe3c" },
  "hop.nvim": { "branch": "master", "commit": "6d853addd6e11df8338b26e869a29b36f2c3e893" },
-  "hurl.nvim": { "branch": "main", "commit": "e3c0fb4ed2a0dcda7508cb22a74aa2fa8d91f5eb" },
+  "hurl.nvim": { "branch": "main", "commit": "b829cda49772f40801c957f5076b8b023cf48073" },
  "hydra.nvim": { "branch": "main", "commit": "1ce9ee35d2b869241091c0c7496c3cf0f3be981e" },
  "inc-rename.nvim": { "branch": "main", "commit": "6f9b5f9cb237e12935144cdc535322b8c93c1b25" },
  "indent-blankline.nvim": { "branch": "master", "commit": "821a7acd88587d966f7e464b0b3031dfe7f5680c" },
  "kanagawa.nvim": { "branch": "master", "commit": "bfa818c7bf6259152f1d89cf9fbfba3554c93695" },
  "keymap-layer.nvim": { "branch": "master", "commit": "e46840f9f377766e856964a49d7f351de3188a38" },
-  "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" },
+  "lazy.nvim": { "branch": "main", "commit": "83493db50a434a4c5c648faf41e2ead80f96e478" },
  "live-command.nvim": { "branch": "main", "commit": "d460067d47948725a6f25b20f31ea8bbfdfe4622" },
  "lsp_lines.nvim": { "branch": "main", "commit": "cf2306dd332e34a3e91075b40bdd4f6db824b2ee" },
  "lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" },
  "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
  "mason-lspconfig.nvim": { "branch": "main", "commit": "21d33d69a81f6351e5a5f49078b2e4f0075c8e73" },
  "mason.nvim": { "branch": "main", "commit": "3b5068f0fc565f337d67a2d315d935f574848ee7" },
-  "mini.nvim": { "branch": "main", "commit": "b7403ad0c2a4dab777244171ca1b7e8c89696584" },
+  "mini.nvim": { "branch": "main", "commit": "70d8a16399ca6df759d20bea302d6dfd710a1df8" },
  "mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" },
-  "neo-tree.nvim": { "branch": "main", "commit": "459c60317cc1d251f6eb3b6f010d015d5d24b806" },
+  "neo-tree.nvim": { "branch": "main", "commit": "bce454018b1570153262eecab8a7546becce2274" },
  "neodev.nvim": { "branch": "main", "commit": "84e0290f5600e8b89c0dfcafc864f45496a53400" },
  "neoformat": { "branch": "master", "commit": "b8e0baf965d2fbb173aabe3d847538744c0e321b" },
-  "neogen": { "branch": "main", "commit": "70127baaff25611deaf1a29d801fc054ad9d2dc1" },
+  "neogen": { "branch": "main", "commit": "b95347a588401a755eadd17482edc1662876bd58" },
  "neogit": { "branch": "nightly", "commit": "6931053af7d5f7e8c1b4e81bd1005b529f00dc42" },
  "neoscroll.nvim": { "branch": "master", "commit": "6e3546751076890304428150e53bd59198a4505d" },
  "neotest": { "branch": "master", "commit": "4440cc2227894c2ae9b0673a30e6cc6f1836e8c2" },
@ -66,61 +66,60 @@
  "nibbler": { "branch": "main", "commit": "8bbdb43f1d5c35b71ca0e9df57e3a77462c8abbf" },
  "no-neck-pain.nvim": { "branch": "main", "commit": "7ab539aaa083e92ef438d4cdc0261d8661916f1d" },
  "noice.nvim": { "branch": "main", "commit": "bf67d70bd7265d075191e7812d8eb42b9791f737" },
-  "nui.nvim": { "branch": "main", "commit": "c3c7fd618dcb5a89e443a2e1033e7d11fdb0596b" },
+  "nui.nvim": { "branch": "main", "commit": "756c59f46057cd2d43619cd3a6d4e01b2aa60295" },
  "nvim-autopairs": { "branch": "master", "commit": "c6139ca0d5ad7af129ea6c89cb4c56093f2c034a" },
  "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" },
  "nvim-cmp-lua-latex-symbols": { "branch": "master", "commit": "89345d6e333c700d13748e8a7ee6fe57279b7f88" },
  "nvim-dap": { "branch": "master", "commit": "fc880e82059eb21c0fa896be60146e5f17680648" },
  "nvim-dap-python": { "branch": "master", "commit": "66560f0ebddf96604f7037e1efad3ba6942761e6" },
  "nvim-dap-ui": { "branch": "master", "commit": "9720eb5fa2f41988e8770f973cd11b76dd568a5d" },
-  "nvim-dap-virtual-text": { "branch": "master", "commit": "d4542ac257d3c7ee4131350db6179ae6340ce40b" },
-  "nvim-fundo": { "branch": "main", "commit": "a793a8246bbf049b156ff18f59da94f3ce876963" },
-  "nvim-highlight-colors": { "branch": "main", "commit": "abff2ecd998de946e091ea7749b613ab6975f6f7" },
+  "nvim-dap-virtual-text": { "branch": "master", "commit": "a5fc69240869c0fee8ff176bc9e4efdf8bdfb596" },
+  "nvim-fundo": { "branch": "main", "commit": "e236d66943349e026c1d42b23cc4fbd9f9c90af3" },
+  "nvim-highlight-colors": { "branch": "main", "commit": "a9f191d5ba27a5943b8992bf618858fa7374758f" },
  "nvim-lastplace": { "branch": "main", "commit": "0bb6103c506315044872e0f84b1f736c4172bb20" },
  "nvim-lightbulb": { "branch": "master", "commit": "8f00b89dd1b1dbde16872bee5fbcee2e58c9b8e9" },
-  "nvim-lint": { "branch": "master", "commit": "4dade85ff26e4bad40f895a6cc6762b7036237f4" },
-  "nvim-lspconfig": { "branch": "master", "commit": "9553725789be682ecd945a527ec552e489ea8534" },
+  "nvim-lint": { "branch": "master", "commit": "e824adb9bc01647f71e55457353a68f0f37f9931" },
+  "nvim-lspconfig": { "branch": "master", "commit": "e172dd599cff2ae5267871b5e33fb42934c4df43" },
  "nvim-neoclip.lua": { "branch": "main", "commit": "798cd0592a81c185465db3a091a0ff8a21af60fd" },
  "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" },
  "nvim-surround": { "branch": "main", "commit": "84a26afce16cffa7e3322cfa80a42cddf60616eb" },
-  "nvim-treesitter": { "branch": "master", "commit": "4349af8a6e8171d5e313a2e4e33d912745ef5e1e" },
-  "nvim-treesitter-context": { "branch": "master", "commit": "b8d1ffe58a88e0356da56b167373e89c4579ce15" },
+  "nvim-treesitter": { "branch": "master", "commit": "9775d5d7c724f81acdd441e7e9edefc4514e990b" },
+  "nvim-treesitter-context": { "branch": "master", "commit": "b8b7e52c1517d401d7c519787d5dc4528c41291a" },
  "nvim-treesitter-endwise": { "branch": "master", "commit": "60e8c288e011403f248b5f6478dde12bed8a6c55" },
-  "nvim-treesitter-textobjects": { "branch": "master", "commit": "95933e762e28f9d38b572d65e7e4da9d2f4d90cb" },
-  "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" },
+  "nvim-treesitter-textobjects": { "branch": "master", "commit": "b7a0bfa3e93697ca5b61b15df633404bf8f45883" },
  "nvim-ts-context-commentstring": { "branch": "main", "commit": "7ab799a9792f7cf3883cf28c6a00ad431f3d382a" },
  "nvim-ufo": { "branch": "main", "commit": "239ae620d818ffa1319ca3056546df71906d4bfb" },
  "nvim-various-textobjs": { "branch": "main", "commit": "3782eb41a964f45788843e34f325a470f0dc6757" },
-  "nvim-web-devicons": { "branch": "master", "commit": "0bb67ef952ea3eb7b1bac9c011281471d99a27bc" },
+  "nvim-web-devicons": { "branch": "master", "commit": "4adea17610d140a99c313e3f79a9dc01825d59ae" },
  "octo.nvim": { "branch": "master", "commit": "feae1e5519deebad3c59ee1d57d28aa22822f7c8" },
-  "omnisharp-extended-lsp.nvim": { "branch": "main", "commit": "4be2e8689067494ed7e5a4f1221adc31d1a07783" },
-  "orgmode": { "branch": "master", "commit": "9c8cefb4a8caa5b9363e2ae5c767104ab8ac6731" },
+  "omnisharp-extended-lsp.nvim": { "branch": "main", "commit": "78cda398234cc24d4fa1511320545f52658da4ea" },
+  "orgmode": { "branch": "master", "commit": "18734589e5807074f57a5228ce06b52ea898b802" },
  "playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" },
-  "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" },
+  "plenary.nvim": { "branch": "master", "commit": "f7adfc4b3f4f91aab6caebf42b3682945fbc35be" },
  "promise-async": { "branch": "main", "commit": "93540c168c5ed2b030ec3e6c40ab8bbb85e36355" },
-  "rainbow-delimiters.nvim": { "branch": "master", "commit": "4902de74335ba0c4816cb67c5d5052c0c5fc7e56" },
-  "rest.nvim": { "branch": "main", "commit": "c27a0bcb84ab5534d89065d638119ed2dbbae189" },
+  "rainbow-delimiters.nvim": { "branch": "master", "commit": "cfc3f53cfa0fbabd95bd33747288aea24fe45211" },
+  "rest.nvim": { "branch": "main", "commit": "b1c84475a8f053037cecf5249e6b69af5a7548d6" },
  "rust-tools.nvim": { "branch": "master", "commit": "676187908a1ce35ffcd727c654ed68d851299d3e" },
-  "rustaceanvim": { "branch": "master", "commit": "b5342fcd1f8dc694d375983c60df928b58a02eb4" },
-  "schemastore.nvim": { "branch": "main", "commit": "9bc9a3a19dc6047d79d6073082f3b0deb7002c99" },
+  "rustaceanvim": { "branch": "master", "commit": "c1cd072bc00c458bfac435f8c76df29af8f5c835" },
+  "schemastore.nvim": { "branch": "main", "commit": "6eb5d8d9ec9f81b75aaa6d15d0f6dc12a066fd3f" },
  "sqlite.lua": { "branch": "master", "commit": "40701b6151f8883980c1548647116de39b763540" },
  "statuscol.nvim": { "branch": "main", "commit": "d954893262a57a92e46edd87de67e2b3fe72305e" },
  "telescope-frecency.nvim": { "branch": "master", "commit": "771726f7d6e7e96e9273e454b1c1f49168663a37" },
-  "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" },
+  "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" },
  "telescope-smart-history.nvim": { "branch": "master", "commit": "81a4cceaa54d65d5f7c7c26178ee63b634d3e26d" },
  "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
  "telescope-undo.nvim": { "branch": "main", "commit": "d3afc1c105535a90caec092ce27a113f77ba7b84" },
  "telescope-z.nvim": { "branch": "main", "commit": "3a31d9741fe4353e5c8b59cfc4eda5420dc7f938" },
-  "telescope.nvim": { "branch": "master", "commit": "d5c4d9856320a07d04607c9b3a0523bd3f373328" },
+  "telescope.nvim": { "branch": "master", "commit": "dc1ea28cc2a02cd1cebb9d80e967807d668f78f8" },
  "telescope_find_directories": { "branch": "main", "commit": "30a29238eca7be1d2eeae7c814f6c0f20bc21931" },
  "tint.nvim": { "branch": "master", "commit": "862835626941d263466754b9c8e2ce2cb004f5ac" },
  "todo-comments.nvim": { "branch": "main", "commit": "833d8dd8b07eeda37a09e99460f72a02616935cb" },
  "toggleterm.nvim": { "branch": "main", "commit": "193786e0371e3286d3bc9aa0079da1cd41beaa62" },
  "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" },
  "typescript-tools.nvim": { "branch": "master", "commit": "c43d9580c3ff5999a1eabca849f807ab33787ea7" },
-  "typst-preview.nvim": { "branch": "master", "commit": "a5b7192a9b9b553914324865b2288d54ed144d7b" },
+  "typst-preview.nvim": { "branch": "master", "commit": "5867db936576741f378b558a9d7428b928819df5" },
  "venn.nvim": { "branch": "main", "commit": "e4d68341a73dd56c64955058821a58295fb337b1" },
-  "vim-dadbod": { "branch": "master", "commit": "acb78e078dc4fe1e997ebf006be17aa3766d2ef4" },
+  "vim-dadbod": { "branch": "master", "commit": "960bbb7de11b7282a68d579a64e838b487934493" },
  "vim-dadbod-completion": { "branch": "master", "commit": "c920cb0ba3dff4b1b0ed373e1c0b3007dec696c2" },
  "vim-dadbod-ui": { "branch": "master", "commit": "165699c573469e6a95b48d35052f848c340c5911" },
  "vim-move": { "branch": "master", "commit": "3c4195de0748da9bba25c54d78d959d349e93c55" },
@ -128,6 +127,6 @@
  "vim-repeat": { "branch": "master", "commit": "24afe922e6a05891756ecf331f39a1f6743d3d5a" },
  "vim-table-mode": { "branch": "master", "commit": "4ff8de2ac93431ee6d85a9e04177012752e6abdc" },
  "vim-visual-multi": { "branch": "master", "commit": "fe1ec7e430013b83c8c2dee85ae496251b71e253" },
-  "vimtex": { "branch": "master", "commit": "2bb7cdc17c0ac18266e4c96083290956169c1c38" },
+  "vimtex": { "branch": "master", "commit": "a77d14b2e4391c0d3e860708bb1fd56161ab68eb" },
  "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" }
 }
--- a/dots/.config/nvim/lua/core/cmds.lua
+++ b/dots/.config/nvim/lua/core/cmds.lua
@ -1,7 +1,5 @@
 local M = {}
 M.setup = function()
-    -- NOTE: TrimTrailingWhitespace user command
-
    -- If invoked as a preview callback, performs 'inccommand' preview by
    -- highlighting trailing whitespace in the current buffer.
    local function trim_space_preview(opts, preview_ns, preview_buf)
@ -69,8 +67,6 @@ M.setup = function()
        { nargs = "?", range = "%", addr = "lines", preview = trim_space_preview }
    )

-    -- NOTE: DiffSaved user command
-
    vim.api.nvim_create_user_command("DiffSaved", function()
        -- Thanks to sindrets: https://github.com/sindrets/dotfiles/blob/1990282dba25aaf49897f0fc70ebb50f424fc9c4/.config/nvim/lua/user/lib.lua#L175
        -- Minor alterations by me
@ -97,6 +93,17 @@ M.setup = function()
        end
        vim.cmd.wincmd("l")
    end, {})
+
+    vim.api.nvim_create_user_command("SudoWrite", function(opts)
+        opts.args = vim.trim(opts.args)
+        local cmd = ":silent! w! !sudo tee " .. (#opts.args > 0 and opts.args or "%") .. " >/dev/null "
+        vim.cmd(cmd)
+        vim.cmd.edit({ bang = true, mods = { silent = true, confirm = false } })
+        vim.bo.readonly = false
+    end, {
+        nargs = "*",
+        desc = "Sudo Write"
+    })
 end

 return M
--- a/dots/.config/nvim/lua/plugins/configs/lsp.lua
+++ b/dots/.config/nvim/lua/plugins/configs/lsp.lua
@ -10,7 +10,7 @@ local function on_attach(client, bufnr)
        capabilities.documentRangeFormattingProvider = false
    end
    local ignored_fmt_lsps = {
-        "lua_ls"
+        "lua_ls",
    }
    local capabilities = client.server_capabilities
    -- vim.notify(vim.inspect(capabilities))
@ -49,9 +49,6 @@ local server_opts = {
 }

 local lsp_server_bin_dir = vim.fn.stdpath("data") .. "/mason/bin/"
-local codelldb_path = lsp_server_bin_dir .. "codelldb"
-local liblldb_path = vim.fn.stdpath("data") .. "/mason/packages/codelldb/extension/lldb/lib/liblldb.so"
-
 return {
    {
        url = "https://git.sr.ht/~whynothugo/lsp_lines.nvim",
@ -67,6 +64,7 @@ return {
            {
                "<leader>lt",
                function()
+                    ---@diagnostic disable-next-line: undefined-field
                    local virtual_lines_enabled = not vim.diagnostic.config().virtual_lines
                    vim.diagnostic.config({
                        virtual_lines = virtual_lines_enabled,
@ -80,9 +78,16 @@ return {
    },
    {
        "smjonas/inc-rename.nvim",
-        cmd = { "Increname" },
+        cmd = { "IncRename" },
        keys = {
-            { "<leader>ln", ":IncRename ", desc = "LSP: Rename" },
+            {
+                "<leader>ln",
+                function()
+                    return ":IncRename " .. vim.fn.expand("<cword>")
+                end,
+                desc = "LSP: Rename",
+                expr = true,
+            },
        },
        opts = {},
    },
@ -112,8 +117,8 @@ return {
                layout_strategy = "vertical",
                layout_config = {
                    width = 0.8,
-                    height = 0.7
-                }
+                    height = 0.7,
+                },
            },
        },
        keys = {
@ -275,17 +280,24 @@ return {

            -- NOTE: LUA LSP
            require("neodev").setup({
-                override = function(root_dir, library)
-                    local cur_file = vim.api.nvim_buf_get_name(0)
+                override = function(root_dir, options)
+                    local cur_file = vim.api.nvim_buf_get_name(vim.api.nvim_get_current_buf())

                    if root_dir:find("/tmp", 1, true) == 1 then
-                        library.enabled = true
-                        library.plugins = true
+                        options.enabled = true
+                        options.plugins = true
+                    end
+
+                    local config_path = vim.fn.stdpath("config")
+                    config_path = (config_path and vim.fn.resolve(config_path) or "")
+                    if cur_file:find("^" .. vim.pesc(config_path) .. ".*") then
+                        options.enabled = true
+                        options.plugins = true
                    end

                    if cur_file:find("%.nvim%.lua") ~= nil then
-                        library.enabled = true
-                        library.plugins = true
+                        options.enabled = true
+                        options.plugins = true
                    end
                end,
            })
@ -293,9 +305,12 @@ return {
            lspconfig.lua_ls.setup({
                settings = {
                    Lua = {
+                        runtime = {
+                            version = "LuaJIT",
+                        },
                        hint = {
                            enable = true,
-                            setType = true
+                            setType = true,
                        },
                        completion = {
                            callSnippet = "Replace",
@ -446,14 +461,30 @@ return {
            lspconfig.gopls.setup({
                capabilities = lsp_capabilities,
                on_attach = on_attach,
-                fillstruct = 'gopls',
+                fillstruct = "gopls",
                dap_debug = true,
-                dap_debug_gui = true
+                dap_debug_gui = true,
+            })
+
+            lspconfig.nil_ls.setup({
+                capabilities = lsp_capabilities,
+                on_attach = on_attach,
+                settings = {
+                    ["nil"] = {
+                        formatting = { command = { "nixfmt" } },
+                        nix = {
+                            maxMemoryMB = 60000,
+                            flake = {
+                                autoArchive = true,
+                                autoEvalInputs = true
+                            }
+                        }
+                    },
+                },
            })

            -- NOTE: GENERIC LSP SERVERS
            for _, server in ipairs({
-                "nixd",
                "clangd",
                "cmake",
                "bashls",
@ -470,28 +501,10 @@ return {
                "marksman",
                "asm_lsp",
                "typst_lsp",
+                "nginx_language_server",
            }) do
                lspconfig[server].setup(server_opts)
            end
-
-            -- Custom Servers outside of lspconfig
-            vim.api.nvim_create_autocmd("FileType", {
-                pattern = "nginx",
-                desc = "Nginx Language Server Handler",
-                callback = function()
-                    local client_id = vim.lsp.start({
-                        name = "Nginx-ls",
-                        cmd = { lsp_server_bin_dir .. "nginx-language-server" },
-                        root_dir = vim.fn.getcwd(),
-                        capabilities = lsp_capabilities,
-                        on_attach = on_attach,
-                    })
-
-                    if client_id then
-                        vim.lsp.buf_attach_client(0, client_id)
-                    end
-                end,
-            })
        end,
    },
 }
--- a/dots/.config/zathura/zathurarc
+++ b/dots/.config/zathura/zathurarc
@ -23,7 +23,7 @@ set inputbar-fg                 "#DCD7BA"
 set statusbar-bg                "#1F1F28"
 set statusbar-fg                "#DCD7BA"

-set highlight-color             "#FFA066"
+set highlight-color             "rgba(255, 160, 102, 0.5)"
 set highlight-active-color      "#FF5D62"

 set default-bg                  "#1F1F28"
--- a/flake.lock
+++ b/flake.lock
@ -42,11 +42,11 @@
        "nixpkgs-stable": "nixpkgs-stable"
      },
      "locked": {
-        "lastModified": 1709572030,
-        "narHash": "sha256-UMDxq9roK5I0C8O5/KtfCmR/2DHgu6aHIiyHOEDtUUA=",
+        "lastModified": 1709831328,
+        "narHash": "sha256-z5B6+3y4WJBGgbdi/AOGQb2EvaHzWVJDjsmvuaNgdBs=",
        "owner": "nix-community",
        "repo": "emacs-overlay",
-        "rev": "c9764e76968428e466a9c4c5f11f48f510fb5c75",
+        "rev": "50ac0adb684bcde50574db50f814960545620730",
        "type": "github"
      },
      "original": {
@ -315,11 +315,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1709485962,
-        "narHash": "sha256-rmFB4uE10+LJbcVE4ePgiuHOBlUIjQOeZt4VQVJTU8M=",
+        "lastModified": 1709764752,
+        "narHash": "sha256-+lM4J4JoJeiN8V+3WSWndPHj1pJ9Jc1UMikGbXLqCTk=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "d579633ff9915a8f4058d5c439281097e92380a8",
+        "rev": "cf111d1a849ddfc38e9155be029519b0e2329615",
        "type": "github"
      },
      "original": {
@ -390,11 +390,11 @@
      },
      "locked": {
        "dir": "contrib",
-        "lastModified": 1709508789,
-        "narHash": "sha256-sfSg3bsRryBClhHwb9Fi7cAPRxVRsyvdMsCdhep9Hlc=",
+        "lastModified": 1709764988,
+        "narHash": "sha256-qNpTZNbWdZo1QyjOC5AgR7Cidu7Hs6JeeVxmKAjjcV0=",
        "owner": "neovim",
        "repo": "neovim",
-        "rev": "3df1211ebc4c7ec4562d0ad0fa51a24569b81e15",
+        "rev": "6525832a8c4d44a8ebabba02a5ea1ce09b389a4f",
        "type": "github"
      },
      "original": {
@ -413,11 +413,11 @@
        "nixpkgs": "nixpkgs_2"
      },
      "locked": {
-        "lastModified": 1709512572,
-        "narHash": "sha256-8w8sIncwZd4xvDs+lAPNK2KZasQhL6lw3QCGFhREELI=",
+        "lastModified": 1709769948,
+        "narHash": "sha256-fOKqYDzj6GK2eDB7QFs/6tsP5CgRyG4YN/xUfeRZGaQ=",
        "owner": "nix-community",
        "repo": "neovim-nightly-overlay",
-        "rev": "e0a344407ddf9b4d2b1e2e78725efbd68d724cef",
+        "rev": "f0fc63c0db1bb97939919abfb93f63a80504933a",
        "type": "github"
      },
      "original": {
@ -447,11 +447,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1709237383,
-        "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=",
+        "lastModified": 1709703039,
+        "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8",
+        "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d",
        "type": "github"
      },
      "original": {
@ -463,11 +463,11 @@
    },
    "nixpkgs-stable": {
      "locked": {
-        "lastModified": 1709309926,
-        "narHash": "sha256-VZFBtXGVD9LWTecGi6eXrE0hJ/mVB3zGUlHImUs2Qak=",
+        "lastModified": 1709677081,
+        "narHash": "sha256-tix36Y7u0rkn6mTm0lA45b45oab2cFLqAzDbJxeXS+c=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "79baff8812a0d68e24a836df0a364c678089e2c7",
+        "rev": "880992dcc006a5e00dd0591446fdf723e6a51a64",
        "type": "github"
      },
      "original": {
@ -479,11 +479,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1709386671,
-        "narHash": "sha256-VPqfBnIJ+cfa78pd4Y5Cr6sOWVW8GYHRVucxJGmRf8Q=",
+        "lastModified": 1709675310,
+        "narHash": "sha256-w61tqFEmuJ+/1rAwU7nkYZ+dN6sLwyobfLwX2Yn42FE=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "fa9a51752f1b5de583ad5213eb621be071806663",
+        "rev": "43d259f8d726113fac056e8bb17d5ac2dea3e0a8",
        "type": "github"
      },
      "original": {
@ -510,11 +510,11 @@
    },
    "nixpkgs_4": {
      "locked": {
-        "lastModified": 1709386671,
-        "narHash": "sha256-VPqfBnIJ+cfa78pd4Y5Cr6sOWVW8GYHRVucxJGmRf8Q=",
+        "lastModified": 1709780214,
+        "narHash": "sha256-p4iDKdveHMhfGAlpxmkCtfQO3WRzmlD11aIcThwPqhk=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "fa9a51752f1b5de583ad5213eb621be071806663",
+        "rev": "f945939fd679284d736112d3d5410eb867f3b31c",
        "type": "github"
      },
      "original": {
@ -661,11 +661,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1709558716,
-        "narHash": "sha256-HdbIBHb2evjXidV1XKDsDRWSeB0k3X1p2HvAcd4AfXc=",
+        "lastModified": 1709625704,
+        "narHash": "sha256-9zUqV1wxUAuRRBMQCUZEf5FjIKMeTEhWTLOfL4+9EiE=",
        "owner": "Alexays",
        "repo": "Waybar",
-        "rev": "380607583e54489be5eda39074807d40d7844661",
+        "rev": "4c46d7d245a6c06644d6a0e8857f7140556202ce",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -33,12 +33,11 @@
    let
      system = "x86_64-linux";
      username = "sam";
-      lib = nixpkgs.lib;
    in {
      defaultPackage.x86_64-linux = home-manager.defaultPackage.x86_64-linux;
      targets.genericLinux = { enable = true; };
      homeConfigurations.${username} =
-        home-manager.lib.homeManagerConfiguration rec {
+        home-manager.lib.homeManagerConfiguration {
          pkgs = nixpkgs.legacyPackages.${system};
          extraSpecialArgs = {
            inherit inputs;
@ -60,7 +59,7 @@
                    '';
                  });
                  opensnitch-ui = prev.opensnitch-ui.overrideAttrs
-                    (oldAttrs: rec {
+                    (oldAttrs: {
                      propagatedBuildInputs = oldAttrs.propagatedBuildInputs
                        ++ [ prev.python311Packages.qt-material ];
                    });
@ -75,13 +74,5 @@
            ./config
          ];
        };
-    } // inputs.flake-utils.lib.eachDefaultSystem (system:
-      let pkgs = import nixpkgs { inherit system; };
-      in {
-        devShells.default = pkgs.mkShell {
-          shellHook = ''
-            nix eval --json --file ./.nixd.nix > .nixd.json
-          '';
    };
-      });
 }
Author	SHA1	Message	Date
Price Hiller	1bafcda884	refactor(nix-hm): specify pinentryFlavor for gpg-agent	2024-03-08 13:12:58 -06:00
Price Hiller	cc8f47ca3a	docs(nvim): update deadline for CI	2024-03-07 21:18:12 -06:00
Price Hiller	af6470fecd	fix(zathura): make text under selections visible	2024-03-07 20:40:25 -06:00
Price Hiller	f588550601	refactor(nix-hm): remove unused bindings	2024-03-07 15:56:28 -06:00
Price Hiller	98bfed667d	chore(nvim): update lazy lock	2024-03-07 15:54:48 -06:00
Price Hiller	002378b528	refactor(nix-hm): remove nixd	2024-03-07 15:52:07 -06:00
Price Hiller	b711389bc2	feat(nvim): add 'SudoWrite' user command	2024-03-07 15:51:47 -06:00
Price Hiller	fd59dd0d65	refactor(nvim): replace `nixd` with `nil_ls`	2024-03-07 15:51:18 -06:00
Price Hiller	0fcfbfdb50	refactor(nvim): various lsp improvements I'm too lazy to create separate commits for all this. Just my dot files, I ain't investing that amount of effort lol	2024-03-07 15:01:10 -06:00