diff --git a/flake.lock b/flake.lock index 44d4a9c..2e9fec2 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1712279577, - "narHash": "sha256-Bwn4rmQi2L2iX6g3ycQMA4baE3zgPHAO0xPBpr2T4/k=", + "lastModified": 1714264490, + "narHash": "sha256-5hKsAO7ZLwOLCXeI5+jDmDr7t4zBezk0xidVWghoBB0=", "owner": "tpwrules", "repo": "nixos-apple-silicon", - "rev": "d47afc3f0f8b3078c818da8609c41340af61a2ec", + "rev": "4fac534b775aa0c40611257fa19ab8ab3243f4dc", "type": "github" }, "original": { @@ -27,11 +27,11 @@ ] }, "locked": { - "lastModified": 1711763326, - "narHash": "sha256-sXcesZWKXFlEQ8oyGHnfk4xc9f2Ip0X/+YZOq3sKviI=", + "lastModified": 1713946171, + "narHash": "sha256-lc75rgRQLdp4Dzogv5cfqOg6qYc5Rp83oedF2t0kDp8=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "36524adc31566655f2f4d55ad6b875fb5c1a4083", + "rev": "230a197063de9287128e2c68a7a4b0cd7d0b50a7", "type": "github" }, "original": { @@ -50,11 +50,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1712941527, - "narHash": "sha256-wD9XQFGW0qzRW1YHj6oklCHzgKNxjwS0tZ/hFGgiHX4=", + "lastModified": 1714755945, + "narHash": "sha256-N44WGoXubIaUwrlc7N2XIkS8pzxprWfyWHWBI1en1kM=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "9f4406718ada7af83892e17355ef7fd202c20897", + "rev": "d72860d651e27709884a8a2ef85f1e99e5eae21c", "type": "github" }, "original": { @@ -102,11 +102,11 @@ ] }, "locked": { - "lastModified": 1712014858, - "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", + "lastModified": 1714641030, + "narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", + "rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e", "type": "github" }, "original": { @@ -124,11 +124,11 @@ ] }, "locked": { - "lastModified": 1709336216, - "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", + "lastModified": 1712014858, + "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", + "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", "type": "github" }, "original": { @@ -159,11 +159,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -199,11 +199,11 @@ ] }, "locked": { - "lastModified": 1710478346, - "narHash": "sha256-Xjf8BdnQG0tLhPMlqQdwCIjOp7Teox0DP3N/jjyiGM4=", + "lastModified": 1713898448, + "narHash": "sha256-6q6ojsp/Z9P2goqnxyfCSzFOD92T3Uobmj8oVAicUOs=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "64e7763d72c1e4c1e5e6472640615b6ae2d40fbf", + "rev": "c0302ec12d569532a6b6bd218f698bc402e93adc", "type": "github" }, "original": { @@ -219,11 +219,11 @@ ] }, "locked": { - "lastModified": 1712759992, - "narHash": "sha256-2APpO3ZW4idlgtlb8hB04u/rmIcKA8O7pYqxF66xbNY=", + "lastModified": 1714679908, + "narHash": "sha256-KzcXzDvDJjX34en8f3Zimm396x6idbt+cu4tWDVS2FI=", "owner": "nix-community", "repo": "home-manager", - "rev": "31357486b0ef6f4e161e002b6893eeb4fafc3ca9", + "rev": "9036fe9ef8e15a819fa76f47a8b1f287903fb848", "type": "github" }, "original": { @@ -254,11 +254,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1712877603, - "narHash": "sha256-8JesAgnsv1bD+xHNoqefz0Gv243wSiCKnzh4rhZLopU=", + "lastModified": 1714683427, + "narHash": "sha256-SMfFU+VsRTZLVIkGpf67oOTZ29gWmFvxF0nGO6CRx/4=", "owner": "neovim", "repo": "neovim", - "rev": "18ee9f9e7dbbc9709ee9c1572870b4ad31443569", + "rev": "01e4a70d668d54a7cefa3ff53ec97e39df516265", "type": "github" }, "original": { @@ -279,11 +279,11 @@ ] }, "locked": { - "lastModified": 1712880226, - "narHash": "sha256-2CGLzsFft8zF/gEY4qDN0uAjRCWUqvNJ9yV118NlzTg=", + "lastModified": 1714694802, + "narHash": "sha256-b0+Zrd2PDgRIEeeXbivzw3kcSaXCZItOvgOgdfRsyOo=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "58d367a1924bf0d02bcc5bd2c5af8ac97f178381", + "rev": "9b2c33c7fa0287db93868d955e7b3d0da3837a57", "type": "github" }, "original": { @@ -294,27 +294,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1712163089, - "narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=", + "lastModified": 1714076141, + "narHash": "sha256-Drmja/f5MRHZCskS6mvzFqxEaZMeciScCTFxWVLqWEY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fd281bd6b7d3e32ddfa399853946f782553163b5", + "rev": "7bb2ccd8cdc44c91edba16c48d2c8f331fb3d856", "type": "github" }, "original": { "owner": "nixos", "repo": "nixpkgs", - "rev": "fd281bd6b7d3e32ddfa399853946f782553163b5", + "rev": "7bb2ccd8cdc44c91edba16c48d2c8f331fb3d856", "type": "github" } }, "nixpkgs-stable": { "locked": { - "lastModified": 1712741485, - "narHash": "sha256-bCs0+MSTra80oXAsnM6Oq62WsirOIaijQ/BbUY59tR4=", + "lastModified": 1714531828, + "narHash": "sha256-ILsf3bdY/hNNI/Hu5bSt2/KbmHaAVhBbNUOdGztTHEg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b2cf36f43f9ef2ded5711b30b1f393ac423d8f72", + "rev": "0638fe2715d998fa81d173aad264eb671ce2ebc1", "type": "github" }, "original": { @@ -326,11 +326,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1712849433, - "narHash": "sha256-flQtf/ZPJgkLY/So3Fd+dGilw2DKIsiwgMEn7BbBHL0=", + "lastModified": 1714656196, + "narHash": "sha256-kjQkA98lMcsom6Gbhw8SYzmwrSo+2nruiTcTZp5jK7o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f173d0881eff3b21ebb29a2ef8bedbc106c86ea5", + "rev": "94035b482d181af0a0f8f77823a790b256b7c3cc", "type": "github" }, "original": { diff --git a/home-manager/nvim/ionide-vim.lua b/home-manager/nvim/ionide-vim.lua index 1e33b51..539db58 100644 --- a/home-manager/nvim/ionide-vim.lua +++ b/home-manager/nvim/ionide-vim.lua @@ -2,23 +2,6 @@ vim.g["fsharp#fsautocomplete_command"] = { "fsautocomplete" } vim.g["fsharp#show_signature_on_cursor_move"] = 1 vim.g["fsharp#fsi_keymap"] = "none" --- MASSIVE HACK - raised https://github.com/ionide/Ionide-vim/pull/78 -local function captureLoadedProjects() - vim.fn.execute("redir => g:massive_hack_patrick_capture") - vim.fn.execute("call fsharp#showLoadedProjects()") - vim.fn.execute("redir END") - local output = vim.fn.eval("g:massive_hack_patrick_capture") - - local projects = {} - - for line in output:gmatch("[^\r\n]+") do - local project = line:gsub("^%s*-%s*", "") - table.insert(projects, project) - end - - return projects -end - -- Supply nil to get all loaded F# projects and build them. local function BuildFSharpProjects(projects) local function on_line(data, _, context) @@ -76,7 +59,7 @@ local function BuildFSharpProjects(projects) end if not projects then - projects = captureLoadedProjects() + projects = vim.fn['fsharp#getLoadedProjects']() end if projects then local total_projects = 0 @@ -107,7 +90,7 @@ vim.api.nvim_create_user_command("BuildFSharpProject", function(opts) .new({}, { prompt_title = "Projects", finder = finders.new_table({ - results = captureLoadedProjects(), + results = vim.fn['fsharp#getLoadedProjects'](), }), sorter = conf.generic_sorter({}), attach_mappings = function(prompt_buf, _) @@ -173,7 +156,7 @@ vim.api.nvim_create_user_command("RunFSharpProject", function(opts) .new({}, { prompt_title = "Projects", finder = finders.new_table({ - results = captureLoadedProjects(), + results = vim.fn['fsharp#getLoadedProjects'](), }), sorter = conf.generic_sorter({}), attach_mappings = function(prompt_buf, _) @@ -202,7 +185,7 @@ vim.api.nvim_create_user_command("PublishFSharpProject", function(opts) .new({}, { prompt_title = "Projects", finder = finders.new_table({ - results = captureLoadedProjects(), + results = vim.fn['fsharp#getLoadedProjects'](), }), sorter = conf.generic_sorter({}), attach_mappings = function(prompt_buf, _)