From 22d186472ec7b286a24721574ba4068498cd11c5 Mon Sep 17 00:00:00 2001 From: matt1432 Date: Thu, 16 Jan 2025 10:45:14 -0500 Subject: [PATCH] feat(desktop): add nixcord module --- flake.lock | Bin 56351 -> 57618 bytes flake.nix | Bin 11867 -> 12165 bytes inputs/default.nix | 8 ++ .../desktop/environment/modules/packages.nix | 93 +++++++++++++++--- 4 files changed, 85 insertions(+), 16 deletions(-) diff --git a/flake.lock b/flake.lock index 6946f42e09d27b9616beb2a8a8aba869e153ac82..551ce4dca677ed75383c7f82dc5ac7df5e07ac0c 100644 GIT binary patch delta 494 zcmbQggL%>+<_(_GljljsP41OvpX?xIGMRHbH?MgsNr^c*lNX$p&PXiC z)Jw}r%udZHP0~xw&(%-UFUZWxOHI*FP07zGE-6aX2TSV$$~Nb=bIOW zhiRLohhqr9+&fsv7kc~WXhikYQ_ zMWUghnPswxiKV59ftjVbL6W6WQd){dVxoc3lsc)q3ZRA*B=Itkuz``0iFs0LN{X4Kg+-#Fp_yf}iHW79iGi7=xj~YpQBqopMPj0X O(d0rYjm?i_D+K_$XeCAf delta 12 TcmZpTza6vTk?dw3`APu*Cy@m* diff --git a/inputs/default.nix b/inputs/default.nix index 293a601a..655e51b3 100644 --- a/inputs/default.nix +++ b/inputs/default.nix @@ -145,6 +145,14 @@ let owner = "eriedaberrie"; repo = "grim-hyprland"; }; + + nixcord = mkDep { + owner = "kaylorben"; + repo = "nixcord"; + + # FIXME: https://github.com/KaylorBen/nixcord/pull/69 + rev = "02247bedd6988a1169c4499406970b92bfd8aa02"; + }; }; agsInputs = { diff --git a/modules/desktop/environment/modules/packages.nix b/modules/desktop/environment/modules/packages.nix index 74497dda..91a77a68 100644 --- a/modules/desktop/environment/modules/packages.nix +++ b/modules/desktop/environment/modules/packages.nix @@ -5,7 +5,7 @@ self: { ... }: let inherit (self.lib.hypr) mkBind; - inherit (self.inputs) jellyfin-flake; + inherit (self.inputs) jellyfin-flake nixcord; inherit (lib) attrValues getExe mkIf optionals; inherit (pkgs.writers) writeTOML; @@ -43,6 +43,8 @@ in { (import ../home/mpv.nix self) (import ../home/obs.nix self) + nixcord.homeManagerModules.nixcord + ({config, ...}: let inherit (config.lib.file) mkOutOfStoreSymlink; configDir = "${flakeDir}/modules/desktop/environment/config"; @@ -66,14 +68,80 @@ in { }) ]; - programs.sioyek = { - enable = true; + programs = { + nixcord = { + enable = true; - config = { - startup_commands = "toggle_custom_color"; - ui_font = "JetBrainsMono Nerd Font Mono Regular"; - font_size = "24"; - source = toString self.scopedPackages.${pkgs.system}.dracula.sioyek; + discord = { + vencord.unstable = true; + + settings = { + skipHostUpdate = true; + dangerousEnableDevtoolsOnlyEnableIfYouKnowWhatYoureDoing = true; + minWidth = 940; + minHeight = 500; + isMaximized = true; + isMinimized = false; + enableHardwareAcceleration = !isNvidia; + }; + }; + + config = { + notifyAboutUpdates = false; + autoUpdate = false; + autoUpdateNotification = false; + + themeLinks = [ + "https://markchan0225.github.io/RoundedDiscord/RoundedDiscord.theme.css" + "https://raw.githubusercontent.com/dracula/BetterDiscord/master/Dracula_Official.theme.css" + ]; + + plugins = { + alwaysTrust.enable = true; + biggerStreamPreview.enable = true; + clearURLs.enable = true; + crashHandler.enable = true; + disableCallIdle.enable = true; + emoteCloner.enable = true; + imageZoom.enable = true; + memberCount.enable = true; + messageLinkEmbeds.enable = true; + + messageLogger = { + enable = true; + ignoreBots = true; + ignoreSelf = true; + }; + + mutualGroupDMs.enable = true; + onePingPerDM.enable = true; + openInApp.enable = true; + platformIndicators.enable = true; + previewMessage.enable = true; + readAllNotificationsButton.enable = true; + reverseImageSearch.enable = true; + spotifyCrack.enable = true; + themeAttributes.enable = true; + typingIndicator.enable = true; + typingTweaks.enable = true; + viewIcons.enable = true; + viewRaw.enable = true; + voiceChatDoubleClick.enable = true; + volumeBooster.enable = true; + whoReacted.enable = true; + }; + }; + }; + + sioyek = { + enable = true; + + config = { + startup_commands = "toggle_custom_color"; + ui_font = "JetBrainsMono Nerd Font Mono Regular"; + font_size = "24"; + source = toString self.scopedPackages.${pkgs.system}.dracula.sioyek; + }; }; }; @@ -96,6 +164,7 @@ in { swayimg nextcloud-client prismlauncher + vesktop # screen-sharing on desktop ; # tools @@ -116,14 +185,6 @@ in { .jellyfin-media-player .override {isNvidiaWayland = isNvidia;}; - /* - Discord themes for Vencord - https://markchan0225.github.io/RoundedDiscord/RoundedDiscord.theme.css - https://raw.githubusercontent.com/dracula/BetterDiscord/master/Dracula_Official.theme.css - */ - discord = pkgs.discord.override {withVencord = true;}; - inherit (pkgs) vesktop; - GParted = let inherit (pkgs) writeShellScriptBin libsForQt5 gparted makeWrapper symlinkJoin;