From 7e33622f63ffd0d3a1e3906f27e2a838034b70c7 Mon Sep 17 00:00:00 2001 From: whoami Date: Thu, 20 Mar 2025 20:16:18 +0000 Subject: [PATCH 1/3] Add wsl windows interop for fish --- tools/fish/conf.d/winterop.fish | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 tools/fish/conf.d/winterop.fish diff --git a/tools/fish/conf.d/winterop.fish b/tools/fish/conf.d/winterop.fish new file mode 100644 index 0000000..52750e6 --- /dev/null +++ b/tools/fish/conf.d/winterop.fish @@ -0,0 +1,11 @@ +if command -v wslpath > /dev/null + function cdw + cd (wslpath -u $argv) + end + function zw + z (wslpath -u $argv) + end + alias psw="tasklist.exe" + alias killw="taskkill.exe" + alias winget="winget.exe" +end From 2b8f4faa48e139c7fcec2e956cc1f2ea55fa8789 Mon Sep 17 00:00:00 2001 From: whoami Date: Thu, 20 Mar 2025 20:18:20 +0000 Subject: [PATCH 2/3] Minor fix --- platforms/wsl/winterop.zsh | 5 --- tools/nvim/lua/config/servers.lua | 42 +++++++++++-------------- tools/nvim/lua/plugins/lsp.lua | 8 ++++- tools/nvim/lua/plugins/mod/nvim-cmp.lua | 1 + 4 files changed, 27 insertions(+), 29 deletions(-) diff --git a/platforms/wsl/winterop.zsh b/platforms/wsl/winterop.zsh index afa738b..10620ad 100644 --- a/platforms/wsl/winterop.zsh +++ b/platforms/wsl/winterop.zsh @@ -5,11 +5,6 @@ export FILE_EXPLORER="explorer.exe" # Directory Opus -alias clip="clip.exe" -alias clip="clip.exe" -alias paste='pwsh.exe -NoProfile -Command "Get-Clipboard"' -alias dark-mode='pwsh.exe -Command "dark-mode" 2>&1 /dev/null' -alias winfetch='pwsh.exe -NoProfile -Command "winfetch"' alias psw="tasklist.exe" alias killw="taskkill.exe" alias shutdownw="shutdown.exe /s /t 0" diff --git a/tools/nvim/lua/config/servers.lua b/tools/nvim/lua/config/servers.lua index 3508981..f4a3b1e 100644 --- a/tools/nvim/lua/config/servers.lua +++ b/tools/nvim/lua/config/servers.lua @@ -5,31 +5,27 @@ local M = {} -- Ensure that the following servers are installed and set -- Use :Mason to list all available servers M.servers = { - "ast_grep", - "bashls", -- Bash - "clangd", -- C/C++ - "cssls", -- CSS - "denols", -- Deno + "bashls", -- Bash + "clangd", -- C/C++ + "cssls", -- CSS -- "cmake", -- CMake - "eslint", -- JavaScript - "gopls", -- Go - "hls", -- Haskell - "html", -- HTML - "jsonls", -- JSON - "lua_ls", -- Lua + "eslint", -- JavaScript + "html", -- HTML + "jsonls", -- JSON + "lua_ls", -- Lua "markdown_oxide", -- Markdown - "omnisharp", -- C# & F# - "powershell_es", -- PowerShell - "pyright", -- Python - "rust_analyzer", -- Rust - "svelte", -- Svelte - "svlangserver", -- SystemVerilog - "tailwindcss", -- TailwindCSS - "taplo", -- TOML - "ts_ls", -- TypeScript - "vimls", -- vimscript - "yamlls", -- YAML - "beancount", -- Beancount + "omnisharp", -- C# & F# + "powershell_es", -- PowerShell + "pyright", -- Python + "rust_analyzer", -- Rust + "svelte", -- Svelte + "svlangserver", -- SystemVerilog + "tailwindcss", -- TailwindCSS + "taplo", -- TOML + "ts_ls", -- TypeScript + "vimls", -- vimscript + "yamlls", -- YAML + "beancount", -- Beancount } -- Configuration for each server defines here diff --git a/tools/nvim/lua/plugins/lsp.lua b/tools/nvim/lua/plugins/lsp.lua index 6f280fd..ae45372 100644 --- a/tools/nvim/lua/plugins/lsp.lua +++ b/tools/nvim/lua/plugins/lsp.lua @@ -25,7 +25,7 @@ return { require("luasnip").config.setup({ enable_autosnippets = true }) end, }, - { "williamboman/mason.nvim", config = true }, + { "williamboman/mason.nvim", config = true }, { "williamboman/mason-lspconfig.nvim", lazy = false, @@ -106,4 +106,10 @@ return { }, }, }, + { + "nvim-neorg/neorg", + lazy = false, -- Disable lazy loading as some `lazy.nvim` distributions set `lazy = true` by default + version = "*", -- Pin Neorg to the latest stable release + config = true, + } } diff --git a/tools/nvim/lua/plugins/mod/nvim-cmp.lua b/tools/nvim/lua/plugins/mod/nvim-cmp.lua index 8cabbf5..5390214 100644 --- a/tools/nvim/lua/plugins/mod/nvim-cmp.lua +++ b/tools/nvim/lua/plugins/mod/nvim-cmp.lua @@ -1,3 +1,4 @@ +-- FIXME: Completion not working on GNU/Linux local function set_keymaps(keymaps_cmp) local mappings = {} for _, map in ipairs(keymaps_cmp) do From c07b5eba414d061fc68919c849a2fc28b1395129 Mon Sep 17 00:00:00 2001 From: whoami Date: Thu, 10 Apr 2025 23:22:53 +0100 Subject: [PATCH 3/3] feat(wsl): Use wsl-notify-send --- platforms/wsl/winterop.zsh | 2 ++ tools/fish/conf.d/winterop.fish | 2 ++ 2 files changed, 4 insertions(+) diff --git a/platforms/wsl/winterop.zsh b/platforms/wsl/winterop.zsh index 10620ad..ed8c433 100644 --- a/platforms/wsl/winterop.zsh +++ b/platforms/wsl/winterop.zsh @@ -15,6 +15,8 @@ alias diskpart="diskpart.exe" alias winget="winget.exe" alias pastew='pwsh.exe -NoProfile -Command "Get-Clipboard"' alias ollama="ollama.exe" +# https://github.com/stuartleeks/wsl-notify-send +alias notify-send="wsl-notify-send.exe" # WSL open open() { diff --git a/tools/fish/conf.d/winterop.fish b/tools/fish/conf.d/winterop.fish index 52750e6..35c033d 100644 --- a/tools/fish/conf.d/winterop.fish +++ b/tools/fish/conf.d/winterop.fish @@ -8,4 +8,6 @@ if command -v wslpath > /dev/null alias psw="tasklist.exe" alias killw="taskkill.exe" alias winget="winget.exe" + # https://github.com/stuartleeks/wsl-notify-send + alias notify-send="wsl-notify-send.exe" end