diff --git a/flake.lock b/flake.lock index 5550a2c..cc9d1bd 100644 --- a/flake.lock +++ b/flake.lock @@ -40,11 +40,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1745432946, - "narHash": "sha256-6JNCfG67V5muUwEGdv5HmnbW6UlGrjcblVObvJCVXy4=", + "lastModified": 1744741087, + "narHash": "sha256-TzMey3Su7uNxUS5DOdDuk7tE2ULuzKhm233qHM8ObnA=", "owner": "Saghen", "repo": "blink.cmp", - "rev": "5d90bfc6245eb89b6c6f22f4fa3a7202df17cb24", + "rev": "e16586c49309c29f238e1068546e7ba64cc15a78", "type": "github" }, "original": { @@ -158,11 +158,11 @@ ] }, "locked": { - "lastModified": 1745427103, - "narHash": "sha256-J4v65MKoXt95nmCYr6a7Cdiyl9QmPp6u3+7aJ71zxbk=", + "lastModified": 1744812667, + "narHash": "sha256-2AJZwXMO82YGw6B/RRCPz8Wz2zSRCZIdjhdFuiw7Ymg=", "owner": "nix-community", "repo": "home-manager", - "rev": "6d1f834ca63700604a96d8c38aa8ac272d95071a", + "rev": "5d48f3ded3b55ef32d5853c9022fb4df29b3fc45", "type": "github" }, "original": { @@ -178,11 +178,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1744867268, - "narHash": "sha256-MZxEEq9FNJKtLg3Yz4e0Pf+8TRySj8xJ6vBszqt3fjg=", + "lastModified": 1736510643, + "narHash": "sha256-z6qvPOIr4Rl4wA6U5g8Aj3npdeTNiR3AXFIOy7e2IJs=", "owner": "hydractify", "repo": "hydractify-bot", - "rev": "263b8552a4dd161de58eb13dad93ec758718c828", + "rev": "69759c7adcb2102dbb8d3e8a657dc5a47686dc46", "type": "github" }, "original": { @@ -236,11 +236,11 @@ ] }, "locked": { - "lastModified": 1745015490, - "narHash": "sha256-apEJ9zoSzmslhJ2vOKFcXTMZLUFYzh1ghfB6Rbw3Low=", + "lastModified": 1743953322, + "narHash": "sha256-prQ5JKopXtzCMX2eT3dXbaVvGmzjMRE2bXStQDdazpM=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "60754910946b4e2dc1377b967b7156cb989c5873", + "rev": "9d7f2687c84c729afbc3b13f7937655570f2978d", "type": "github" }, "original": { @@ -265,11 +265,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1745328209, - "narHash": "sha256-eP3x+JNE1T6RjXhimaEnoc4GvNJcyzppW1vpAs287Zg=", + "lastModified": 1744807781, + "narHash": "sha256-zwLztVgpc0Txwvy662USwYVEKkNZiJd5GdqacnKyp18=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "241a4935a244f403fa7108259075b04c81ed258f", + "rev": "1ae7e2164c25ad4c22698b0ac12969f1e2a1b8ca", "type": "github" }, "original": { @@ -527,11 +527,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1744932701, - "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=", + "lastModified": 1744463964, + "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef", + "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", "type": "github" }, "original": { @@ -543,11 +543,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1745234285, - "narHash": "sha256-GfpyMzxwkfgRVN0cTGQSkTC0OHhEkv3Jf6Tcjm//qZ0=", + "lastModified": 1744463964, + "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c11863f1e964833214b767f4a369c6e6a7aba141", + "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", "type": "github" }, "original": { @@ -616,11 +616,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1745151211, - "narHash": "sha256-qFXfTdO1yvW6DmUPfVLIJgDHfkSd5yimZWvBMrlP/ow=", + "lastModified": 1744682091, + "narHash": "sha256-zudMf0YW3mB0f2XnWPAjYdKioJPaJQchhO4bCeBOZAI=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "1dd4328f82115887901a685ecd9fa6e1d1db2d0c", + "rev": "44ed9eb751a6966ffb291edbda2e9bebd3ebcd4a", "type": "github" }, "original": { diff --git a/hosts/wizdesk/services/nixos/caddy.nix b/hosts/wizdesk/services/nixos/caddy.nix index fb1f983..3bcecc9 100644 --- a/hosts/wizdesk/services/nixos/caddy.nix +++ b/hosts/wizdesk/services/nixos/caddy.nix @@ -11,19 +11,16 @@ virtualHosts."jellyfin.thewizard.link".extraConfig = '' encode gzip - header X-Robots-Tag "none" reverse_proxy 127.0.0.1:8096 { flush_interval -1 } ''; virtualHosts."jellyseerr.thewizard.link".extraConfig = '' - header X-Robots-Tag "none" reverse_proxy http://127.0.0.1:5055 ''; virtualHosts."foundry.thewizard.link".extraConfig = '' - header X-Robots-Tag "none" reverse_proxy 127.0.0.1:30000 { flush_interval -1 } @@ -35,22 +32,18 @@ virtualHosts."files.thewizard.link".extraConfig = '' root * /srv/files - header X-Robots-Tag "none" file_server ''; virtualHosts."torrent.thewizard.link".extraConfig = '' - header X-Robots-Tag "none" reverse_proxy 127.0.0.1:8144 ''; virtualHosts."shoko.thewizard.link".extraConfig = '' - header X-Robots-Tag "none" reverse_proxy 127.0.0.1:8111 ''; virtualHosts."nixbin.thewizard.link".extraConfig = '' - header X-Robots-Tag "none" reverse_proxy 127.0.0.1:7373 ''; }; diff --git a/modules/neovim/lua/community.lua b/modules/neovim/lua/community.lua index 0f3cda3..06bbb5c 100644 --- a/modules/neovim/lua/community.lua +++ b/modules/neovim/lua/community.lua @@ -15,8 +15,6 @@ return { { import = "astrocommunity.motion.mini-ai" }, { import = "astrocommunity.motion.mini-surround" }, - { import = "astrocommunity.recipes.diagnostic-virtual-lines-current-line" }, - { import = "astrocommunity.test.neotest" }, { import = "astrocommunity.pack.cmake" }, diff --git a/modules/neovim/lua/plugins/astrocore.lua b/modules/neovim/lua/plugins/astrocore.lua index 98c6891..9e5eb13 100644 --- a/modules/neovim/lua/plugins/astrocore.lua +++ b/modules/neovim/lua/plugins/astrocore.lua @@ -16,13 +16,11 @@ return { diagnostics_mode = 3, -- diagnostic mode on start (0 = off, 1 = no signs/virtual text, 2 = no virtual text, 3 = on) highlighturl = true, -- highlight URLs at start notifications = true, -- enable notifications at start - signature_help = true, -- enable automatically showing signature help - inlay_hints = true, -- enable inlay hints globally }, -- Diagnostics configuration (for vim.diagnostics.config({...})) when diagnostics are on diagnostics = { virtual_text = true, - virtual_lines = { current_line = true }, + virtual_lines = false, }, -- vim options can be configured here options = { diff --git a/modules/neovim/lua/plugins/mini-icons.lua b/modules/neovim/lua/plugins/mini-icons.lua deleted file mode 100644 index e4bca1a..0000000 --- a/modules/neovim/lua/plugins/mini-icons.lua +++ /dev/null @@ -1,13 +0,0 @@ ----@type LazySpec -return { - "echasnovski/mini.icons", - lazy = true, - opts = { - extension = { - cshtml = { - glyph = "󱦗", - hl = "MiniIconsPurple", - }, - }, - }, -} diff --git a/modules/neovim/lua/plugins/roslyn-nvim.lua b/modules/neovim/lua/plugins/roslyn-nvim.lua index 11607a2..f926f22 100644 --- a/modules/neovim/lua/plugins/roslyn-nvim.lua +++ b/modules/neovim/lua/plugins/roslyn-nvim.lua @@ -56,6 +56,60 @@ return { dotnet_enable_references_code_lens = true, }, }, + ---@class RoslynPatchedClient: vim.lsp.Client + ---@field patched boolean? + + ---@param client RoslynPatchedClient + ---@param bufnr integer + on_attach = function(client, bufnr) + -- Call AstroLSP's on_attach so it registers mappings, formatting, etc. + require("astrolsp").on_attach(client, bufnr) + + -- HACK: Patch out the `roslyn-ls` LSP client to have proper + -- semantic tokens. + -- This is a snippet of code taken and modified from: + -- https://github.com/seblyng/roslyn.nvim/wiki#semantic-tokens + if client.patched then + return + else + client.patched = true + end + + -- let the runtime know the server can do semanticTokens/full now + client.server_capabilities = vim.tbl_deep_extend("force", client.server_capabilities, { + semanticTokensProvider = { + full = true, + }, + }) + + local lsp_request = client.request + + client.request = function(method, params, handler, req_bufnr) + if method ~= vim.lsp.protocol.Methods.textDocument_semanticTokens_full then + return lsp_request(method, params, handler, req_bufnr) + end + + local target_bufnr = vim.uri_to_bufnr(params.textDocument.uri) + local line_count = vim.api.nvim_buf_line_count(target_bufnr) + local last_line = + vim.api.nvim_buf_get_lines(target_bufnr, line_count - 1, line_count, true)[1] + + local returnvalue = lsp_request("textDocument/semanticTokens/range", { + textDocument = params.textDocument, + range = { + ["start"] = { + line = 0, + character = 0, + }, + ["end"] = { + line = line_count - 1, + character = string.len(last_line) - 1, + }, + }, + }, handler, req_bufnr) + return returnvalue + end + end, }, } diff --git a/shared/home-manager/common.nix b/shared/home-manager/common.nix index f427738..d442703 100644 --- a/shared/home-manager/common.nix +++ b/shared/home-manager/common.nix @@ -82,7 +82,7 @@ fastfetch firefox pavucontrol - # protonvpn-gui # WARNING: Marked as broken https://github.com/NixOS/nixpkgs/commit/84faa614a5256a84e3dd4e445053ff76f4c0a5d4 + protonvpn-gui qbittorrent qdirstat speedcrunch