this repo has no description
2
fork

Configure Feed

Select the types of activity you want to include in your feed.

nvim: amp nvim

+51 -9
+6 -7
home/profiles/nvim/amp-plugin.nix
··· 1 1 { pkgs }: 2 2 3 - if pkgs.stdenv.isDarwin && builtins.pathExists /Users/anishlakhwara/usr/amp.nvim then 4 - pkgs.vimUtils.buildVimPlugin { 5 - pname = "amp-nvim"; 6 - version = "unstable"; 7 - src = /Users/anishlakhwara/usr/amp.nvim; 8 - } 9 - else null 3 + # Remove the conditional entirely for now to test 4 + pkgs.vimUtils.buildVimPlugin { 5 + pname = "amp-nvim"; 6 + version = "unstable"; 7 + src = /Users/anishlakhwara/usr/amp.nvim; 8 + }
+45 -2
home/profiles/nvim/default.nix
··· 141 141 142 142 extraConfig = '' 143 143 " so our custom files still get included 144 - set runtimepath+=/home/anish/.config/nvim/ 144 + " set runtimepath+=/home/anish/.config/nvim/ 145 145 set tabstop=2 146 146 set showmatch 147 147 set shiftwidth=2 ··· 290 290 nnoremap <leader>gp :Git! push<CR> 291 291 nnoremap <leader>gd :Gdiff<CR> 292 292 nnoremap <leader>gc :G commit -v -q %:p<CR> 293 + " diffview keybindings 294 + nnoremap <leader>do :DiffviewOpen<CR> 295 + nnoremap <leader>dc :DiffviewClose<CR> 296 + nnoremap <leader>dh :DiffviewFileHistory %<CR> 297 + nnoremap <leader>df :DiffviewFileHistory<CR> 293 298 294 299 " kitaab 295 300 "map <leader>cz :VimwikiIndex<CR>:ZettelNew ··· 464 469 465 470 466 471 vim.api.nvim_set_keymap('n', '<leader>vt', ':call v:lua.toggle_diagnostics()<CR>', {noremap = true, silent = true}) 472 + 473 + -- nicer diff view 474 + vim.opt.diffopt = {'internal', 'filler', 'closeoff', 'algorithm:patience', 'indent-heuristic'} 467 475 468 476 -- autopairs 469 477 require('nvim-autopairs').setup{} ··· 842 850 -- Setup amp.nvim 843 851 require('amp').setup({ 844 852 auto_start = true, 845 - log_level = "info" 853 + log_level = "info", 854 + completion_enabled = true 846 855 }) 856 + -- require('amp.completion').setup({ 857 + -- keymaps = { 858 + -- accept = "<C-y>", 859 + -- dismiss = "<C-n>", 860 + -- } 861 + -- }) 847 862 ''} 848 863 849 864 -- supercollider ··· 908 923 -- Open the code actions for a visual selection. 909 924 map("v", "<leader>za", ":'<,'>lua vim.lsp.buf.range_code_action()<CR>", opts) 910 925 926 + -- diffview setup 927 + require('diffview').setup{ 928 + use_icons = true, 929 + view = { 930 + default = { 931 + layout = "diff2_horizontal", 932 + }, 933 + merge_tool = { 934 + layout = "diff3_horizontal", 935 + disable_diagnostics = true, 936 + }, 937 + }, 938 + file_panel = { 939 + listing_style = "tree", 940 + win_config = { 941 + position = "left", 942 + width = 35, 943 + }, 944 + }, 945 + file_history_panel = { 946 + win_config = { 947 + position = "bottom", 948 + height = 16, 949 + }, 950 + }, 951 + } 952 + 911 953 -- zen mode 912 954 require('zen-mode').setup{ 913 955 window = { ··· 1078 1120 vim-fugitive 1079 1121 gitsigns-nvim 1080 1122 fzf-checkout-vim 1123 + diffview-nvim 1081 1124 1082 1125 # Clojure stuff 1083 1126 # conjure