From 94c61651f4ba2e3c2a16a5c22f2ccfeaf1978d13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Maxmili=C3=A1n=20St=C5=99=C3=ADbrn=C3=BD?= Date: Sun, 15 Mar 2026 19:43:53 +0100 Subject: [PATCH] non important commit --- flake.nix | 2 +- home/modules/helix.nix | 155 ++++------------------------------------- 2 files changed, 13 insertions(+), 144 deletions(-) diff --git a/flake.nix b/flake.nix index 1cd7c19..aa24ac9 100644 --- a/flake.nix +++ b/flake.nix @@ -26,7 +26,7 @@ floatc = { url = "git+https://git.stribrny.org/max_ag/floating-calculator?rev=2abbacf66e99db523d624037f3e449aa40e8f366"; - inputs.nixpkgs.follows = "nixpkgs"; + inputs.nixpkgs.follows = "nixpkgs"; }; niri-flake = { diff --git a/home/modules/helix.nix b/home/modules/helix.nix index 40835ba..ce9ce30 100644 --- a/home/modules/helix.nix +++ b/home/modules/helix.nix @@ -5,11 +5,11 @@ extraPackages = [ pkgs.nil + pkgs.alejandra ]; settings = { editor = { - # options indent-guides.render = true; cursorline = true; color-modes = true; @@ -30,58 +30,24 @@ statusline = { left = ["mode" "spinner" "file-name" "file-modification-indicator"]; - right = ["diagnostics" "selections" "position" "file-encoding" "file-type"]; center = ["workspace-diagnostics"]; + right = ["diagnostics" "selections" "position" "file-encoding" "file-type"]; }; auto-pairs = true; - file-picker.hidden = false; }; }; languages = { language-server = { - nil = { - command = "nil"; - config.nil.formatting.command = ["nixfmt"]; - }; - marksman = {command = "marksman";}; - taplo = { - command = "taplo"; - args = ["lsp" "stdio"]; - }; - bash-ls = { - command = "bash-language-server"; - args = ["start"]; - }; - tinymist = {command = "tinymist";}; # typst - vscode-css = { - command = "vscode-css-language-server"; - args = ["--stdio"]; - }; - vscode-html = { - command = "vscode-html-language-server"; - args = ["--stdio"]; - }; - emmet-ls = { - command = "emmet-ls"; - args = ["--stdio"]; - }; + nil.command = "nil"; + pyright = { command = "pyright-langserver"; args = ["--stdio"]; }; - ts-ls = { - command = "typescript-language-server"; - args = ["--stdio"]; - }; - zls = {command = "zls";}; - omnisharp = { - command = "OmniSharp"; - args = ["--languageserver"]; - }; - clangd = {command = "clangd";}; + rust-analyzer = { command = "rust-analyzer"; config.rust-analyzer = { @@ -89,9 +55,10 @@ cargo.allFeatures = true; }; }; - nu = { - command = "nu"; - args = ["--lsp"]; + + omnisharp = { + command = "OmniSharp"; + args = ["--languageserver"]; }; }; @@ -100,41 +67,7 @@ name = "nix"; auto-format = true; language-servers = ["nil"]; - formatter.command = "nixfmt"; - } - { - name = "markdown"; - auto-format = true; - language-servers = ["marksman"]; - } - { - name = "toml"; - auto-format = true; - language-servers = ["taplo"]; - } - { - name = "nu"; - language-servers = ["nu"]; - } - { - name = "bash"; - auto-format = true; - language-servers = ["bash-ls"]; - } - { - name = "typst"; - auto-format = true; - language-servers = ["tinymist"]; - } - { - name = "css"; - auto-format = true; - language-servers = ["vscode-css"]; - } - { - name = "html"; - auto-format = true; - language-servers = ["vscode-html" "emmet-ls"]; + formatter.command = "alejandra"; } { name = "python"; @@ -142,78 +75,14 @@ language-servers = ["pyright"]; } { - name = "typescript"; + name = "rust"; auto-format = true; - language-servers = ["ts-ls"]; - } - { - name = "tsx"; - auto-format = true; - language-servers = ["ts-ls"]; - } - { - name = "zig"; - auto-format = true; - language-servers = ["zls"]; + language-servers = ["rust-analyzer"]; } { name = "c-sharp"; auto-format = true; language-servers = ["omnisharp"]; - debugger = { - name = "netcoredbg"; - transport = "tcp"; - command = "netcoredbg"; - port-arg = "--server={port}"; - templates = [ - { - name = "launch"; - request = "launch"; - completion = [ - { - name = "DLL path"; - completion = "filename"; - default = "bin/Debug/net8.0/App.dll"; - } - ]; - args = { - type = "coreclr"; - request = "launch"; - program = "{0}"; - }; - } - { - name = "attach"; - request = "attach"; - completion = [ - { - name = "PID"; - completion = "pid"; - } - ]; - args = { - type = "coreclr"; - request = "attach"; - processId = "{0}"; - }; - } - ]; - }; - } - { - name = "c"; - auto-format = true; - language-servers = ["clangd"]; - } - { - name = "cpp"; - auto-format = true; - language-servers = ["clangd"]; - } - { - name = "rust"; - auto-format = true; - language-servers = ["rust-analyzer"]; } ]; };