diff --git a/hosts/dnsc-work/default.nix b/hosts/dnsc-work/default.nix index 943d0b0..c913082 100644 --- a/hosts/dnsc-work/default.nix +++ b/hosts/dnsc-work/default.nix @@ -72,6 +72,7 @@ masApps = { Bitwarden = 1352778147; + Wireguard = 1451685025; # XCode = 497799835; }; diff --git a/modules/nvim/config/lazy-lock.json b/modules/nvim/config/lazy-lock.json index ac4bd5f..a5251f8 100644 --- a/modules/nvim/config/lazy-lock.json +++ b/modules/nvim/config/lazy-lock.json @@ -1,38 +1,37 @@ { "barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" }, "blink.cmp": { "branch": "main", "commit": "bae4bae0eedd1fa55f34b685862e94a222d5c6f8" }, - "codecompanion.nvim": { "branch": "main", "commit": "59ff8c47585b78c74576add55c28431dd0cd383f" }, + "codecompanion.nvim": { "branch": "main", "commit": "019be206a96cf6de12ea71f02a9e1b847a2debbb" }, "conform.nvim": { "branch": "master", "commit": "b4aab989db276993ea5dcb78872be494ce546521" }, "flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" }, - "follow-md-links.nvim": { "branch": "main", "commit": "ce8735a15dc3e5fc5bb052ec51b849c03e57df53" }, + "follow-md-links.nvim": { "branch": "main", "commit": "728d96d268eef9666f0ee77a083e7e2f0b44f607" }, "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, "gitsigns.nvim": { "branch": "main", "commit": "6e3c66548035e50db7bd8e360a29aec6620c3641" }, - "grug-far.nvim": { "branch": "main", "commit": "385d1949dc21d0c39e7a74b4f4a25da18817bc86" }, + "grug-far.nvim": { "branch": "main", "commit": "c5b629399c0f2e436c00df381e44852a13b7313a" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" }, "lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" }, - "mini.diff": { "branch": "main", "commit": "f573bd2ae2eb225ea2f125126b8869e04bcaf231" }, - "mini.icons": { "branch": "main", "commit": "b8f6fa6f5a3fd0c56936252edcd691184e5aac0c" }, - "mini.pairs": { "branch": "main", "commit": "1e1ca3f60f58d4050bf814902b472eec9963a5dd" }, - "nvim-lint": { "branch": "master", "commit": "ee04d481d4e6089892c2fb2ad8924b1a053591e1" }, + "mini.diff": { "branch": "main", "commit": "7077b636d642fcd5cd48554e187a251883239660" }, + "mini.icons": { "branch": "main", "commit": "f9a177c11daa7829389b7b6eaaec8b8a5c47052d" }, + "mini.pairs": { "branch": "main", "commit": "6e1cc569130f25b2c6fa16d8b21b31ddb1420a4a" }, + "none-ls-extras.nvim": { "branch": "main", "commit": "924fe88a9983c7d90dbb31fc4e3129a583ea0a90" }, + "none-ls.nvim": { "branch": "main", "commit": "df778107fd2f0503f5606363ce13437132056d54" }, "nvim-surround": { "branch": "main", "commit": "a868c256c861044beb9794b4dd126480dcdfbdad" }, "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, - "nvim-web-devicons": { "branch": "master", "commit": "4ae47f4fb18e85b80e84b729974fe65483b06aaf" }, + "nvim-web-devicons": { "branch": "master", "commit": "6e51ca170563330e063720449c21f43e27ca0bc1" }, "oil.nvim": { "branch": "master", "commit": "07f80ad645895af849a597d1cac897059d89b686" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, - "render-markdown.nvim": { "branch": "main", "commit": "f626e90bbc4b3d8f4fd29c909d958b165af13f4a" }, + "render-markdown.nvim": { "branch": "main", "commit": "e76eb2e4262f0f0a1a7bd7a454dd7d44f1299afd" }, "rose-pine": { "branch": "main", "commit": "72a04c4065345b51b56aed4859ea1d884f734097" }, - "schemastore.nvim": { "branch": "main", "commit": "8e74c08998fd786239caba373344f4e4601e21fe" }, + "schemastore.nvim": { "branch": "main", "commit": "2ae6d27897c60265d4ad3f33e286528d519098fd" }, "snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" }, "substitute.nvim": { "branch": "main", "commit": "9db749a880e3dd3b0eb57f698aa8f1e1630e1f25" }, "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" }, - "todo.txt-vim": { "branch": "master", "commit": "3bb5f9cf0d6c7ee91b476a97054c336104d2b6f5" }, "vim-cool": { "branch": "master", "commit": "9ea940c0d537e55de0de4c0298c04b976960fb12" }, "vim-dadbod": { "branch": "master", "commit": "e95afed23712f969f83b4857a24cf9d59114c2e6" }, "vim-dadbod-completion": { "branch": "master", "commit": "a8dac0b3cf6132c80dc9b18bef36d4cf7a9e1fe6" }, "vim-dadbod-ssh": { "branch": "master", "commit": "9bce775ee76c3dd6d7508dcd9eb276b36133d710" }, "vim-dadbod-ui": { "branch": "master", "commit": "e8b53c0f3aa6e6127ac2a2d2071d9aade6c6e373" }, "vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" }, - "vimwiki": { "branch": "dev", "commit": "72792615e739d0eb54a9c8f7e0a46a6e2407c9e8" }, "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" } } diff --git a/modules/nvim/config/lua/plugins/none-ls.lua b/modules/nvim/config/lua/plugins/none-ls.lua new file mode 100644 index 0000000..421921c --- /dev/null +++ b/modules/nvim/config/lua/plugins/none-ls.lua @@ -0,0 +1,63 @@ +return { + "nvimtools/none-ls.nvim", + dependencies = { + "nvimtools/none-ls-extras.nvim", + }, + config = function() + local null_ls = require("null-ls") + local utils = require("dnsc.utils") + + local string_starts_with = function(str, start) + return string.sub(str, 1, #start) == start + end + + local create_runtime_condition = function(config_names) + local bufnr_cache = {} + local config_path_cache = {} + + return function(params) + if bufnr_cache[params.bufnr] ~= nil then + return bufnr_cache[params.bufnr] + else + for _, cached_config_path in ipairs(config_path_cache) do + if string_starts_with(params.bufname, cached_config_path) then + bufnr_cache[params.bufnr] = true + return true + end + end + end + + local config_path = utils.root_pattern(config_names)(params.bufname) + + local has_config = config_path ~= nil + if has_config then + table.insert(config_path_cache, config_path) + end + bufnr_cache[params.bufnr] = has_config + + return has_config + end + end + + local eslint_runtime_condition = create_runtime_condition({ + ".eslintrc.cjs", + ".eslintrc.js", + ".eslintrc.json", + ".eslintrc.yaml", + ".eslintrc.yml", + "eslint.config.mjs", + "eslint.config.js", + "eslint.config.ts", + "eslint.config.mts", + }) + + null_ls.setup({ + sources = { + require("none-ls.code_actions.eslint_d"), + require("none-ls.diagnostics.eslint_d").with({ + runtime_condition = eslint_runtime_condition, + }), + }, + }) + end, +} diff --git a/modules/nvim/config/lua/plugins/nvim-lint.lua b/modules/nvim/config/lua/plugins/nvim-lint.lua deleted file mode 100644 index 3d23bfd..0000000 --- a/modules/nvim/config/lua/plugins/nvim-lint.lua +++ /dev/null @@ -1,21 +0,0 @@ -return { - "mfussenegger/nvim-lint", - config = function() - local lint = require("lint") - - lint.linters_by_ft = { - javascript = { "eslint_d" }, - javascriptreact = { "eslint_d" }, - typescript = { "eslint_d" }, - typescriptreact = { "eslint_d" }, - sh = { "shellcheck" }, - nix = { "nix" }, - } - - vim.api.nvim_create_autocmd({ "BufWritePost" }, { - callback = function() - require("lint").try_lint() - end, - }) - end, -} diff --git a/modules/wezterm/config/keybindings.lua b/modules/wezterm/config/keybindings.lua index 4f45797..3917dc2 100644 --- a/modules/wezterm/config/keybindings.lua +++ b/modules/wezterm/config/keybindings.lua @@ -12,7 +12,7 @@ function M.apply_to_config(config) { key = "|", mods = "LEADER", - action = wezterm.action.SplitHorizontal({ domain = "CurrentPaneDomain" }), + action = wezterm.action.SplitPane({ direction = "Left", size = { Percent = 40 } }), }, { key = "-", @@ -47,12 +47,6 @@ function M.apply_to_config(config) mods = "LEADER", action = projects.choose(), }, - { - key = "w", - mods = "LEADER", - -- Present a list of existing workspaces - action = wezterm.action.ShowLauncherArgs({ flags = "FUZZY|WORKSPACES" }), - }, -- Misc { key = " ", @@ -60,7 +54,7 @@ function M.apply_to_config(config) action = wezterm.action.ActivateCommandPalette, }, { - key = "[", + key = "v", mods = "LEADER", action = wezterm.action.ActivateCopyMode, },