diff --git a/hosts/monosodium-glutamate-g/configuration.nix b/hosts/monosodium-glutamate-g/configuration.nix index 9b27e5c..dbd0cec 100644 --- a/hosts/monosodium-glutamate-g/configuration.nix +++ b/hosts/monosodium-glutamate-g/configuration.nix @@ -3,7 +3,6 @@ # and in the NixOS manual (accessible by running ‘nixos-help’). { pkgs, - pkgs-stable, ... }: { @@ -16,6 +15,7 @@ jade = { hwKey.pamAuth.enable = true; + editors.zed.enable = true; desktop = { media = { obs = true; diff --git a/modules/desktop-legacy/social.nix b/modules/desktop-legacy/social.nix index 55c0895..6325c97 100644 --- a/modules/desktop-legacy/social.nix +++ b/modules/desktop-legacy/social.nix @@ -32,6 +32,7 @@ with lib; }; }; home.packages = with pkgs; [ + vesktop signal-desktop mumble element-desktop diff --git a/modules/editors/default.nix b/modules/editors/default.nix index 2c28619..8881b27 100644 --- a/modules/editors/default.nix +++ b/modules/editors/default.nix @@ -1,12 +1,15 @@ { ... }: { programs.niri.enable = true; + imports = [ + ./zed + ]; home-manager.users.jade = { pkgs, ... }: { + home.packages = [ pkgs.nixd ]; imports = [ ./helix - ./zed ]; }; } diff --git a/modules/editors/zed/default.nix b/modules/editors/zed/default.nix index 243e61d..d103c8c 100644 --- a/modules/editors/zed/default.nix +++ b/modules/editors/zed/default.nix @@ -1,42 +1,78 @@ -{ ... }: { - programs.zed-editor = { - enable = true; - userSettings = { - features = { - edit_prediction_provider = null; - }; - show_edit_predictions = false; - middle_click_paste = false; - search = { - regex = true; - }; - inlay_hints = { - enabled = true; - }; - assistant = { - version = "2"; - enabled = false; - }; - diagnostics = { - include_warnings = false; - inline = { - enabled = true; - update_debounce_ms = 150; - padding = 4; - min_column = 0; - max_severity = null; + pkgs, + config, + lib, + ... +}: +with lib; +{ + options.jade.editors = { + zed.enable = mkEnableOption "Enable Zed Editor"; + }; + config = mkIf config.jade.editors.zed.enable { + home-manager.users.jade = + { pkgs, ... }: + { + programs.zed-editor = { + enable = true; + extraPackages = [ + (pkgs.rustPlatform.buildRustPackage rec { + pname = "discord-presence-lsp"; + version = "d6622e5d4dbbf9f61764458c2b50ba2e58789307"; + cargoHash = "sha256-JLNCEeo9fKeV4vTtPs+Yj2wRO1RKP2fuetrPlXcPBjA="; + + src = pkgs.fetchFromGitHub { + owner = "xhyrom"; + repo = "zed-discord-presence"; + rev = version; + hash = "sha256-RmpY0xkJYNDYn6SWNdKGpPetmBxf2/xY25FLeJqf0Po="; + }; + + cargoBuildFlags = "--package discord-presence-lsp"; + }) + ]; + extensions = [ + "discord-presence" # yes, i sunk that low + "nix" + "nu" + ]; + userSettings = { + features = { + edit_prediction_provider = null; + }; + show_edit_predictions = false; + middle_click_paste = false; + search = { + regex = true; + }; + inlay_hints = { + enabled = true; + }; + assistant = { + version = "2"; + enabled = false; + }; + diagnostics = { + include_warnings = false; + inline = { + enabled = true; + update_debounce_ms = 150; + padding = 4; + min_column = 0; + max_severity = null; + }; + }; + language_models = null; + vim_mode = true; + vim = { + default_mode = "helix_normal"; + }; + # ui_font_size = 16; + # WHY CAN I NOT OVERRIDE THIS + # habt'a lack gesoffen?! + # buffer_font_size = 16.; + }; }; }; - language_models = null; - vim_mode = true; - vim = { - default_mode = "helix_normal"; - }; - # ui_font_size = 16; - # WHY CAN I NOT OVERRIDE THIS - # habt'a lack gesoffen?! - # buffer_font_size = 16.; - }; }; }