diff --git a/modules/home-manager/packages.nix b/modules/home-manager/packages.nix index 41afbc0..a48f4a6 100644 --- a/modules/home-manager/packages.nix +++ b/modules/home-manager/packages.nix @@ -37,21 +37,17 @@ libreoffice # Creative work - aseprite blender krita lmms - orca-slicer + #orca-slicer # FIXME: Broken right now, gotta wait for PR 369729 shotcut vcv-rack - vhs ## Entertainment jellyfin-media-player # Gaming - gamescope - heroic protontricks wineWowPackages.unstableFull winetricks @@ -69,7 +65,6 @@ ## Development beekeeper-studio - godot_4 hoppscotch lazygit diff --git a/modules/home-manager/programs/alacritty.nix b/modules/home-manager/programs/alacritty.nix index 39b9c77..1c24b03 100644 --- a/modules/home-manager/programs/alacritty.nix +++ b/modules/home-manager/programs/alacritty.nix @@ -25,7 +25,8 @@ in window = { decorations = "None"; - opacity = 0.8; + opacity = 0.88; + blur = true; padding = { x = 18; diff --git a/modules/home-manager/programs/hyprland/default.nix b/modules/home-manager/programs/hyprland/default.nix index f6d078d..f21ced6 100644 --- a/modules/home-manager/programs/hyprland/default.nix +++ b/modules/home-manager/programs/hyprland/default.nix @@ -385,11 +385,6 @@ in windowrulev2 = tag +gw2, class:^(steam_app_1284210)$ windowrulev2 = noblur, tag:gw2 windowrulev2 = noborder, tag:gw2 - - # Rules for godot - windowrulev2 = size 50%, 50%, class:^(Godot)$, title:^Create New Node$ - windowrulev2 = size 50%, 50%, class:^(Godot)$, title:^Open a File$ - windowrulev2 = size 50%, 50%, class:^(Godot)$, title:^Project Settings ''; }; } diff --git a/modules/home-manager/programs/neovim/default.nix b/modules/home-manager/programs/neovim/default.nix index 50acbfc..fa5ed7d 100644 --- a/modules/home-manager/programs/neovim/default.nix +++ b/modules/home-manager/programs/neovim/default.nix @@ -115,7 +115,6 @@ in vscode-extensions.vadimcn.vscode-lldb # Vue - prettierd vue-language-server # Svelte diff --git a/modules/home-manager/programs/neovim/lsp.lua b/modules/home-manager/programs/neovim/lsp.lua index 8d617a6..8760cea 100644 --- a/modules/home-manager/programs/neovim/lsp.lua +++ b/modules/home-manager/programs/neovim/lsp.lua @@ -25,7 +25,6 @@ return { "c", "cpp", "cs", - "gdscript", "h", "javascript", "jsx", @@ -59,7 +58,6 @@ return { "cssls", "denols", "eslint", - "gdscript", "html", "jsonls", "lua_ls", diff --git a/modules/home-manager/programs/neovim/lua/plugins/none-ls.lua b/modules/home-manager/programs/neovim/lua/plugins/none-ls.lua index 3d13017..25dba6c 100644 --- a/modules/home-manager/programs/neovim/lua/plugins/none-ls.lua +++ b/modules/home-manager/programs/neovim/lua/plugins/none-ls.lua @@ -11,33 +11,33 @@ return { local null_ls = require("null-ls") local helpers = require("null-ls.helpers") - -- local deno_fmt = helpers.make_builtin({ - -- name = "deno_fmt", - -- filetypes = { - -- "angular", - -- "astro", - -- "css", - -- "html", - -- "javascript", - -- "json", - -- "jsonc", - -- "less", - -- "markdown", - -- "sass", - -- "scss", - -- "svelte", - -- "typescript", - -- "vue", - -- "yaml", - -- }, - -- method = { null_ls.methods.FORMATTING }, - -- generator_opts = { - -- command = "deno", - -- args = { "fmt", "--unstable-component", "-" }, - -- to_stdin = true, - -- }, - -- factory = helpers.formatter_factory, - -- }) + local deno_fmt = helpers.make_builtin({ + name = "deno_fmt", + filetypes = { + "angular", + "astro", + "css", + "html", + "javascript", + "json", + "jsonc", + "less", + "markdown", + "sass", + "scss", + "svelte", + "typescript", + "vue", + "yaml", + }, + method = { null_ls.methods.FORMATTING }, + generator_opts = { + command = "deno", + args = { "fmt", "--unstable-component", "-" }, + to_stdin = true, + }, + factory = helpers.formatter_factory, + }) -- Check supported formatters and linters -- https://github.com/nvimtools/none-ls.nvim/tree/main/lua/null-ls/builtins/formatting @@ -52,8 +52,7 @@ return { null_ls.builtins.formatting.csharpier, null_ls.builtins.formatting.nixfmt, null_ls.builtins.formatting.stylua, - --deno_fmt, - null_ls.builtins.formatting.prettierd, + deno_fmt, } return config -- return final config table end, diff --git a/modules/home-manager/programs/neovim/lua/plugins/treesitter.lua b/modules/home-manager/programs/neovim/lua/plugins/treesitter.lua index ee535af..ccc1240 100644 --- a/modules/home-manager/programs/neovim/lua/plugins/treesitter.lua +++ b/modules/home-manager/programs/neovim/lua/plugins/treesitter.lua @@ -36,7 +36,6 @@ return { "json", "jsonc", "nix", - "vhs", "yaml", -- Misc "cuda", diff --git a/modules/home-manager/programs/neovim/polish.lua b/modules/home-manager/programs/neovim/polish.lua index 9641c76..ba33487 100644 --- a/modules/home-manager/programs/neovim/polish.lua +++ b/modules/home-manager/programs/neovim/polish.lua @@ -31,8 +31,7 @@ dap.adapters.codelldb = { dap.adapters.cppdbg = { id = "cppdbg", type = "executable", - command = - "{pkgs.vscode-extensions.ms-vscode.cpptools}/share/vscode/extensions/ms-vscode.cpptools/debugAdapters/bin/OpenDebugAD7", + command = "{pkgs.vscode-extensions.ms-vscode.cpptools}/share/vscode/extensions/ms-vscode.cpptools/debugAdapters/bin/OpenDebugAD7", } -- @type DapAdapter @@ -42,13 +41,6 @@ dap.adapters.coreclr = { args = { "--interpreter=vscode" }, } --- @type DapAdapter -dap.adapters.godot = { - type = "server", - host = "127.0.0.1", - port = 6006, -} - -- @type DapConfiguration dap.configurations.rust = { { @@ -102,14 +94,3 @@ dap.configurations.cs = { end, }, } - --- @type DapConfiguration -dap.configurations.gdscript = { - { - name = "Launch scene", - type = "godot", - request = "launch", - project = "${workspaceFolder}", - scene = "current", - }, -} diff --git a/modules/nixos/desktop.nix b/modules/nixos/desktop.nix index cf582a8..870a3cf 100644 --- a/modules/nixos/desktop.nix +++ b/modules/nixos/desktop.nix @@ -80,10 +80,6 @@ in fcitx5-catppuccin ]; - quickPhrase = { - proud = "<(￣︶￣)>"; - }; - waylandFrontend = true; }; }; diff --git a/specific/desktop/services/caddy.nix b/specific/desktop/services/caddy.nix index c421273..6eba4fe 100644 --- a/specific/desktop/services/caddy.nix +++ b/specific/desktop/services/caddy.nix @@ -26,6 +26,10 @@ } ''; + virtualHosts."map.thewizard.link".extraConfig = '' + reverse_proxy 192.168.0.100:8123 + ''; + virtualHosts."git.thewizard.link".extraConfig = '' reverse_proxy 127.0.0.1:3788 ''; @@ -34,13 +38,5 @@ root * /srv/files file_server ''; - - virtualHosts."torrent.thewizard.link".extraConfig = '' - reverse_proxy 127.0.0.1:8144 - ''; - - virtualHosts."shoko.thewizard.link".extraConfig = '' - reverse_proxy 127.0.0.1:8111 - ''; }; }