diff --git a/modules/home-manager/programs/neovim/default.nix b/modules/home-manager/programs/neovim/default.nix index 0b63c52..7450219 100644 --- a/modules/home-manager/programs/neovim/default.nix +++ b/modules/home-manager/programs/neovim/default.nix @@ -52,6 +52,9 @@ in curl ollamaPackage + # Needed by LuaSnip + luajitPackages.jsregexp + # CMAKE neocmakelsp diff --git a/modules/home-manager/programs/neovim/lua/community.lua b/modules/home-manager/programs/neovim/lua/community.lua index d816924..4584bf6 100644 --- a/modules/home-manager/programs/neovim/lua/community.lua +++ b/modules/home-manager/programs/neovim/lua/community.lua @@ -18,6 +18,7 @@ return { { import = "astrocommunity.pack.cmake" }, { import = "astrocommunity.pack.cpp" }, + { import = "astrocommunity.pack.cs" }, { import = "astrocommunity.pack.godot" }, { import = "astrocommunity.pack.html-css" }, { import = "astrocommunity.pack.json" }, diff --git a/modules/home-manager/programs/neovim/polish.nix b/modules/home-manager/programs/neovim/polish.nix index 3e7c5e6..181e5fc 100644 --- a/modules/home-manager/programs/neovim/polish.nix +++ b/modules/home-manager/programs/neovim/polish.nix @@ -30,6 +30,7 @@ pkgs: }, } + -- @type DapAdapter dap.adapters.cppdbg = { id = "cppdbg", type = "executable", @@ -37,6 +38,13 @@ pkgs: "${pkgs.vscode-extensions.ms-vscode.cpptools}/share/vscode/extensions/ms-vscode.cpptools/debugAdapters/bin/OpenDebugAD7", } + -- @type DapAdapter + dap.adapters.coreclr = { + type = "executable", + command = "${pkgs.netcoredbg}/bin/netcoredbg", + args = {"--interpreter=vscode"} + } + -- @type DapConfiguration dap.configurations.rust = { { @@ -51,6 +59,7 @@ pkgs: }, } + -- @type DapConfiguration dap.configurations.cpp = { { name = "Launch file", @@ -77,4 +86,16 @@ pkgs: } dap.configurations.c = dap.configurations.cpp + + -- @type DapConfiguration + dap.configurations.cs = { + { + type = "coreclr", + name = "launch - netcoredbg", + request = "launch", + program = function() + return vim.fn.input('Path to dll', vim.fn.getcwd() .. '/bin/Debug/', 'file') + end, + }, + } '' diff --git a/specific/desktop/services/openttd.nix b/specific/desktop/services/openttd.nix index dd7596f..6d0a1a4 100644 --- a/specific/desktop/services/openttd.nix +++ b/specific/desktop/services/openttd.nix @@ -14,7 +14,7 @@ Unit.Description = "OpenTTD Tmux server"; Service = { - ExecStart = "${pkgs.tmux}/bin/tmux -S /run/user/1000/tmux-1000/openttd new -s OpenTTD -d '${pkgs.openttd}/bin/openttd -g /home/wizardlink/.local/share/openttd/save/hyfy.sav -D'"; + ExecStart = "${pkgs.tmux}/bin/tmux -L openttd new -s OpenTTD -d '${pkgs.openttd}/bin/openttd -g /home/wizardlink/.local/share/openttd/save/hyfy.sav -D'"; ExecStop = "${pkgs.tmux}/bin/tmux kill-session -t OpenTTD"; Restart = "on-failure"; Type = "forking"; @@ -30,7 +30,7 @@ }; Service = { - ExecStart = "${pkgs.tmux}/bin/tmux -S /run/user/1000/tmux-1000/openttd send-keys -t OpenTTD 'rcon_pw aaaa' Enter"; + ExecStart = "${pkgs.tmux}/bin/tmux -L openttd send-keys -t OpenTTD 'rcon_pw aaaa' Enter"; Type = "oneshot"; }; }; @@ -44,7 +44,7 @@ }; Service = { - ExecStart = "${pkgs.tmux}/bin/tmux -S /run/user/1000/tmux-1000/openttd send-keys -t OpenTTD 'save hyfy' Enter"; + ExecStart = "${pkgs.tmux}/bin/tmux -L openttd send-keys -t OpenTTD 'save hyfy' Enter"; Type = "simple"; Restart = "always"; RestartSec = "1800s"; diff --git a/specific/desktop/services/terraria.nix b/specific/desktop/services/terraria.nix index 883f715..9c134d1 100644 --- a/specific/desktop/services/terraria.nix +++ b/specific/desktop/services/terraria.nix @@ -7,7 +7,7 @@ Unit.Description = "Terraria TMUX Server"; Service = { - ExecStart = "${pkgs.tmux}/bin/tmux -S /run/user/1000/tmux-1000/terraria new -s Terraria -d /etc/profiles/per-user/wizardlink/bin/fhs -c 'dotnet ./tModLoader.dll -server -config serverconfig.txt'"; + ExecStart = "${pkgs.tmux}/bin/tmux -L terraria new -s Terraria -d /etc/profiles/per-user/wizardlink/bin/fhs -c 'dotnet ./tModLoader.dll -server -config serverconfig.txt'"; ExecStop = "${pkgs.tmux}/bin/tmux kill-session -t Terraria"; Restart = "on-failure"; Type = "forking";