From df2457b36fd83373a20ca3c6eb51a62521b79dfa Mon Sep 17 00:00:00 2001
From: Myned <dev@bjork.tech>
Date: Tue, 18 Mar 2025 12:02:58 -0500
Subject: [PATCH] ide: move extension deps to module
---
options/custom/programs/vscode.nix | 20 ++++-
options/custom/programs/zed/default.nix | 74 +++++++++++++++----
.../programs/zed/snippets/shell script.json | 18 -----
.../zed/snippets/{nix.json => snippets.json} | 29 ++++++++
options/custom/settings/packages.nix | 9 ---
5 files changed, 106 insertions(+), 44 deletions(-)
delete mode 100644 options/custom/programs/zed/snippets/shell script.json
rename options/custom/programs/zed/snippets/{nix.json => snippets.json} (83%)
diff --git a/options/custom/programs/vscode.nix b/options/custom/programs/vscode.nix
index f3b8e37..0583b26 100644
--- a/options/custom/programs/vscode.nix
+++ b/options/custom/programs/vscode.nix
@@ -17,9 +17,23 @@ in {
# https://github.com/nix-community/nix-vscode-extensions
nixpkgs.overlays = [inputs.nix-vscode-extensions.overlays.default];
- environment.sessionVariables = {
- # https://github.com/nix-community/nixd/blob/main/nixd/docs/features.md
- NIXD_FLAGS = "--inlay-hints=false"; # Disable package versions in the editor
+ environment = {
+ sessionVariables = {
+ # https://github.com/nix-community/nixd/blob/main/nixd/docs/features.md
+ NIXD_FLAGS = "--inlay-hints=false"; # Disable package versions in the editor
+ };
+
+ # Extension dependencies
+ systemPackages = with pkgs; [
+ alejandra # nix-ide
+ blueprint-compiler # blueprint-gtk
+ caddy # caddyfile-support
+ nil # nix-ide
+ nixd # nix-ide
+ powershell # powershell
+ shellcheck # shellcheck
+ shfmt # shell-format
+ ];
};
home-manager.sharedModules = mkIf cfg.enable [
diff --git a/options/custom/programs/zed/default.nix b/options/custom/programs/zed/default.nix
index 45f9778..8f6c667 100644
--- a/options/custom/programs/zed/default.nix
+++ b/options/custom/programs/zed/default.nix
@@ -1,6 +1,7 @@
{
config,
lib,
+ pkgs,
...
}:
with lib; let
@@ -11,22 +12,48 @@ in {
};
config = mkIf cfg.enable {
+ # Extension dependencies
+ environment.systemPackages = with pkgs; [
+ alejandra # nix
+ basedpyright # basedpyright
+ blueprint-compiler # blueprint
+ caddy # caddyfile
+ docker-compose-language-service # docker-compose
+ dockerfile-language-server-nodejs # dockerfile
+ jdt-language-server # java
+ nginx-language-server # nginx
+ nil # nix
+ nixd # nix
+ nushell # nu
+ phpactor # php
+ powershell # powershell
+ powershell-editor-services # powershell
+ shellcheck # basher
+ shfmt # basher
+ simple-completion-language-server # snippets
+ svelte-language-server # svelte
+ vscode-langservers-extracted # html
+ ];
+
home-manager.sharedModules = [
{
# https://zed.dev/
# https://github.com/zed-industries/zed
+ # https://wiki.nixos.org/wiki/Zed
programs.zed-editor = {
enable = true;
# https://zed.dev/docs/extensions
# https://github.com/zed-industries/extensions/tree/main/extensions
extensions = [
- #// "basedpyright" # https://github.com/m1guer/basedpyright-zed
+ "bearded-icon-theme" # https://github.com/sethstha/bearded-icons-theme
+ "basedpyright" # https://github.com/m1guer/basedpyright-zed
"basher" # https://github.com/d1y/bash.zed
+ "blueprint" # https://github.com/tfuxu/zed-blueprint
"caddyfile" # https://github.com/nusnewob/caddyfile-zed
- "colored-zed-icons-theme" # https://github.com/TheRedXD/zed-icons-colored-theme
+ #// "colored-zed-icons-theme" # https://github.com/TheRedXD/zed-icons-colored-theme
"csv" # https://github.com/huacnlee/zed-csv
- "discord-presence" # https://github.com/xhyrom/zed-discord-presence
+ #// "discord-presence" # https://github.com/xhyrom/zed-discord-presence
"docker-compose" # https://github.com/eth0net/zed-docker-compose
"dockerfile" # https://github.com/d1y/dockerfile.zed
"env" # https://github.com/zarifpour/zed-env
@@ -37,25 +64,36 @@ in {
"java" # https://github.com/zed-extensions/java
"jinja2" # https://github.com/ArcherHume/jinja2-support
"make" # https://github.com/caius/zed-make
- "material-icon-theme" # https://github.com/zed-extensions/material-icon-theme
+ #// "material-icon-theme" # https://github.com/zed-extensions/material-icon-theme
"nginx" # https://github.com/d1y/nginx-zed
"nix" # https://github.com/zed-extensions/nix
"nu" # https://github.com/zed-extensions/nu
"php" # https://github.com/zed-extensions/php
"powershell" # https://github.com/wingyplus/zed-powershell
- "pylsp" # https://github.com/rgbkrk/python-lsp-zed-extension
- "scss" # https://github.com/bajrangCoder/zed-scss
+
+ # TODO: Add dependencies
+ # https://github.com/NixOS/nixpkgs/issues/229337
+ #// "pylsp" # https://github.com/rgbkrk/python-lsp-zed-extension
+
+ # BUG: scss-lsp/some-sass-lsp not packaged yet
+ # https://github.com/NixOS/nixpkgs/issues/380280
+ #// "scss" # https://github.com/bajrangCoder/zed-scss
+
"sql" # https://github.com/zed-extensions/sql
"svelte" # https://github.com/zed-extensions/svelte
"tmux" # https://github.com/dangh/zed-tmux
+
+ # BUG: unocss-language-server not packaged yet
+ # https://github.com/NixOS/nixpkgs/issues/270993
"unocss" # https://github.com/bajrangCoder/zed-unocss
+
"xml" # https://github.com/sweetppro/zed-xml
];
# https://zed.dev/docs/key-bindings
userKeymaps = [
{
- # Global keybinds
+ # Global
bindings = {
"alt-\\" = "workspace::ToggleBottomDock";
"alt-a" = "assistant::ToggleFocus";
@@ -72,10 +110,10 @@ in {
"alt-shift-tab" = "workspace::ToggleRightDock";
};
}
- {
- # Editor keybinds
- context = "Editor";
+ {
+ # Editor
+ context = "Editor";
bindings = {
"alt-backspace" = "editor::DeleteLine";
"alt-enter" = "editor::DuplicateLineDown";
@@ -86,11 +124,19 @@ in {
"alt-shift-enter" = "editor::DuplicateLineUp";
};
}
+
{
- # Terminal keybinds
+ # Editor completions
+ context = "Editor && showing_completions";
+ bindings = {
+ "enter" = "editor::Newline";
+ };
+ }
+
+ {
+ # Terminal
# https://zed.dev/docs/key-bindings#forward-keys-to-terminal
context = "Terminal";
-
bindings = {
"ctrl-s" = ["terminal::SendKeystroke" "ctrl-s"];
};
@@ -146,7 +192,7 @@ in {
default_width = 300;
};
- icon_theme = "Colored Zed Icons Theme Dark";
+ icon_theme = "Bearded Icon Theme";
indent_guides = {
active_line_width = 2;
@@ -200,7 +246,7 @@ in {
line_height = "standard";
};
- ui_font_size = mkForce 18;
+ ui_font_size = mkForce 19;
# Language-specific
# https://zed.dev/docs/configuring-languages
diff --git a/options/custom/programs/zed/snippets/shell script.json b/options/custom/programs/zed/snippets/shell script.json
deleted file mode 100644
index 22e79ca..0000000
--- a/options/custom/programs/zed/snippets/shell script.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- "Shell Bash Argc": {
- "prefix": "sba",
- "body": [
- "#! /usr/bin/env bash",
- "",
- "# @describe $1",
- "#",
- "# https://github.com/sigoden/argc",
- "",
- "# @meta combine-shorts",
- "",
- "$0",
- "",
- "eval \"\\$(argc --argc-eval \"\\$0\" \"\\$@\")\""
- ]
- }
-}
diff --git a/options/custom/programs/zed/snippets/nix.json b/options/custom/programs/zed/snippets/snippets.json
similarity index 83%
rename from options/custom/programs/zed/snippets/nix.json
rename to options/custom/programs/zed/snippets/snippets.json
index 2e64c71..d1f8fc3 100644
--- a/options/custom/programs/zed/snippets/nix.json
+++ b/options/custom/programs/zed/snippets/snippets.json
@@ -1,6 +1,7 @@
{
"Home Manager Option": {
"prefix": "ho",
+ "description": "Home Manager Option",
"body": [
"{",
" config,",
@@ -28,6 +29,7 @@
"NixOS Agenix": {
"prefix": "na",
+ "description": "NixOS Agenix",
"body": [
"age.secrets =",
" let",
@@ -43,6 +45,7 @@
"NixOS Container Arion": {
"prefix": "nca",
+ "description": "NixOS Container Arion",
"body": [
"{",
" config,",
@@ -87,6 +90,7 @@
"Nix Develop": {
"prefix": "nd",
+ "description": "Nix Develop",
"body": [
"{",
" inputs = {",
@@ -113,6 +117,7 @@
"NixOS Option": {
"prefix": "no",
+ "description": "NixOS Option",
"body": [
"{",
" config,",
@@ -131,5 +136,29 @@
" };",
"}"
]
+ },
+
+ "Script Bash": {
+ "prefix": "sb",
+ "description": "Script Bash",
+ "body": ["#! /usr/bin/env bash", "", "$0"]
+ },
+
+ "Script Bash Argc": {
+ "prefix": "sba",
+ "description": "Script Bash Argc",
+ "body": [
+ "#! /usr/bin/env bash",
+ "",
+ "# @describe $1",
+ "#",
+ "# https://github.com/sigoden/argc",
+ "",
+ "# @meta combine-shorts",
+ "",
+ "$0",
+ "",
+ "eval \"\\$(argc --argc-eval \"\\$0\" \"\\$@\")\""
+ ]
}
}
diff --git a/options/custom/settings/packages.nix b/options/custom/settings/packages.nix
index b0e1029..816f454 100644
--- a/options/custom/settings/packages.nix
+++ b/options/custom/settings/packages.nix
@@ -23,9 +23,6 @@ in {
perf # Performance analyzer
])
++ optionals config.custom.default [
- alejandra # Nix formatter
- blueprint-compiler # GTK markup language
- caddy # Reverse proxy
fd # File finder
fzf # Fuzzy search
inetutils # Network utilities
@@ -34,20 +31,14 @@ in {
lf # Terminal file manager
lm_sensors # System sensors
lz4 # Compression utility
- nil # Nix language server
nix-output-monitor # Nix build parser
nix-tree # Nix store explorer
- nixd # Nix language server
nmap # Network scanner
nvd # Nix diff viewer
openssl # Certificate utility
- powershell # Windows shell
progress # Coreutils progress viewer
q # DNS tester
rclone # File sync
- shellcheck # Script analysis tool
- shfmt # Script formatter
- simple-completion-language-server # Snippet language server
sshpass # SSH automation
stress # CPU stress tester
testdisk # Data recovery tool