diff --git a/flake.lock b/flake.lock index d83e4843..bff96891 100644 --- a/flake.lock +++ b/flake.lock @@ -4567,11 +4567,11 @@ ] }, "locked": { - "lastModified": 1758661473, - "narHash": "sha256-yECwmM5oxJo0HwRCvU/t141pKgHUX/YLB526beoMEd8=", + "lastModified": 1767885888, + "narHash": "sha256-Y3RhSp6KeCsJauZqy0ePJ1QxerL8HlcdRnZwsO5H1fs=", "ref": "refs/heads/main", - "rev": "1aaa1e19c36e267d71d2d23fd8c8c1ad0d0e53eb", - "revCount": 32, + "rev": "ec8b2efda6ffe00b693a80e303976c0326efc7f9", + "revCount": 33, "type": "git", "url": "ssh://git@github.com/ethnt/tilde-secrets" }, diff --git a/modules/profiles/home/fish.nix b/modules/profiles/home/fish.nix index 8eaf40c6..68fa9d0b 100644 --- a/modules/profiles/home/fish.nix +++ b/modules/profiles/home/fish.nix @@ -16,13 +16,6 @@ set -g fish_color_autosuggestion 555 brblack ''; - # interactiveShellInit = '' - # function __fish_command_not_found_handler --on-event="fish_command_not_found" - # ${lib.getExe pkgs.bashInteractive} -c \ - # "source ${pkgs.nix-index}/etc/profile.d/command-not-found.sh; command_not_found_handle $argv" - # end - # ''; - functions.fish_greeting = ""; plugins = [{ diff --git a/modules/profiles/home/ghostty.nix b/modules/profiles/home/ghostty.nix index 2f165f7b..d5501cca 100644 --- a/modules/profiles/home/ghostty.nix +++ b/modules/profiles/home/ghostty.nix @@ -5,12 +5,6 @@ end ''; - programs.zsh.initContent = '' - if [[ -n $GHOSTTY_RESOURCES_DIR ]]; then - source "$GHOSTTY_RESOURCES_DIR"/shell-integration/zsh/ghostty-integration - fi - ''; - xdg.configFile."ghostty/config".text = '' adjust-cell-height = 10 cursor-style = bar diff --git a/modules/profiles/home/tools/common.nix b/modules/profiles/home/tools/common.nix index d8d52f39..689b5151 100644 --- a/modules/profiles/home/tools/common.nix +++ b/modules/profiles/home/tools/common.nix @@ -13,6 +13,7 @@ just mtr nh + nixd nix-index nix-output-monitor ripgrep diff --git a/modules/profiles/home/zed-editor.nix b/modules/profiles/home/zed-editor.nix new file mode 100644 index 00000000..1666b5ae --- /dev/null +++ b/modules/profiles/home/zed-editor.nix @@ -0,0 +1,45 @@ +{ pkgs, lib, ... }: { + programs.zed-editor = { + enable = true; + extensions = [ "nix" "nord" ]; + userSettings = { + # Keymaps + base_keymap = "Atom"; + multi_cursor_modifier = "cmd_or_ctrl"; + + # Fonts + ui_font_size = 16; + buffer_font_family = "PragmataPro Mono Liga"; + buffer_font_size = 16; + + # Theme + theme = { + mode = "dark"; + light = "Nord Light"; + dark = "Nord Dark"; + }; + + # Git + git.inline_blame.enabled = false; + + # Language-specific + languages = { + Nix = { + language_servers = [ "nixd" "!nil" ]; + formatter = { + external = { + command = lib.getExe pkgs.nixfmt-classic; + arguments = [ ]; + }; + }; + }; + }; + + # Telemetry + telemetry = { + diagnostics = false; + metrics = false; + }; + }; + }; +} diff --git a/modules/suites/home.nix b/modules/suites/home.nix index b7507196..60ce24c6 100644 --- a/modules/suites/home.nix +++ b/modules/suites/home.nix @@ -21,6 +21,7 @@ with profiles; tools.common tools.darwin xdg + zed-editor zellij ]; diff --git a/users/et/profiles/zed-editor.nix b/users/et/profiles/zed-editor.nix new file mode 100644 index 00000000..ae6790a0 --- /dev/null +++ b/users/et/profiles/zed-editor.nix @@ -0,0 +1 @@ +{ programs.zed-editor.extensions = [ "haskell" ]; }