From 88e13d8b641288fa366029e847257e3c3f1c0317 Mon Sep 17 00:00:00 2001 From: "Alexandre Cavalheiro S. Tiago da Silva" Date: Tue, 21 Jan 2025 03:46:21 -0300 Subject: [PATCH 01/10] feat(neovim): add gdscript debugging and lsp --- modules/home-manager/programs/neovim/lsp.lua | 2 ++ .../home-manager/programs/neovim/polish.lua | 21 ++++++++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/modules/home-manager/programs/neovim/lsp.lua b/modules/home-manager/programs/neovim/lsp.lua index 8760cea..8d617a6 100644 --- a/modules/home-manager/programs/neovim/lsp.lua +++ b/modules/home-manager/programs/neovim/lsp.lua @@ -25,6 +25,7 @@ return { "c", "cpp", "cs", + "gdscript", "h", "javascript", "jsx", @@ -58,6 +59,7 @@ return { "cssls", "denols", "eslint", + "gdscript", "html", "jsonls", "lua_ls", diff --git a/modules/home-manager/programs/neovim/polish.lua b/modules/home-manager/programs/neovim/polish.lua index ba33487..9641c76 100644 --- a/modules/home-manager/programs/neovim/polish.lua +++ b/modules/home-manager/programs/neovim/polish.lua @@ -31,7 +31,8 @@ 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 @@ -41,6 +42,13 @@ 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 = { { @@ -94,3 +102,14 @@ dap.configurations.cs = { end, }, } + +-- @type DapConfiguration +dap.configurations.gdscript = { + { + name = "Launch scene", + type = "godot", + request = "launch", + project = "${workspaceFolder}", + scene = "current", + }, +} From db2d6b940178082145ad07249fdfa7139415a8fd Mon Sep 17 00:00:00 2001 From: "Alexandre Cavalheiro S. Tiago da Silva" Date: Tue, 21 Jan 2025 03:46:41 -0300 Subject: [PATCH 02/10] feat(hm/packages): add godot --- modules/home-manager/packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/home-manager/packages.nix b/modules/home-manager/packages.nix index a48f4a6..0ad711f 100644 --- a/modules/home-manager/packages.nix +++ b/modules/home-manager/packages.nix @@ -65,6 +65,7 @@ ## Development beekeeper-studio + godot_4 hoppscotch lazygit From 23c4620908002d34a4f107e682ef782991a9e22e Mon Sep 17 00:00:00 2001 From: "Alexandre Cavalheiro S. Tiago da Silva" Date: Tue, 21 Jan 2025 03:47:05 -0300 Subject: [PATCH 03/10] fix(neovim): use prettierd instead of deno's fmt --- .../home-manager/programs/neovim/default.nix | 1 + .../programs/neovim/lua/plugins/none-ls.lua | 57 ++++++++++--------- 2 files changed, 30 insertions(+), 28 deletions(-) diff --git a/modules/home-manager/programs/neovim/default.nix b/modules/home-manager/programs/neovim/default.nix index fa5ed7d..50acbfc 100644 --- a/modules/home-manager/programs/neovim/default.nix +++ b/modules/home-manager/programs/neovim/default.nix @@ -115,6 +115,7 @@ in vscode-extensions.vadimcn.vscode-lldb # Vue + prettierd vue-language-server # Svelte 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 25dba6c..3d13017 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,7 +52,8 @@ return { null_ls.builtins.formatting.csharpier, null_ls.builtins.formatting.nixfmt, null_ls.builtins.formatting.stylua, - deno_fmt, + --deno_fmt, + null_ls.builtins.formatting.prettierd, } return config -- return final config table end, From 870f6843163341cc57b7a77f8cbd36ba33ddc76b Mon Sep 17 00:00:00 2001 From: "Alexandre Cavalheiro S. Tiago da Silva" Date: Tue, 21 Jan 2025 03:47:33 -0300 Subject: [PATCH 04/10] feat(hm/pacakges): add vhs and neovim treesitter for it --- modules/home-manager/packages.nix | 1 + modules/home-manager/programs/neovim/lua/plugins/treesitter.lua | 1 + 2 files changed, 2 insertions(+) diff --git a/modules/home-manager/packages.nix b/modules/home-manager/packages.nix index 0ad711f..9353f13 100644 --- a/modules/home-manager/packages.nix +++ b/modules/home-manager/packages.nix @@ -43,6 +43,7 @@ #orca-slicer # FIXME: Broken right now, gotta wait for PR 369729 shotcut vcv-rack + vhs ## Entertainment jellyfin-media-player diff --git a/modules/home-manager/programs/neovim/lua/plugins/treesitter.lua b/modules/home-manager/programs/neovim/lua/plugins/treesitter.lua index ccc1240..ee535af 100644 --- a/modules/home-manager/programs/neovim/lua/plugins/treesitter.lua +++ b/modules/home-manager/programs/neovim/lua/plugins/treesitter.lua @@ -36,6 +36,7 @@ return { "json", "jsonc", "nix", + "vhs", "yaml", -- Misc "cuda", From 2eeded792324a45dbbc344d09c166155c5efcce0 Mon Sep 17 00:00:00 2001 From: "Alexandre Cavalheiro S. Tiago da Silva" Date: Tue, 21 Jan 2025 03:47:48 -0300 Subject: [PATCH 05/10] fix(hm/packages): re-add orca-slicer --- modules/home-manager/packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/home-manager/packages.nix b/modules/home-manager/packages.nix index 9353f13..f5cd56d 100644 --- a/modules/home-manager/packages.nix +++ b/modules/home-manager/packages.nix @@ -40,7 +40,7 @@ blender krita lmms - #orca-slicer # FIXME: Broken right now, gotta wait for PR 369729 + orca-slicer shotcut vcv-rack vhs From f1e11cfff62add6e5d29a1ac45021b5c8f6efcc8 Mon Sep 17 00:00:00 2001 From: "Alexandre Cavalheiro S. Tiago da Silva" Date: Tue, 21 Jan 2025 03:48:11 -0300 Subject: [PATCH 06/10] feat(hyprland): godot rules --- modules/home-manager/programs/hyprland/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/home-manager/programs/hyprland/default.nix b/modules/home-manager/programs/hyprland/default.nix index f21ced6..f6d078d 100644 --- a/modules/home-manager/programs/hyprland/default.nix +++ b/modules/home-manager/programs/hyprland/default.nix @@ -385,6 +385,11 @@ 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 ''; }; } From 4b31ba34b6f43df14115b00758052ed2f5a0f73f Mon Sep 17 00:00:00 2001 From: "Alexandre Cavalheiro S. Tiago da Silva" Date: Tue, 21 Jan 2025 03:48:28 -0300 Subject: [PATCH 07/10] chore(alacritty): change opacity and remove blur --- modules/home-manager/programs/alacritty.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/home-manager/programs/alacritty.nix b/modules/home-manager/programs/alacritty.nix index 1c24b03..39b9c77 100644 --- a/modules/home-manager/programs/alacritty.nix +++ b/modules/home-manager/programs/alacritty.nix @@ -25,8 +25,7 @@ in window = { decorations = "None"; - opacity = 0.88; - blur = true; + opacity = 0.8; padding = { x = 18; From 036240d01ec6359d344a05135fab8d020370d26f Mon Sep 17 00:00:00 2001 From: "Alexandre Cavalheiro S. Tiago da Silva" Date: Tue, 21 Jan 2025 03:49:11 -0300 Subject: [PATCH 08/10] feat(nixos/desktop): add quickPhrase to fcitx5 --- modules/nixos/desktop.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/nixos/desktop.nix b/modules/nixos/desktop.nix index 870a3cf..cf582a8 100644 --- a/modules/nixos/desktop.nix +++ b/modules/nixos/desktop.nix @@ -80,6 +80,10 @@ in fcitx5-catppuccin ]; + quickPhrase = { + proud = "<(￣︶￣)>"; + }; + waylandFrontend = true; }; }; From b07ca98d54737b7c38faa8584fc9c2553b395f56 Mon Sep 17 00:00:00 2001 From: "Alexandre Cavalheiro S. Tiago da Silva" Date: Tue, 21 Jan 2025 03:50:44 -0300 Subject: [PATCH 09/10] chore(desktop/caddy): remove map.*; add torrent.* and shoko.* --- specific/desktop/services/caddy.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/specific/desktop/services/caddy.nix b/specific/desktop/services/caddy.nix index 6eba4fe..c421273 100644 --- a/specific/desktop/services/caddy.nix +++ b/specific/desktop/services/caddy.nix @@ -26,10 +26,6 @@ } ''; - virtualHosts."map.thewizard.link".extraConfig = '' - reverse_proxy 192.168.0.100:8123 - ''; - virtualHosts."git.thewizard.link".extraConfig = '' reverse_proxy 127.0.0.1:3788 ''; @@ -38,5 +34,13 @@ 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 + ''; }; } From c33c3737f10b4fb63152f8d95e6bdcb5870d87cd Mon Sep 17 00:00:00 2001 From: "Alexandre Cavalheiro S. Tiago da Silva" Date: Wed, 22 Jan 2025 18:52:15 -0300 Subject: [PATCH 10/10] feat(home-manager/packages): add aseprite, gamescope and heroic --- modules/home-manager/packages.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/home-manager/packages.nix b/modules/home-manager/packages.nix index f5cd56d..41afbc0 100644 --- a/modules/home-manager/packages.nix +++ b/modules/home-manager/packages.nix @@ -37,6 +37,7 @@ libreoffice # Creative work + aseprite blender krita lmms @@ -49,6 +50,8 @@ jellyfin-media-player # Gaming + gamescope + heroic protontricks wineWowPackages.unstableFull winetricks