From 8c48ef0b5b0af39d043a0a7feaf2257cc158c0af Mon Sep 17 00:00:00 2001 From: Anish Lakhwara Date: Tue, 30 Sep 2025 11:16:36 -0700 Subject: [PATCH] nvim: amp nvim --- home/profiles/nvim/amp-plugin.nix | 13 ++++----- home/profiles/nvim/default.nix | 47 +++++++++++++++++++++++++++++-- 2 files changed, 51 insertions(+), 9 deletions(-) diff --git a/home/profiles/nvim/amp-plugin.nix b/home/profiles/nvim/amp-plugin.nix index 3cf08002..91c177aa 100644 --- a/home/profiles/nvim/amp-plugin.nix +++ b/home/profiles/nvim/amp-plugin.nix @@ -1,9 +1,8 @@ { pkgs }: -if pkgs.stdenv.isDarwin && builtins.pathExists /Users/anishlakhwara/usr/amp.nvim then - pkgs.vimUtils.buildVimPlugin { - pname = "amp-nvim"; - version = "unstable"; - src = /Users/anishlakhwara/usr/amp.nvim; - } -else null +# Remove the conditional entirely for now to test +pkgs.vimUtils.buildVimPlugin { + pname = "amp-nvim"; + version = "unstable"; + src = /Users/anishlakhwara/usr/amp.nvim; +} diff --git a/home/profiles/nvim/default.nix b/home/profiles/nvim/default.nix index abbacb95..aec3459e 100644 --- a/home/profiles/nvim/default.nix +++ b/home/profiles/nvim/default.nix @@ -141,7 +141,7 @@ in extraConfig = '' " so our custom files still get included - set runtimepath+=/home/anish/.config/nvim/ + " set runtimepath+=/home/anish/.config/nvim/ set tabstop=2 set showmatch set shiftwidth=2 @@ -290,6 +290,11 @@ in nnoremap gp :Git! push nnoremap gd :Gdiff nnoremap gc :G commit -v -q %:p + " diffview keybindings + nnoremap do :DiffviewOpen + nnoremap dc :DiffviewClose + nnoremap dh :DiffviewFileHistory % + nnoremap df :DiffviewFileHistory " kitaab "map cz :VimwikiIndex:ZettelNew @@ -465,6 +470,9 @@ in vim.api.nvim_set_keymap('n', 'vt', ':call v:lua.toggle_diagnostics()', {noremap = true, silent = true}) + -- nicer diff view + vim.opt.diffopt = {'internal', 'filler', 'closeoff', 'algorithm:patience', 'indent-heuristic'} + -- autopairs require('nvim-autopairs').setup{} @@ -842,8 +850,15 @@ in -- Setup amp.nvim require('amp').setup({ auto_start = true, - log_level = "info" + log_level = "info", + completion_enabled = true }) + -- require('amp.completion').setup({ + -- keymaps = { + -- accept = "", + -- dismiss = "", + -- } + -- }) ''} -- supercollider @@ -908,6 +923,33 @@ in -- Open the code actions for a visual selection. map("v", "za", ":'<,'>lua vim.lsp.buf.range_code_action()", opts) + -- diffview setup + require('diffview').setup{ + use_icons = true, + view = { + default = { + layout = "diff2_horizontal", + }, + merge_tool = { + layout = "diff3_horizontal", + disable_diagnostics = true, + }, + }, + file_panel = { + listing_style = "tree", + win_config = { + position = "left", + width = 35, + }, + }, + file_history_panel = { + win_config = { + position = "bottom", + height = 16, + }, + }, + } + -- zen mode require('zen-mode').setup{ window = { @@ -1078,6 +1120,7 @@ in vim-fugitive gitsigns-nvim fzf-checkout-vim + diffview-nvim # Clojure stuff # conjure