diff --git a/modules/editors/default.nix b/modules/editors/default.nix index e7b5b71..8881b27 100644 --- a/modules/editors/default.nix +++ b/modules/editors/default.nix @@ -1,7 +1,4 @@ -{ pkgs, ... }: -let - discord-presence-lsp = pkgs.callPackage ./discord-presence-lsp.nix { }; -in +{ ... }: { programs.niri.enable = true; imports = [ @@ -10,10 +7,7 @@ in home-manager.users.jade = { pkgs, ... }: { - home.packages = [ - pkgs.nixd - discord-presence-lsp - ]; + home.packages = [ pkgs.nixd ]; imports = [ ./helix ]; diff --git a/modules/editors/discord-presence-lsp.nix b/modules/editors/discord-presence-lsp.nix deleted file mode 100644 index 995b20d..0000000 --- a/modules/editors/discord-presence-lsp.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ pkgs }: -(pkgs.rustPlatform.buildRustPackage rec { - pname = "discord-presence-lsp"; - version = "200ae73131a098516025e4fd5269d8c8cb6144f6"; - cargoHash = "sha256-JLNCEeo9fKeV4vTtPs+Yj2wRO1RKP2fuetrPlXcPBjA="; - - src = pkgs.fetchFromGitHub { - owner = "xhyrom"; - repo = "zed-discord-presence"; - rev = version; - hash = "sha256-RmpY0xkJYNDYn6SWNdKGpPetmBxf2/xY25FLeJqf0Po="; - }; - - cargoBuildFlags = "--package discord-presence-lsp"; -}) diff --git a/modules/editors/helix/default.nix b/modules/editors/helix/default.nix index 782e733..bd0b05a 100644 --- a/modules/editors/helix/default.nix +++ b/modules/editors/helix/default.nix @@ -26,34 +26,6 @@ command = "${pkgs.nushell}/bin/nu"; args = [ "--lsp" ]; }; - "discord-presence-lsp" = { - command = "discord-presence-lsp"; - config = { - application_id = "1376167046974279731"; - base_icons_url = "https://raw.githubusercontent.com/xhyrom/zed-discord-presence/main/assets/icons/"; - state = "Working on {filename}"; - details = "In {workspace}"; - large_image = "{language}"; - large_text = "{language:u}"; - small_image = "logo"; - small_text = "Helix"; - # idle = { - # timeout = 999999999999999999; - # action = "change_activity"; - # state = "Idling"; - # details = "In Helix"; - # large_image = "logo"; - # large_text = "Helix"; - # small_image = "idle"; - # small_text = "Idle"; - # }; - rules = { - mode = "blacklist"; - paths = [ "absolute path" ]; - }; - git_integration = true; - }; - }; "rust-analyzer" = { config = { check.command = "check"; @@ -112,10 +84,7 @@ language = [ { name = "nu"; - language-servers = [ - "nu-builtin-lsp" - "discord-presence-lsp" - ]; + language-servers = [ "nu-builtin-lsp" ]; } { name = "php"; @@ -123,20 +92,12 @@ } { name = "nix"; - # language-servers = [""] formatter = { command = "${pkgs.nixfmt-rfc-style}/bin/nixfmt"; args = [ "--quiet" ]; }; auto-format = true; } - { - name = "rust"; - language-servers = [ - # "rust-analyzer" - "discord-presence-lsp" - ]; - } { name = "html"; roots = [ ".git" ]; diff --git a/modules/editors/zed/default.nix b/modules/editors/zed/default.nix index b6b3108..d103c8c 100644 --- a/modules/editors/zed/default.nix +++ b/modules/editors/zed/default.nix @@ -11,11 +11,25 @@ with lib; }; 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