From 23d2d346235549327576a9c48d8cd47421c1591f Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Tue, 4 Nov 2025 13:40:52 +0100 Subject: [PATCH 01/16] Usability/Operability(nvim): enable telescope-smart-history-nvim.nvim --- home-manager/profiles/nvim.nix | 1 + home-manager/profiles/nvim/lua/plugins/telescope.lua | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/home-manager/profiles/nvim.nix b/home-manager/profiles/nvim.nix index a18a886..28ba043 100644 --- a/home-manager/profiles/nvim.nix +++ b/home-manager/profiles/nvim.nix @@ -95,6 +95,7 @@ in pkgs.vimPlugins.telescope-git-conflicts-nvim pkgs.vimPlugins.telescope-live-grep-args-nvim pkgs.vimPlugins.telescope-nvim + pkgs.vimPlugins.telescope-smart-history-nvim pkgs.vimPlugins.trouble-nvim pkgs.vimPlugins.vim-illuminate pkgs.vimPlugins.which-key-nvim diff --git a/home-manager/profiles/nvim/lua/plugins/telescope.lua b/home-manager/profiles/nvim/lua/plugins/telescope.lua index 3a2974b..35e4d9c 100644 --- a/home-manager/profiles/nvim/lua/plugins/telescope.lua +++ b/home-manager/profiles/nvim/lua/plugins/telescope.lua @@ -9,6 +9,7 @@ return { vim.cmd.packadd("telescope-fzf-native.nvim") vim.cmd.packadd("telescope-git-conflicts.nvim") vim.cmd.packadd("telescope-live-grep-args.nvim") + vim.cmd.packadd("telescope-smart-history.nvim") end, before = function() vim.g.loaded_telescope = nil @@ -35,6 +36,10 @@ return { "result/", "target/", }, + history = { + path = "~/.local/share/nvim/databases/telescope_history.sqlite3", + limit = 100, + }, initial_mode = "insert", layout_config = { height = 0.800000, @@ -76,6 +81,7 @@ return { telescope.load_extension("conflicts") telescope.load_extension("fzf") telescope.load_extension("live_grep_args") + telescope.load_extension("smart_history") --telescope.load_extension("noice") end, keys = { -- 2.49.0 From e3731605c45987dd6d303a3a26435c9ed95af9d5 Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Tue, 4 Nov 2025 14:05:19 +0100 Subject: [PATCH 02/16] Perf/Speed+Durability/Space(nix): use a tmpfs on NIX_STATE_DIR --- nixos/profiles/system.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/nixos/profiles/system.nix b/nixos/profiles/system.nix index e15dbce..005a9c6 100644 --- a/nixos/profiles/system.nix +++ b/nixos/profiles/system.nix @@ -9,6 +9,21 @@ with lib; { boot.tmp.cleanOnBoot = mkDefault true; boot.tmp.useTmpfs = mkDefault true; + boot.tmp.tmpfsHugeMemoryPages = mkDefault "within_size"; + fileSystems = mkIf config.boot.tmp.useTmpfs { + # NIX_STATE_DIR, where nix (>= 2.30) builds. + "/nix/var/nix/builds" = { + fsType = "tmpfs"; + options = [ + #"mode=755" + "nosuid" + "nodev" + "rw" + "size=${toString config.boot.tmp.tmpfsSize}" + "huge=${config.boot.tmp.tmpfsHugeMemoryPages}" + ]; + }; + }; services.logrotate.enable = true; # NOTE: mostly useless on a server, and CPU intensive. -- 2.49.0 From 2e1f951f0df5fb6b628f86872fb1232ee77560a6 Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Tue, 4 Nov 2025 14:54:07 +0100 Subject: [PATCH 03/16] Usability/Operability(neovim/telescope): adjust extensions and mappings --- home-manager/profiles/nvim.nix | 1 + .../profiles/nvim/lua/plugins/telescope.lua | 34 +++++++++++++++++-- home-manager/profiles/tmux.conf | 4 +++ 3 files changed, 36 insertions(+), 3 deletions(-) diff --git a/home-manager/profiles/nvim.nix b/home-manager/profiles/nvim.nix index 28ba043..03def47 100644 --- a/home-manager/profiles/nvim.nix +++ b/home-manager/profiles/nvim.nix @@ -91,6 +91,7 @@ in doCheck = false; }) */ + # pkgs.vimPlugins.sqlite-lua # For telescope-smart-history.nvim pkgs.vimPlugins.telescope-fzf-native-nvim pkgs.vimPlugins.telescope-git-conflicts-nvim pkgs.vimPlugins.telescope-live-grep-args-nvim diff --git a/home-manager/profiles/nvim/lua/plugins/telescope.lua b/home-manager/profiles/nvim/lua/plugins/telescope.lua index 35e4d9c..2cc0f51 100644 --- a/home-manager/profiles/nvim/lua/plugins/telescope.lua +++ b/home-manager/profiles/nvim/lua/plugins/telescope.lua @@ -9,12 +9,15 @@ return { vim.cmd.packadd("telescope-fzf-native.nvim") vim.cmd.packadd("telescope-git-conflicts.nvim") vim.cmd.packadd("telescope-live-grep-args.nvim") - vim.cmd.packadd("telescope-smart-history.nvim") + --vim.cmd.packadd("sqlite-lua") -- For telescope-smart-history.nvim + --vim.cmd.packadd("telescope-smart-history.nvim") end, before = function() vim.g.loaded_telescope = nil end, after = function() + local actions = require("telescope.actions") + local lga_actions = require("telescope-live-grep-args.actions") require("telescope").setup({ defaults = { color_devicons = false, @@ -27,6 +30,29 @@ return { --case_mode = "smart_case", -- or "ignore_case" or "respect_case" -- the default case_mode is "smart_case" }, + live_grep_args = { + auto_quoting = true, + mappings = { + n = { + -- Usage/FixMe: does not seem to be triggered + [""] = lga_actions.quote_prompt(), + [""] = lga_actions.quote_prompt({ postfix = " --iglob " }), + -- freeze the current list and start a fuzzy search in the frozen list + [""] = lga_actions.to_fuzzy_refine, + }, + }, + -- ... also accepts theme settings, for example: + -- theme = "dropdown", -- use dropdown theme + -- theme = { }, -- use own theme spec + -- layout_config = { mirror=true }, -- mirror preview pane + }, + }, + mappings = { + i = { + [""] = actions.cycle_history_prev, + [""] = actions.cycle_history_next, + -- [""] = actions.close, + }, }, file_ignore_patterns = { "%.git/", @@ -81,7 +107,7 @@ return { telescope.load_extension("conflicts") telescope.load_extension("fzf") telescope.load_extension("live_grep_args") - telescope.load_extension("smart_history") + --telescope.load_extension("smart_history") --telescope.load_extension("noice") end, keys = { @@ -99,7 +125,9 @@ return { }, { "fg", - "Telescope live_grep", + function() + require("telescope").extensions.live_grep_args.live_grep_args() + end, desc = "Live grep [Telescope]", expr = false, mode = "n", diff --git a/home-manager/profiles/tmux.conf b/home-manager/profiles/tmux.conf index 4ecaa82..f52a554 100644 --- a/home-manager/profiles/tmux.conf +++ b/home-manager/profiles/tmux.conf @@ -203,6 +203,10 @@ set -g default-terminal "${TERM}" set -as terminal-overrides ',*:Smulx=\E[4::%p1%dm' # undercurl support set -as terminal-overrides ',*:Setulc=\E[58::2::%p1%{65536}%/%d::%p1%{256}%/%{255}%&%d::%p1%{255}%&%d%;m' # underscore colours - needs tmux-3.0 +# For image.nvim +# https://github.com/3rd/image.nvim?tab=readme-ov-file#tmux +set -gq allow-passthrough on + # Solarized color. #source-file ~/.tmux/vendor/tmux-colors-solarized/tmuxcolors.conf -- 2.49.0 From f67b82778944091c425308226ddc2548c1f1744f Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Thu, 6 Nov 2025 01:39:27 +0100 Subject: [PATCH 04/16] Functionality/Correctness(nvim/neo-tree): sort folder in ascending order --- home-manager/profiles/nvim/lua/plugins/neo-tree.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/profiles/nvim/lua/plugins/neo-tree.lua b/home-manager/profiles/nvim/lua/plugins/neo-tree.lua index 92cd68b..f04d715 100644 --- a/home-manager/profiles/nvim/lua/plugins/neo-tree.lua +++ b/home-manager/profiles/nvim/lua/plugins/neo-tree.lua @@ -26,7 +26,7 @@ return { sort_case_insensitive = true, sort_function = function(a, b) -- ExplanationNote: sort only using the path, not the type. - return a.path > b.path + return a.path < b.path end, buffers = { follow_current_file = { enabled = true, leave_dirs_open = true }, -- 2.49.0 From f6aa075ae7f8fe8cdfb168934285bbb2bbdaf522 Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Thu, 6 Nov 2025 03:04:25 +0100 Subject: [PATCH 05/16] Functionality/Correctness(nvim/neo-tree): navigate buffers in visual order --- .../profiles/nvim/lua/config/keymaps.lua | 30 +++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/home-manager/profiles/nvim/lua/config/keymaps.lua b/home-manager/profiles/nvim/lua/config/keymaps.lua index 04f9e96..c068a53 100644 --- a/home-manager/profiles/nvim/lua/config/keymaps.lua +++ b/home-manager/profiles/nvim/lua/config/keymaps.lua @@ -17,8 +17,34 @@ vim.keymap.set("n", "j", ":wincmd h", {}) vim.keymap.set("n", "l", ":wincmd l", {}) -- Navigating the buffer list -vim.keymap.set("n", "", ":bprevious!", { silent = true }) -vim.keymap.set("n", "", ":bnext!", { silent = true }) +-- vim.keymap.set("n", "", ":bprevious!", { silent = true }) +-- vim.keymap.set("n", "", ":bnext!", { silent = true }) +vim.keymap.set("n", "", function() + local manager = require("neo-tree.sources.manager") + local state = manager.get_state("buffers") + local renderer = require("neo-tree.ui.renderer") + local scroll_padding = 3 + renderer.focus_node(state, nil, true, -1, scroll_padding) + local node = state.tree:get_node() + if node.type == "directory" then + return -- state.commands.open(state) would state.commands.toggle_node(state) + else + state.commands.open(state) + end +end, { silent = true, desc = "Navigate down buffers in neo-tree's order" }) +vim.keymap.set("n", "", function() + local manager = require("neo-tree.sources.manager") + local state = manager.get_state("buffers") + local renderer = require("neo-tree.ui.renderer") + local scroll_padding = 3 + renderer.focus_node(state, nil, true, 1, scroll_padding) + local node = state.tree:get_node() + if node.type == "directory" then + return -- state.commands.open(state) would state.commands.toggle_node(state) + else + state.commands.open(state) + end +end, { silent = true, desc = "Navigate down buffers in neo-tree's order" }) vim.keymap.set("n", "m", "fb", { desc = "Switch buffer", silent = true }) vim.keymap.set("n", "m", ":buffer #", { desc = "Go to last buffer", silent = true }) -- Navigating the location list -- 2.49.0 From 4d707afe04028bbc29e93c5751a00b8ac0ee2d1d Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Fri, 7 Nov 2025 18:07:24 +0100 Subject: [PATCH 06/16] Usability/Operability(jj): enable jjui --- home-manager/profiles/git.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home-manager/profiles/git.nix b/home-manager/profiles/git.nix index 8db5d28..4780101 100644 --- a/home-manager/profiles/git.nix +++ b/home-manager/profiles/git.nix @@ -20,6 +20,7 @@ #pkgs.git-publish pkgs.git-quick-stats pkgs.gitui + pkgs.jjui pkgs.jujutsu pkgs.tig ]; @@ -28,6 +29,7 @@ ignores = [ "*~" "*.swp" + ".jj/" ]; package = lib.mkDefault pkgs.gitMinimal; aliases = { -- 2.49.0 From fa6cd83753cc828fd487d5156594633515316eab Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Fri, 7 Nov 2025 18:10:22 +0100 Subject: [PATCH 07/16] Functionality/Scope(neovim/elixir-tools): add support for Erlang/Elixir --- home-manager/profiles/nvim.nix | 2 ++ .../nvim/lua/plugins/elixir-tools.lua | 29 +++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 home-manager/profiles/nvim/lua/plugins/elixir-tools.lua diff --git a/home-manager/profiles/nvim.nix b/home-manager/profiles/nvim.nix index 03def47..d594d4b 100644 --- a/home-manager/profiles/nvim.nix +++ b/home-manager/profiles/nvim.nix @@ -59,6 +59,7 @@ in pkgs.vimPlugins.gitlinker-nvim pkgs.vimPlugins.gitsigns-nvim pkgs.vimPlugins.haskell-tools-nvim + pkgs.vimPlugins.elixir-tools-nvim pkgs.vimPlugins.hunk-nvim pkgs.vimPlugins.image-nvim (pkgs.vimUtils.buildVimPlugin { @@ -158,6 +159,7 @@ in pkgs.lua-language-server pkgs.nixd pkgs.nil + pkgs.next-ls #pkgs.rust-analyzer ]; snacks = [ diff --git a/home-manager/profiles/nvim/lua/plugins/elixir-tools.lua b/home-manager/profiles/nvim/lua/plugins/elixir-tools.lua new file mode 100644 index 0000000..3b7c2ce --- /dev/null +++ b/home-manager/profiles/nvim/lua/plugins/elixir-tools.lua @@ -0,0 +1,29 @@ +-- Neovim plugin for Elixir +-- https://github.com/elixir-tools/elixir-tools.nvim +return { + "elixir-tools.nvim", + events = { "BufReadPre", "BufNewFile" }, + after = function() + local elixir = require("elixir") + local elixirls = require("elixir.elixirls") + + elixir.setup({ + nextls = { enable = true }, + elixirls = { + enable = true, + settings = elixirls.settings({ + dialyzerEnabled = false, + enableTestLenses = false, + }), + on_attach = function(client, bufnr) + vim.keymap.set("n", "fp", ":ElixirFromPipe", { buffer = true, noremap = true }) + vim.keymap.set("n", "tp", ":ElixirToPipe", { buffer = true, noremap = true }) + vim.keymap.set("v", "em", ":ElixirExpandMacro", { buffer = true, noremap = true }) + end, + }, + projectionist = { + enable = true, + }, + }) + end, +} -- 2.49.0 From a99d8c1f55d1faca85e844eac13243e6082ca5e1 Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Mon, 10 Nov 2025 22:20:41 +0100 Subject: [PATCH 08/16] +use/assist (nix-output-monitor): add to developing profile --- home-manager/profiles/developing.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/profiles/developing.nix b/home-manager/profiles/developing.nix index c421b33..ce5cc0a 100644 --- a/home-manager/profiles/developing.nix +++ b/home-manager/profiles/developing.nix @@ -31,6 +31,7 @@ pkgs.neofetch pkgs.nix-prefetch-git pkgs.nixpkgs-review + pkgs.nom # nix-output-monitor pkgs.pastebinit pkgs.patchelf pkgs.pax-utils -- 2.49.0 From 47962e664503b535ec5c23bcb7b0a88989aa627e Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Mon, 10 Nov 2025 22:51:10 +0100 Subject: [PATCH 09/16] +use/assist (bmon): add to essential profile --- home-manager/profiles/essential.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/profiles/essential.nix b/home-manager/profiles/essential.nix index e2a8a04..9316d9f 100644 --- a/home-manager/profiles/essential.nix +++ b/home-manager/profiles/essential.nix @@ -19,6 +19,7 @@ pkgs.audit pkgs.binutils pkgs.bmon + pkgs.btop pkgs.cryptsetup pkgs.direnv pkgs.dislocker -- 2.49.0 From 34b7ee33d89bdb474392f6c55b3adb3d2558b05a Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Mon, 10 Nov 2025 22:54:33 +0100 Subject: [PATCH 10/16] -sec/confid +use/op (nan2gua1/firefox): allow gvfs --- homes/julm/hosts/nan2gua1.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/homes/julm/hosts/nan2gua1.nix b/homes/julm/hosts/nan2gua1.nix index 20bcd38..f2d9b2c 100644 --- a/homes/julm/hosts/nan2gua1.nix +++ b/homes/julm/hosts/nan2gua1.nix @@ -202,6 +202,9 @@ # For convenience when downloading "--whitelist=\\\${HOME}/docs" + # Enable to browse file:///run/user/1000/gvfs/ + "--whitelist=\\\${RUNUSER}/gvfs" + "--profile=${pkgs.firejail}/etc/firejail/firefox.profile" ]; -- 2.49.0 From 8de405c5b47746f216aa273db4fcd38be7ec9a6a Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Mon, 10 Nov 2025 23:32:14 +0100 Subject: [PATCH 11/16] -rely/stable +use/op (jujutsu,jj): pull from pkgs-unstable --- home-manager/profiles/git.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/home-manager/profiles/git.nix b/home-manager/profiles/git.nix index 4780101..2098bea 100644 --- a/home-manager/profiles/git.nix +++ b/home-manager/profiles/git.nix @@ -1,5 +1,6 @@ { pkgs, + pkgs-unstable, lib, config, ... @@ -20,8 +21,8 @@ #pkgs.git-publish pkgs.git-quick-stats pkgs.gitui - pkgs.jjui - pkgs.jujutsu + pkgs-unstable.jjui + pkgs-unstable.jujutsu pkgs.tig ]; programs.git = { -- 2.49.0 From e52b0bb198bcaefdc4b70be84edb708976ef263a Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Tue, 11 Nov 2025 02:04:40 +0100 Subject: [PATCH 12/16] fixup! +use/assist (nix-output-monitor): add to developing profile --- home-manager/profiles/developing.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/profiles/developing.nix b/home-manager/profiles/developing.nix index ce5cc0a..0962c29 100644 --- a/home-manager/profiles/developing.nix +++ b/home-manager/profiles/developing.nix @@ -29,9 +29,9 @@ pkgs.libxml2.bin pkgs.mailutils pkgs.neofetch + pkgs.nix-output-monitor pkgs.nix-prefetch-git pkgs.nixpkgs-review - pkgs.nom # nix-output-monitor pkgs.pastebinit pkgs.patchelf pkgs.pax-utils -- 2.49.0 From 5034fe3e9a692b338d6c44cc922e7676a4e7e2e5 Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Fri, 14 Nov 2025 03:05:18 +0100 Subject: [PATCH 13/16] blackberry: disable LIBGL for ghostty --- hosts/blackberry/hardware.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hosts/blackberry/hardware.nix b/hosts/blackberry/hardware.nix index ae077bc..d53a1d7 100644 --- a/hosts/blackberry/hardware.nix +++ b/hosts/blackberry/hardware.nix @@ -97,6 +97,7 @@ environment.variables = { # Workaround https://github.com/ghostty-org/ghostty/issues/2025#issuecomment-2563222225 - GDK_DEBUG = "gl-disable-gles"; + #GDK_DEBUG = "gl-disable-gles"; + LIBGL_ALWAYS_SOFTWARE = "true"; }; } -- 2.49.0 From 841cb493a7bc2c2042ff6c33902830d33cdb7a4b Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Fri, 14 Nov 2025 20:20:31 +0100 Subject: [PATCH 14/16] +use/op(nvim): set whichwrap --- home-manager/profiles/nvim/lua/config/options.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/profiles/nvim/lua/config/options.lua b/home-manager/profiles/nvim/lua/config/options.lua index 99d9494..8f0d85f 100644 --- a/home-manager/profiles/nvim/lua/config/options.lua +++ b/home-manager/profiles/nvim/lua/config/options.lua @@ -47,6 +47,7 @@ vim.o.undofile = true vim.o.undolevels = 1000 vim.o.updatetime = 300 vim.o.visualbell = false +vim.o.whichwrap = "b,s,<,>,[,]" vim.o.wildmode = "list:longest,full" vim.o.wrap = true vim.o.wrapscan = false -- 2.49.0 From 0ac851b3681ca263e50be130102c11d03c4bb8ca Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Sun, 16 Nov 2025 21:11:31 +0100 Subject: [PATCH 15/16] +use/op(aria2): enable companion tools --- home-manager/profiles/aria2c.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/home-manager/profiles/aria2c.nix b/home-manager/profiles/aria2c.nix index a4c0575..b963141 100644 --- a/home-manager/profiles/aria2c.nix +++ b/home-manager/profiles/aria2c.nix @@ -1,6 +1,10 @@ { pkgs, ... }: { - home.packages = [ pkgs.aria2 ]; + home.packages = [ + pkgs.aria2 + pkgs.proxychains-ng + pkgs.python3Packages.aria2p + ]; xdg.configFile."aria2/aria2.conf".text = '' continue=true # Usually not great for compression by the filesystem (ZFS/Btrfs). -- 2.49.0 From 8457a7cf9195fb000349078ade615495cf421d4f Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Sat, 22 Nov 2025 19:19:26 +0100 Subject: [PATCH 16/16] +use/op(nvim): add plugin jj-diffconflicts --- flake.lock | 17 +++++++++++++++++ flake.nix | 4 ++++ home-manager/profiles/nvim.nix | 5 +++++ .../nvim/lua/plugins/jj-diffconflicts.lua | 9 +++++++++ 4 files changed, 35 insertions(+) create mode 100644 home-manager/profiles/nvim/lua/plugins/jj-diffconflicts.lua diff --git a/flake.lock b/flake.lock index 2232ed3..7719b84 100644 --- a/flake.lock +++ b/flake.lock @@ -132,6 +132,22 @@ "type": "github" } }, + "jj-diffconflicts": { + "flake": false, + "locked": { + "lastModified": 1761262087, + "narHash": "sha256-FXsLSYy+eli8VArUL8ZOiPtyOk4Q8TUYwobEefZPRII=", + "owner": "rafikdraoui", + "repo": "jj-diffconflicts", + "rev": "bee239e847cf336fc10925a35c65052f41aa89e3", + "type": "github" + }, + "original": { + "owner": "rafikdraoui", + "repo": "jj-diffconflicts", + "type": "github" + } + }, "jj-nvim": { "flake": false, "locked": { @@ -244,6 +260,7 @@ "inputs": { "git-hooks": "git-hooks", "home-manager": "home-manager", + "jj-diffconflicts": "jj-diffconflicts", "jj-nvim": "jj-nvim", "lanzaboote": "lanzaboote", "nixos-hardware": "nixos-hardware", diff --git a/flake.nix b/flake.nix index b5224d6..728e74e 100644 --- a/flake.nix +++ b/flake.nix @@ -16,6 +16,10 @@ doom-emacs.flake = false; doom-emacs.url = "github:hlissner/doom-emacs"; */ + jj-diffconflicts = { + url = "github:rafikdraoui/jj-diffconflicts"; + flake = false; + }; jj-nvim = { url = "github:NicolasGB/jj.nvim"; flake = false; diff --git a/home-manager/profiles/nvim.nix b/home-manager/profiles/nvim.nix index d594d4b..07a613f 100644 --- a/home-manager/profiles/nvim.nix +++ b/home-manager/profiles/nvim.nix @@ -59,6 +59,11 @@ in pkgs.vimPlugins.gitlinker-nvim pkgs.vimPlugins.gitsigns-nvim pkgs.vimPlugins.haskell-tools-nvim + (pkgs.vimUtils.buildVimPlugin { + pname = "jj-diffconflicts.nvim"; + version = "main"; + src = inputs.jj-diffconflicts; + }) pkgs.vimPlugins.elixir-tools-nvim pkgs.vimPlugins.hunk-nvim pkgs.vimPlugins.image-nvim diff --git a/home-manager/profiles/nvim/lua/plugins/jj-diffconflicts.lua b/home-manager/profiles/nvim/lua/plugins/jj-diffconflicts.lua new file mode 100644 index 0000000..eb8024e --- /dev/null +++ b/home-manager/profiles/nvim/lua/plugins/jj-diffconflicts.lua @@ -0,0 +1,9 @@ +-- A conflict resolution merge tool for Jujutsu VCS that runs in Neovim +-- https://github.com/rafikdraoui/jj-diffconflicts +return { + "jj-diffconflicts.nvim", + cmd = { "JJDiffConflicts" }, + after = function() + require("jj-diffconflicts") + end, +} -- 2.49.0