some small nvim changes · hyl.st/helm@baa309e

+191

flake.lock

··· 299 299 "type": "github" 300 300 } 301 301 }, 302 + "flake-compat_4": { 303 + "flake": false, 304 + "locked": { 305 + "lastModified": 1751685974, 306 + "narHash": "sha256-NKw96t+BgHIYzHUjkTK95FqYRVKB8DHpVhefWSz/kTw=", 307 + "rev": "549f2762aebeff29a2e5ece7a7dc0f955281a1d1", 308 + "type": "tarball", 309 + "url": "https://git.lix.systems/api/v1/repos/lix-project/flake-compat/archive/549f2762aebeff29a2e5ece7a7dc0f955281a1d1.tar.gz?rev=549f2762aebeff29a2e5ece7a7dc0f955281a1d1" 310 + }, 311 + "original": { 312 + "type": "tarball", 313 + "url": "https://git.lix.systems/lix-project/flake-compat/archive/main.tar.gz" 314 + } 315 + }, 302 316 "flake-parts": { 303 317 "inputs": { 304 318 "nixpkgs-lib": "nixpkgs-lib" ··· 417 431 "type": "github" 418 432 } 419 433 }, 434 + "flake-utils_5": { 435 + "inputs": { 436 + "systems": "systems_5" 437 + }, 438 + "locked": { 439 + "lastModified": 1694529238, 440 + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", 441 + "owner": "numtide", 442 + "repo": "flake-utils", 443 + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", 444 + "type": "github" 445 + }, 446 + "original": { 447 + "owner": "numtide", 448 + "repo": "flake-utils", 449 + "type": "github" 450 + } 451 + }, 420 452 "gitignore": { 421 453 "inputs": { 422 454 "nixpkgs": [ ··· 440 472 "type": "github" 441 473 } 442 474 }, 475 + "gomod2nix": { 476 + "inputs": { 477 + "flake-utils": "flake-utils_5", 478 + "nixpkgs": [ 479 + "tangled", 480 + "nixpkgs" 481 + ] 482 + }, 483 + "locked": { 484 + "lastModified": 1754078208, 485 + "narHash": "sha256-YVoIFDCDpYuU3riaDEJ3xiGdPOtsx4sR5eTzHTytPV8=", 486 + "owner": "nix-community", 487 + "repo": "gomod2nix", 488 + "rev": "7f963246a71626c7fc70b431a315c4388a0c95cf", 489 + "type": "github" 490 + }, 491 + "original": { 492 + "owner": "nix-community", 493 + "repo": "gomod2nix", 494 + "type": "github" 495 + } 496 + }, 443 497 "grasp": { 444 498 "inputs": { 445 499 "flake-utils": "flake-utils_4", ··· 567 621 "type": "github" 568 622 } 569 623 }, 624 + "htmx-src": { 625 + "flake": false, 626 + "locked": { 627 + "narHash": "sha256-nm6avZuEBg67SSyyZUhjpXVNstHHgUxrtBHqJgowU08=", 628 + "type": "file", 629 + "url": "https://unpkg.com/htmx.org@2.0.4/dist/htmx.min.js" 630 + }, 631 + "original": { 632 + "type": "file", 633 + "url": "https://unpkg.com/htmx.org@2.0.4/dist/htmx.min.js" 634 + } 635 + }, 636 + "htmx-ws-src": { 637 + "flake": false, 638 + "locked": { 639 + "narHash": "sha256-2fg6KyEJoO24q0fQqbz9RMaYNPQrMwpZh29tkSqdqGY=", 640 + "type": "file", 641 + "url": "https://cdn.jsdelivr.net/npm/htmx-ext-ws@2.0.2" 642 + }, 643 + "original": { 644 + "type": "file", 645 + "url": "https://cdn.jsdelivr.net/npm/htmx-ext-ws@2.0.2" 646 + } 647 + }, 648 + "ibm-plex-mono-src": { 649 + "flake": false, 650 + "locked": { 651 + "lastModified": 1731402384, 652 + "narHash": "sha256-OwUmrPfEehLDz0fl2ChYLK8FQM2p0G1+EMrGsYEq+6g=", 653 + "type": "tarball", 654 + "url": "https://github.com/IBM/plex/releases/download/@ibm/plex-mono@1.1.0/ibm-plex-mono.zip" 655 + }, 656 + "original": { 657 + "type": "tarball", 658 + "url": "https://github.com/IBM/plex/releases/download/@ibm/plex-mono@1.1.0/ibm-plex-mono.zip" 659 + } 660 + }, 661 + "indigo": { 662 + "flake": false, 663 + "locked": { 664 + "lastModified": 1753693716, 665 + "narHash": "sha256-DMIKnCJRODQXEHUxA+7mLzRALmnZhkkbHlFT2rCQYrE=", 666 + "owner": "oppiliappan", 667 + "repo": "indigo", 668 + "rev": "5f170569da9360f57add450a278d73538092d8ca", 669 + "type": "github" 670 + }, 671 + "original": { 672 + "owner": "oppiliappan", 673 + "repo": "indigo", 674 + "type": "github" 675 + } 676 + }, 677 + "inter-fonts-src": { 678 + "flake": false, 679 + "locked": { 680 + "lastModified": 1731687360, 681 + "narHash": "sha256-5vdKKvHAeZi6igrfpbOdhZlDX2/5+UvzlnCQV6DdqoQ=", 682 + "type": "tarball", 683 + "url": "https://github.com/rsms/inter/releases/download/v4.1/Inter-4.1.zip" 684 + }, 685 + "original": { 686 + "type": "tarball", 687 + "url": "https://github.com/rsms/inter/releases/download/v4.1/Inter-4.1.zip" 688 + } 689 + }, 570 690 "jovian": { 571 691 "inputs": { 572 692 "nix-github-actions": "nix-github-actions", ··· 602 722 "owner": "kristapsdz", 603 723 "repo": "lowdown", 604 724 "type": "github" 725 + } 726 + }, 727 + "lucide-src": { 728 + "flake": false, 729 + "locked": { 730 + "lastModified": 1754044466, 731 + "narHash": "sha256-+exBR2OToB1iv7ZQI2S4B0lXA/QRvC9n6U99UxGpJGs=", 732 + "type": "tarball", 733 + "url": "https://github.com/lucide-icons/lucide/releases/download/0.536.0/lucide-icons-0.536.0.zip" 734 + }, 735 + "original": { 736 + "type": "tarball", 737 + "url": "https://github.com/lucide-icons/lucide/releases/download/0.536.0/lucide-icons-0.536.0.zip" 605 738 } 606 739 }, 607 740 "mk-shell-bin": { ··· 980 1113 "nur": "nur", 981 1114 "poonam": "poonam", 982 1115 "rust-overlay": "rust-overlay", 1116 + "tangled": "tangled", 983 1117 "tidalcycles": "tidalcycles", 984 1118 "unstable": "unstable", 985 1119 "vimwikicli": "vimwikicli" ··· 1020 1154 "owner": "oxalica", 1021 1155 "repo": "rust-overlay", 1022 1156 "type": "github" 1157 + } 1158 + }, 1159 + "sqlite-lib-src": { 1160 + "flake": false, 1161 + "locked": { 1162 + "lastModified": 1706631843, 1163 + "narHash": "sha256-bJoMjirsBjm2Qk9KPiy3yV3+8b/POlYe76/FQbciHro=", 1164 + "type": "tarball", 1165 + "url": "https://sqlite.org/2024/sqlite-amalgamation-3450100.zip" 1166 + }, 1167 + "original": { 1168 + "type": "tarball", 1169 + "url": "https://sqlite.org/2024/sqlite-amalgamation-3450100.zip" 1023 1170 } 1024 1171 }, 1025 1172 "superdirt-src": { ··· 1096 1243 "owner": "nix-systems", 1097 1244 "repo": "default", 1098 1245 "type": "github" 1246 + } 1247 + }, 1248 + "systems_5": { 1249 + "locked": { 1250 + "lastModified": 1681028828, 1251 + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", 1252 + "owner": "nix-systems", 1253 + "repo": "default", 1254 + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", 1255 + "type": "github" 1256 + }, 1257 + "original": { 1258 + "owner": "nix-systems", 1259 + "repo": "default", 1260 + "type": "github" 1261 + } 1262 + }, 1263 + "tangled": { 1264 + "inputs": { 1265 + "flake-compat": "flake-compat_4", 1266 + "gomod2nix": "gomod2nix", 1267 + "htmx-src": "htmx-src", 1268 + "htmx-ws-src": "htmx-ws-src", 1269 + "ibm-plex-mono-src": "ibm-plex-mono-src", 1270 + "indigo": "indigo", 1271 + "inter-fonts-src": "inter-fonts-src", 1272 + "lucide-src": "lucide-src", 1273 + "nixpkgs": [ 1274 + "nixpkgs" 1275 + ], 1276 + "sqlite-lib-src": "sqlite-lib-src" 1277 + }, 1278 + "locked": { 1279 + "lastModified": 1759559279, 1280 + "narHash": "sha256-gA0mh9Fx2uou2v75RMA6qUvWB3Z74Asc6pRjiojwaRo=", 1281 + "ref": "refs/heads/master", 1282 + "rev": "5ecd54b31547ac169a3b15d6034a67179f22aa33", 1283 + "revCount": 1486, 1284 + "type": "git", 1285 + "url": "https://tangled.org/@tangled.org/core" 1286 + }, 1287 + "original": { 1288 + "type": "git", 1289 + "url": "https://tangled.org/@tangled.org/core" 1099 1290 } 1100 1291 }, 1101 1292 "tidal-src": {

+8 -1

flake.nix

··· 65 65 inputs.nixpkgs.follows = "unstable"; 66 66 }; 67 67 68 + # Tangled (atproto tools) 69 + tangled = { 70 + url = "git+https://tangled.org/@tangled.org/core"; 71 + inputs.nixpkgs.follows = "nixpkgs"; 72 + }; 73 + 68 74 # Others 69 75 nur.url = "github:nix-community/NUR"; 70 76 rust-overlay = { ··· 89 95 outputs = { self, nixpkgs, unstable, nixos-hardware, home-manager, deploy-rs 90 96 , agenix, disko, basant, grasp, nix-matrix-appservices, nur, tidalcycles 91 97 , rust-overlay, vimwikicli, autohide-tdrop, darwin, nix-homebrew, homebrew-bundle 92 - , homebrew-core, homebrew-cask, jovian, ... }@inputs: 98 + , homebrew-core, homebrew-cask, jovian, tangled, ... }@inputs: 93 99 let 94 100 forAllSystems = nixpkgs.lib.genAttrs [ 95 101 "aarch64-linux" ··· 147 153 # ]; 148 154 overlays = [ 149 155 agenix.overlays.default 156 + tangled.overlays.default # atproto tools only on lite deployments 150 157 self.overlays.additions 151 158 self.overlays.modifications 152 159 tidalcycles.overlays.default # needed for nvim which comes pre-installed lol

