diff --git a/.zed/settings.json b/.zed/settings.json index c70ecd6..2c63c08 100644 --- a/.zed/settings.json +++ b/.zed/settings.json @@ -1,11 +1,2 @@ { - "languages": { - "Nix": { - "formatter": { - "external": { - "command": "alejandra" - } - } - } - } } diff --git a/README.md b/README.md index 6b8ac59..66550eb 100644 --- a/README.md +++ b/README.md @@ -14,23 +14,23 @@ Hey, you. This is my nixos configurations. - david@Tytonidae -| Specialisation | DE / WM | Shell | Editor | Terminal | Launcher | Browser | DM | -| -------------- | --------- | ----------- | ------ | -------- | --------------- | ------- | -------------- | -| default | niri | fish + bash | helix | ghostty | fuzzel | firefox | gdm | -| cosmic | cosmic de | fish + bash | helix | ghostty | cosmic-launcher | firefox | cosmic-greeter | -| kde | kde | fish + bash | helix | ghostty | - | firefox | sddm | +| Specialisation | DE / WM | Shell | Editor | Terminal | Launcher | Browser | DM | +| -------------- | --------- | ----------- | ----------- | -------- | --------------- | ------- | -------------- | +| default | niri | fish + bash | helix + zed | ghostty | fuzzel | firefox | gdm | +| cosmic | cosmic de | fish + bash | helix + zed | ghostty | cosmic-launcher | firefox | cosmic-greeter | +| kde | kde | fish + bash | helix + zed | ghostty | - | firefox | sddm | - david@Akun -| Specialisation | DE / WM | Shell | Editor | Terminal | Launcher | Browser | DM | -| -------------- | ------- | ----------- | ------ | -------- | -------- | ------- | -------------- | -| default | cosmic | fish + bash | helix | ghostty | - | firefox | cosmic-greeter | +| Specialisation | DE / WM | Shell | Editor | Terminal | Launcher | Browser | DM | +| -------------- | ------- | ----------- | ----------- | -------- | -------- | ------- | -------------- | +| default | cosmic | fish + bash | helix + zed | ghostty | - | firefox | cosmic-greeter | - alice@Cape -| Specialisation | DE / WM | Shell | Editor | Terminal | Launcher | Browser | DM | -| -------------- | ------- | ----------- | ------ | -------- | -------- | ------- | --- | -| default | - | fish + bash | helix | - | - | - | - | +| Specialisation | DE / WM | Shell | Editor | Terminal | Launcher | Browser | DM | +| -------------- | ------- | ----------- | ------ | -------- | -------- | ------- | -- | +| default | - | fish + bash | helix | - | - | - | - | ## FlakE OutputS and StructurE diff --git a/home/modules/programs/zed.nix b/home/modules/programs/zed.nix index f95dce2..31dfde0 100644 --- a/home/modules/programs/zed.nix +++ b/home/modules/programs/zed.nix @@ -16,29 +16,86 @@ in { programs.zed-editor = { enable = true; extensions = [ - "nix" - "html" - "java" - "git-firely" - "make" + "asciidoc" + "basher" + "cargo-tom" + "codebook" "deno" - "java-eclipse-jdtlS" - "neocMake" - "typst" - "toml" + "docker-compose" + "dockerfile" + "fish" + "git-firefly" + "golangci-lint" + "haskell" + "html" + "hurl" + "idris2" + "java" + "java-eclipse-jdtls" + "kdl" + "kotlin" + "lua" + "make" "markdown-oxide" + "neocmake" + "nix" + "python-refactoring" + "python-requirements" + "scheme" + "toml" + "typst" + "xml" + "zig" ]; extraPackages = with pkgs; [ - nixd - nil - neocmakelsp - deno - jdt-language-server + idris2Packages.idris2Lsp + lua-language-server + bash-language-server + shfmt + hurl + cmake-language-server + kdlfmt + rustfmt + clang-tools + libxml2 + typstyle + pyright + ruff + gotools + yaml-language-server taplo - alejandra markdown-oxide + marksman + nixd + deno + alejandra + vscode-langservers-extracted + fish-lsp + tailwindcss-language-server + gopls + golangci-lint-langserver + tinymist + delve + lldb + rust-analyzer + # nil + haskell-language-server + neocmakelsp + jdt-language-server + zls ]; userSettings = { + languages = { + Nix = { + language_servers = ["nixd" "!nil"]; + formatter = { + external = { + command = "alejandra"; + arguments = ["--quiet" "--"]; + }; + }; + }; + }; soft_wrap = "editor_width"; autosave = "on_focus_change"; auto_update = false; diff --git a/pkgs/helix/default.nix b/pkgs/helix/default.nix index eb9489f..af7e60b 100644 --- a/pkgs/helix/default.nix +++ b/pkgs/helix/default.nix @@ -12,6 +12,7 @@ idris2Packages.idris2Lsp lua-language-server bash-language-server + shfmt hurl cmake-language-server kdlfmt @@ -31,6 +32,7 @@ alejandra vscode-langservers-extracted fish-lsp + tailwindcss-language-server gopls golangci-lint-langserver tinymist @@ -40,6 +42,8 @@ # nil haskell-language-server neocmakelsp + jdt-language-server + zls ] ); in