From d9e6d1acd49e01cf12305af5c443033ccc5000cf Mon Sep 17 00:00:00 2001 From: Giulio De Pasquale Date: Sun, 17 Nov 2024 14:15:29 +0000 Subject: [PATCH] feat: load helix files from files --- roles/home/helix.nix | 57 +++------------------------------ roles/home/helix/config.toml | 21 ++++++++++++ roles/home/helix/languages.toml | 26 +++++++++++++++ 3 files changed, 51 insertions(+), 53 deletions(-) create mode 100644 roles/home/helix/config.toml create mode 100644 roles/home/helix/languages.toml diff --git a/roles/home/helix.nix b/roles/home/helix.nix index 0c8c3a6..fd18e2a 100644 --- a/roles/home/helix.nix +++ b/roles/home/helix.nix @@ -2,7 +2,8 @@ let actualPkgs = pkgs.unstablePkgs; - + lib = actualPkgs.lib; + nodePkgs = with actualPkgs.nodePackages; [ vscode-langservers-extracted typescript @@ -48,58 +49,8 @@ in }; file = { - ".config/helix/config.toml".text = '' - theme = "monokai_pro_spectrum" - - [editor] - cursorline = true - true-color = true - gutters = ["diff", "diagnostics", "line-numbers", "spacer"] - - [editor.cursor-shape] - insert = "bar" - normal = "block" - select = "underline" - - [editor.lsp] - display-messages = true - - [editor.indent-guides] - render = true - - [editor.statusline] - left = ["mode", "spinner"] - center = ["file-name"] - ''; - - ".config/helix/languages.toml".text = '' - [[language]] - name = "nix" - formatter = { command = "nixpkgs-fmt" } - language-servers = ["nixd"] - - [language-server.nixd] - command = "nixd" - - [language-server.pylsp.config.pylsp.plugins] - ruff = {enabled = true} - rope = {enabled = true} - mypy = {enabled = true} - - [[language]] - name = "bash" - formatter = { command = "shfmt", args = ["-s", "-ci", "-sr"] } - - [[language]] - name = "go" - language-servers = ["gopls", "golangci-lint-langserver"] - - [language-server.golangci-lint-langserver] - command = "golangci-lint-langserver" - - [language-server.golangci-lint-langserver.config] - command = ["golangci-lint", "run", "--out-format", "json", "--issues-exit-code=1"] - ''; + ".config/helix/config.toml".text = lib.readFile ./helix/config.toml; + ".config/helix/languages.toml".text = lib.readFile ./helix/languages.toml; }; }; } diff --git a/roles/home/helix/config.toml b/roles/home/helix/config.toml new file mode 100644 index 0000000..e539e78 --- /dev/null +++ b/roles/home/helix/config.toml @@ -0,0 +1,21 @@ +theme = "monokai_pro_spectrum" + +[editor] +cursorline = true +true-color = true +gutters = ["diff", "diagnostics", "line-numbers", "spacer"] + +[editor.cursor-shape] +insert = "bar" +normal = "block" +select = "underline" + +[editor.lsp] +display-messages = true + +[editor.indent-guides] +render = true + +[editor.statusline] +left = ["mode", "spinner"] +center = ["file-name"] diff --git a/roles/home/helix/languages.toml b/roles/home/helix/languages.toml new file mode 100644 index 0000000..f04838d --- /dev/null +++ b/roles/home/helix/languages.toml @@ -0,0 +1,26 @@ +[[language]] +name = "nix" +formatter = { command = "nixpkgs-fmt" } +language-servers = ["nixd"] + +[language-server.nixd] +command = "nixd" + +[language-server.pylsp.config.pylsp.plugins] +ruff = {enabled = true} +rope = {enabled = true} +mypy = {enabled = true} + +[[language]] +name = "bash" +formatter = { command = "shfmt", args = ["-s", "-ci", "-sr"] } + +[[language]] +name = "go" +language-servers = ["gopls", "golangci-lint-langserver"] + +[language-server.golangci-lint-langserver] +command = "golangci-lint-langserver" + +[language-server.golangci-lint-langserver.config] +command = ["golangci-lint", "run", "--out-format", "json", "--issues-exit-code=1"]