+117

home/profiles/nvim/default.nix

··· 228 228 nnoremap <leader>fb <cmd>Telescope buffers<cr> 229 229 nnoremap <leader>fh <cmd>Telescope help_tags<cr> 230 230 nnoremap <leader>ft <cmd>Telescope tags<cr> 231 + nnoremap <leader>fr <cmd>lua KitaabRecent()<cr> 231 232 232 233 " exit normal mode in terminal 233 234 :tnoremap <C-n> <C-\><C-n> ··· 975 976 vim.keymap.set('n', '<M-S-k>', '<Cmd>resize +2<CR>', {silent = true}) 976 977 vim.keymap.set('n', '<M-S-l>', '<Cmd>vertical resize +2<CR>', {silent = true}) 977 978 979 + -- Kitaab recent files (only date-based files, sorted reverse) 980 + function KitaabRecent() 981 + local pickers = require('telescope.pickers') 982 + local finders = require('telescope.finders') 983 + local conf = require('telescope.config').values 984 + 985 + -- Use current working directory 986 + local kitaab_path = vim.fn.getcwd() 987 + 988 + -- Get all files (depth 1, exclude directories) 989 + local files = vim.fn.readdir(kitaab_path, function(name) 990 + return vim.fn.isdirectory(kitaab_path .. '/' .. name) == 0 991 + end) 992 + 993 + -- Filter to only date-based files (starting with digit) 994 + local date_files = {} 995 + for _, filename in ipairs(files) do 996 + if filename:match('^%d') then 997 + table.insert(date_files, filename) 998 + end 999 + end 1000 + 1001 + -- Sort in reverse (most recent first) 1002 + table.sort(date_files, function(a, b) return a > b end) 1003 + 1004 + pickers.new({}, { 1005 + prompt_title = 'Kitaab Recent', 1006 + finder = finders.new_table({ 1007 + results = date_files, 1008 + entry_maker = function(entry) 1009 + return { 1010 + value = kitaab_path .. '/' .. entry, 1011 + display = entry, 1012 + ordinal = entry, 1013 + path = kitaab_path .. '/' .. entry, 1014 + } 1015 + end 1016 + }), 1017 + previewer = conf.file_previewer({}), 1018 + sorter = conf.generic_sorter({}), 1019 + }):find() 1020 + end 1021 + 1022 + -- Setup amp.nvim 1023 + require('amp').setup({ 1024 + auto_start = true, 1025 + log_level = "info" 1026 + }) 1027 + 1028 + -- Amp commands 1029 + vim.api.nvim_create_user_command("AmpSend", function(opts) 1030 + local message = opts.args 1031 + if message == "" then 1032 + print("Please provide a message to send") 1033 + return 1034 + end 1035 + local amp_message = require("amp.message") 1036 + amp_message.send_message(message) 1037 + end, { 1038 + nargs = "*", 1039 + desc = "Send a message to Amp", 1040 + }) 1041 + 1042 + vim.api.nvim_create_user_command("AmpSendBuffer", function(opts) 1043 + local buf = vim.api.nvim_get_current_buf() 1044 + local lines = vim.api.nvim_buf_get_lines(buf, 0, -1, false) 1045 + local content = table.concat(lines, "\n") 1046 + local amp_message = require("amp.message") 1047 + amp_message.send_message(content) 1048 + end, { 1049 + nargs = "?", 1050 + desc = "Send current buffer contents to Amp", 1051 + }) 1052 + 1053 + vim.api.nvim_create_user_command("AmpPromptSelection", function(opts) 1054 + local lines = vim.api.nvim_buf_get_lines(0, opts.line1 - 1, opts.line2, false) 1055 + local text = table.concat(lines, "\n") 1056 + local amp_message = require("amp.message") 1057 + amp_message.send_to_prompt(text) 1058 + end, { 1059 + range = true, 1060 + desc = "Add selected text to Amp prompt", 1061 + }) 1062 + 1063 + vim.api.nvim_create_user_command("AmpPromptRef", function(opts) 1064 + local bufname = vim.api.nvim_buf_get_name(0) 1065 + if bufname == "" then 1066 + print("Current buffer has no filename") 1067 + return 1068 + end 1069 + local relative_path = vim.fn.fnamemodify(bufname, ":.") 1070 + local ref = "@" .. relative_path 1071 + if opts.line1 ~= opts.line2 then 1072 + ref = ref .. "#L" .. opts.line1 .. "-" .. opts.line2 1073 + elseif opts.line1 > 1 then 1074 + ref = ref .. "#L" .. opts.line1 1075 + end 1076 + local amp_message = require("amp.message") 1077 + amp_message.send_to_prompt(ref) 1078 + end, { 1079 + range = true, 1080 + desc = "Add file reference (with selection) to Amp prompt", 1081 + }) 1082 + 978 1083 EOF 979 1084 980 1085 ''; ··· 1093 1198 yuck-vim 1094 1199 nvim-parinfer 1095 1200 # vim-processing 1201 + 1202 + # amp.nvim for Sourcegraph Amp integration 1203 + (pkgs.vimUtils.buildVimPlugin { 1204 + name = "amp-nvim"; 1205 + src = pkgs.fetchFromGitHub { 1206 + owner = "sourcegraph"; 1207 + repo = "amp.nvim"; 1208 + rev = "main"; 1209 + sha256 = "1n6d8nbakyg6yiq8mhhrvmsp9z0zb8cb67820jsg3wl6vqd1vwv5"; 1210 + }; 1211 + }) 1096 1212 ]; 1097 1213 withPython3 = true; 1098 1214 extraPython3Packages = pkgs: with pkgs; [ tasklib six packaging ]; ··· 1100 1216 }; 1101 1217 } 1102 1218 1219 +

Configure Feed

Configure Feed