dotfiles
My PC Dotfiles & Websitegit clone https://github.com/maydayv7/dotfiles
commit 39ab0c9ee2972cc0be2bc39a2f9fef5b5c1bc0f6 parent 0afc627656f4ef83c3104bb140de98392eb8c0bb Author: maydayv7 <maydayv7@gmail.com> Date: Sun, 1 Dec 2024 22:58:15 +0530 feat: Use Vesktop instead of Discord Also add `valkyrie` keyboard aura and fix Logseq config mutability
Diffstat:
| M | README.md | | | 2 | +- |
| M | devices/valkyrie/drivers.nix | | | 18 | ++---------------- |
| A | devices/valkyrie/settings/asusd.ron | | | 16 | ++++++++++++++++ |
| A | devices/valkyrie/settings/aura.ron | | | 99 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
| M | files/README.md | | | 2 | ++ |
| M | files/flake.nix | | | 7 | +++++++ |
| A | files/vesktop/prefs.json | | | 5 | +++++ |
| A | files/vesktop/settings.json | | | 649 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
| M | flake.lock | | | 6 | +++--- |
| M | modules/apps/discord.nix | | | 22 | +++++++--------------- |
| M | modules/apps/notes.nix | | | 8 | ++++++-- |
| M | modules/gui/desktop/gnome/default.nix | | | 2 | +- |
| M | modules/gui/desktop/hyprland/apps/default.nix | | | 2 | +- |
| M | modules/gui/desktop/xfce/default.nix | | | 2 | +- |
14 files changed, 800 insertions(+), 40 deletions(-)
diff --git a/README.md b/README.md @@ -792,7 +792,7 @@ You can navigate to the `README`s present in the various directories to know mor - Online accounts have to be manually signed into - [Wine](./packages/wine) Applications have to be manually updated -- Plugins for Discord, ULauncher have to be manually updated +- ULauncher Plugins have to be manually updated - Logseq Plugins have to be manually installed - GNOME [Pano](https://github.com/oae/gnome-shell-pano) has to be manually updated until upstream stabilises diff --git a/devices/valkyrie/drivers.nix b/devices/valkyrie/drivers.nix @@ -50,22 +50,8 @@ in { services.asusd = { enable = true; enableUserService = true; - asusdConfig = '' - ( - boot_sound: false, - change_throttle_policy_on_ac: true, - change_throttle_policy_on_battery: true, - charge_control_end_threshold: 95, - disable_nvidia_powerd_on_battery: true, - mini_led_mode: false, - panel_od: false, - throttle_balanced_epp: BalancePower, - throttle_performance_epp: Performance, - throttle_policy_linked_epp: true, - throttle_policy_on_ac: Performance, - throttle_policy_on_battery: Quiet, - throttle_quiet_epp: Power, - )''; + asusdConfig = builtins.readFile ./settings/asusd.ron; + auraConfig = builtins.readFile ./settings/aura.ron; }; user.homeConfig = { diff --git a/devices/valkyrie/settings/asusd.ron b/devices/valkyrie/settings/asusd.ron @@ -0,0 +1,15 @@ +( + boot_sound: false, + change_throttle_policy_on_ac: true, + change_throttle_policy_on_battery: true, + charge_control_end_threshold: 95, + disable_nvidia_powerd_on_battery: true, + mini_led_mode: false, + panel_od: false, + throttle_balanced_epp: BalancePower, + throttle_performance_epp: Performance, + throttle_policy_linked_epp: true, + throttle_policy_on_ac: Performance, + throttle_policy_on_battery: Quiet, + throttle_quiet_epp: Power, +) +\ No newline at end of file diff --git a/devices/valkyrie/settings/aura.ron b/devices/valkyrie/settings/aura.ron @@ -0,0 +1,99 @@ +( + config_name: "Keyboard Aura", + brightness: Med, + current_mode: Static, + builtins: { + Static: ( + mode: Static, + zone: None, + colour1: ( + r: 255, + g: 255, + b: 255, + ), + colour2: ( + r: 0, + g: 0, + b: 0, + ), + speed: Med, + direction: Right, + ), + Breathe: ( + mode: Breathe, + zone: None, + colour1: ( + r: 255, + g: 255, + b: 255, + ), + colour2: ( + r: 0, + g: 0, + b: 0, + ), + speed: Med, + direction: Right, + ), + RainbowCycle: ( + mode: RainbowCycle, + zone: None, + colour1: ( + r: 255, + g: 255, + b: 255, + ), + colour2: ( + r: 0, + g: 0, + b: 0, + ), + speed: Med, + direction: Right, + ), + RainbowWave: ( + mode: RainbowWave, + zone: None, + colour1: ( + r: 255, + g: 255, + b: 255, + ), + colour2: ( + r: 0, + g: 0, + b: 0, + ), + speed: Med, + direction: Right, + ), + Pulse: ( + mode: Pulse, + zone: None, + colour1: ( + r: 255, + g: 255, + b: 255, + ), + colour2: ( + r: 0, + g: 0, + b: 0, + ), + speed: Med, + direction: Right, + ), + }, + multizone_on: false, + enabled: ( + states: [ + ( + zone: Keyboard, + boot: true, + awake: true, + sleep: false, + shutdown: false, + ), + ], + ), +) diff --git a/files/README.md b/files/README.md @@ -14,12 +14,14 @@ The `files` directory is used to store all my plain-text program configuration f - [`gtk`](./gtk) - GTK+ Theming and Styles - [`hyprland`](./hyprland) - Hyprland WM Configuration - [`images`](./images) - Personal Wallpapers and Profile Pictures +- [`logseq`](./logseq) - Logseq Notes Configuration - [`nano`](./nano) - `nano` Text Editor Global Configuration - [`pantheon`](./pantheon) - Configuration Files for Pantheon Desktop - [`proprietary`](https://github.com/maydayv7/proprietary) - Custom Proprietary Files - [`templates`](./templates) - Document Templates - [`touchegg`](./touchegg) - Touchegg X11 Touchpad Gestures - [`ulauncher`](./ulauncher) - ULauncher Application Launcher Settings & Plugins +- [`vesktop`](./vesktop) - Vesktop Discord Chat Configuration - [`vscode`](./vscode) - Visual Studio Code Editor Configuration - [`wine`](./wine) - Configuration and Theming for `wine` applications - [`xdg`](./xdg) - XDG Desktop Utilities Configuration diff --git a/files/flake.nix b/files/flake.nix @@ -169,6 +169,13 @@ extensions = ./ulauncher/extensions; }; + # Vesktop Discord Chat + vesktop = map.files { + directory = ./vesktop; + apply = readFile; + extension = ".json"; + }; + # Visual Studio Code Editor vscode = map.files { directory = ./vscode; diff --git a/files/vesktop/prefs.json b/files/vesktop/prefs.json @@ -0,0 +1,5 @@ +{ + "discordBranch": "stable", + "minimizeToTray": true, + "arRPC": true +} diff --git a/files/vesktop/settings.json b/files/vesktop/settings.json @@ -0,0 +1,649 @@ +{ + "autoUpdate": true, + "autoUpdateNotification": true, + "useQuickCss": true, + "themeLinks": [], + "enabledThemes": [], + "enableReactDevtools": false, + "frameless": false, + "transparent": false, + "winCtrlQ": false, + "disableMinSize": false, + "winNativeTitleBar": true, + "plugins": { + "ChatInputButtonAPI": { + "enabled": true + }, + "CommandsAPI": { + "enabled": true + }, + "DynamicImageModalAPI": { + "enabled": true + }, + "MemberListDecoratorsAPI": { + "enabled": true + }, + "MessageAccessoriesAPI": { + "enabled": true + }, + "MessageDecorationsAPI": { + "enabled": true + }, + "MessageEventsAPI": { + "enabled": true + }, + "MessagePopoverAPI": { + "enabled": true + }, + "MessageUpdaterAPI": { + "enabled": true + }, + "ServerListAPI": { + "enabled": true + }, + "UserSettingsAPI": { + "enabled": true + }, + "AccountPanelServerProfile": { + "enabled": false + }, + "AlwaysAnimate": { + "enabled": false + }, + "AlwaysExpandRoles": { + "enabled": false + }, + "AlwaysTrust": { + "enabled": false, + "domain": true, + "file": true + }, + "AnonymiseFileNames": { + "enabled": false + }, + "AppleMusicRichPresence": { + "enabled": false + }, + "WebRichPresence (arRPC)": { + "enabled": false + }, + "BANger": { + "enabled": false + }, + "BetterFolders": { + "enabled": true, + "sidebar": true, + "showFolderIcon": 1, + "keepIcons": false, + "closeAllHomeButton": true, + "closeAllFolders": false, + "forceOpen": false, + "sidebarAnim": true, + "closeOthers": false + }, + "BetterGifAltText": { + "enabled": true + }, + "BetterGifPicker": { + "enabled": true + }, + "BetterNotesBox": { + "enabled": false + }, + "BetterRoleContext": { + "enabled": true, + "roleIconFileFormat": "png" + }, + "BetterRoleDot": { + "enabled": false + }, + "BetterSessions": { + "enabled": true, + "backgroundCheck": false + }, + "BetterSettings": { + "enabled": true, + "disableFade": true, + "organizeMenu": true, + "eagerLoad": true + }, + "BetterUploadButton": { + "enabled": false + }, + "BiggerStreamPreview": { + "enabled": true + }, + "BlurNSFW": { + "enabled": true, + "blurAmount": 10 + }, + "CallTimer": { + "enabled": false + }, + "ClearURLs": { + "enabled": false + }, + "ClientTheme": { + "enabled": false + }, + "ColorSighted": { + "enabled": false + }, + "ConsoleJanitor": { + "enabled": false + }, + "ConsoleShortcuts": { + "enabled": false + }, + "CopyEmojiMarkdown": { + "enabled": true, + "copyUnicode": true + }, + "CopyFileContents": { + "enabled": true + }, + "CopyUserURLs": { + "enabled": true + }, + "CrashHandler": { + "enabled": true + }, + "CtrlEnterSend": { + "enabled": false, + "submitRule": "ctrl+enter", + "sendMessageInTheMiddleOfACodeBlock": true + }, + "CustomRPC": { + "enabled": false, + "type": 0, + "timestampMode": 0 + }, + "CustomIdle": { + "enabled": false, + "idleTimeout": 10, + "remainInIdle": true + }, + "Dearrow": { + "enabled": false + }, + "Decor": { + "enabled": true + }, + "DisableCallIdle": { + "enabled": false + }, + "DontRoundMyTimestamps": { + "enabled": false + }, + "EmoteCloner": { + "enabled": true + }, + "Experiments": { + "enabled": false + }, + "F8Break": { + "enabled": false + }, + "FakeNitro": { + "enabled": false + }, + "FakeProfileThemes": { + "enabled": false + }, + "FavoriteEmojiFirst": { + "enabled": true + }, + "FavoriteGifSearch": { + "enabled": true + }, + "FixCodeblockGap": { + "enabled": false + }, + "FixImagesQuality": { + "enabled": true + }, + "FixSpotifyEmbeds": { + "enabled": true + }, + "FixYoutubeEmbeds": { + "enabled": false + }, + "ForceOwnerCrown": { + "enabled": false + }, + "FriendInvites": { + "enabled": false + }, + "FriendsSince": { + "enabled": true + }, + "FullSearchContext": { + "enabled": true + }, + "GameActivityToggle": { + "enabled": false + }, + "GifPaste": { + "enabled": false + }, + "GreetStickerPicker": { + "enabled": false + }, + "HideAttachments": { + "enabled": false + }, + "iLoveSpam": { + "enabled": false + }, + "IgnoreActivities": { + "enabled": false + }, + "ImageLink": { + "enabled": false + }, + "ImageZoom": { + "enabled": true, + "saveZoomValues": true, + "invertScroll": true, + "nearestNeighbour": false, + "square": false, + "zoom": 2, + "size": 100, + "zoomSpeed": 0.5 + }, + "ImplicitRelationships": { + "enabled": false + }, + "InvisibleChat": { + "enabled": false + }, + "KeepCurrentChannel": { + "enabled": false + }, + "LastFMRichPresence": { + "enabled": false + }, + "LoadingQuotes": { + "enabled": false, + "replaceEvents": true, + "enablePluginPresetQuotes": true, + "enableDiscordPresetQuotes": false, + "additionalQuotes": "", + "additionalQuotesDelimiter": "|" + }, + "MemberCount": { + "enabled": true + }, + "MentionAvatars": { + "enabled": true, + "showAtSymbol": true + }, + "MessageClickActions": { + "enabled": true, + "enableDeleteOnClick": true, + "enableDoubleClickToEdit": true, + "enableDoubleClickToReply": true, + "requireModifier": false + }, + "MessageLatency": { + "enabled": false + }, + "MessageLinkEmbeds": { + "enabled": true + }, + "MessageLogger": { + "enabled": false + }, + "MessageTags": { + "enabled": false + }, + "MoreCommands": { + "enabled": false + }, + "MoreKaomoji": { + "enabled": true + }, + "MoreUserTags": { + "enabled": false + }, + "Moyai": { + "enabled": false + }, + "MutualGroupDMs": { + "enabled": false + }, + "NewGuildSettings": { + "enabled": false + }, + "NoBlockedMessages": { + "enabled": false + }, + "NoDevtoolsWarning": { + "enabled": false + }, + "NoF1": { + "enabled": false + }, + "NoMaskedUrlPaste": { + "enabled": false + }, + "NoMosaic": { + "enabled": false + }, + "NoOnboardingDelay": { + "enabled": false + }, + "NoPendingCount": { + "enabled": false, + "hideFriendRequestsCount": true, + "hideMessageRequestsCount": true, + "hidePremiumOffersCount": true + }, + "NoProfileThemes": { + "enabled": false + }, + "NoReplyMention": { + "enabled": false + }, + "NoScreensharePreview": { + "enabled": false + }, + "NoServerEmojis": { + "enabled": false + }, + "NoTypingAnimation": { + "enabled": false + }, + "NoUnblockToJump": { + "enabled": true + }, + "NormalizeMessageLinks": { + "enabled": false + }, + "NotificationVolume": { + "enabled": false, + "notificationVolume": 100 + }, + "NSFWGateBypass": { + "enabled": false + }, + "OnePingPerDM": { + "enabled": false, + "channelToAffect": "both_dms", + "allowMentions": false, + "allowEveryone": false + }, + "oneko": { + "enabled": false + }, + "OpenInApp": { + "enabled": false + }, + "OverrideForumDefaults": { + "enabled": false + }, + "PartyMode": { + "enabled": false + }, + "PauseInvitesForever": { + "enabled": false + }, + "PermissionFreeWill": { + "enabled": false + }, + "PermissionsViewer": { + "enabled": false + }, + "petpet": { + "enabled": false + }, + "PictureInPicture": { + "enabled": true + }, + "PinDMs": { + "enabled": true, + "pinOrder": 0, + "dmSectioncollapsed": false + }, + "PlainFolderIcon": { + "enabled": false + }, + "PlatformIndicators": { + "enabled": true, + "list": false, + "badges": true, + "messages": false, + "colorMobileIndicator": true + }, + "PreviewMessage": { + "enabled": true + }, + "QuickMention": { + "enabled": true + }, + "QuickReply": { + "enabled": false + }, + "ReactErrorDecoder": { + "enabled": false + }, + "ReadAllNotificationsButton": { + "enabled": true + }, + "RelationshipNotifier": { + "enabled": true + }, + "ReplaceGoogleSearch": { + "enabled": false + }, + "ReplyTimestamp": { + "enabled": true + }, + "RevealAllSpoilers": { + "enabled": false + }, + "ReverseImageSearch": { + "enabled": false + }, + "ReviewDB": { + "enabled": false + }, + "RoleColorEverywhere": { + "enabled": false + }, + "SecretRingToneEnabler": { + "enabled": false + }, + "Summaries": { + "enabled": false + }, + "SendTimestamps": { + "enabled": false + }, + "ServerInfo": { + "enabled": true + }, + "ServerListIndicators": { + "enabled": true + }, + "ShikiCodeblocks": { + "enabled": false + }, + "ShowAllMessageButtons": { + "enabled": false + }, + "ShowConnections": { + "enabled": false + }, + "ShowHiddenChannels": { + "enabled": true, + "hideUnreads": true, + "showMode": 0, + "defaultAllowedUsersAndRolesDropdownState": true + }, + "ShowHiddenThings": { + "enabled": true, + "showTimeouts": true, + "showInvitesPaused": true, + "showModView": true, + "disableDiscoveryFilters": true, + "disableDisallowedDiscoveryFilters": true + }, + "ShowMeYourName": { + "enabled": true, + "mode": "user-nick", + "displayNames": false, + "inReplies": false + }, + "ShowTimeoutDuration": { + "enabled": false + }, + "SilentMessageToggle": { + "enabled": false + }, + "SilentTyping": { + "enabled": false + }, + "SortFriendRequests": { + "enabled": false + }, + "SpotifyControls": { + "enabled": false, + "hoverControls": false, + "useSpotifyUris": false + }, + "SpotifyCrack": { + "enabled": false, + "noSpotifyAutoPause": true, + "keepSpotifyActivityOnIdle": false + }, + "SpotifyShareCommands": { + "enabled": true + }, + "StartupTimings": { + "enabled": false + }, + "StickerPaste": { + "enabled": false + }, + "StreamerModeOnStream": { + "enabled": false + }, + "SuperReactionTweaks": { + "enabled": false + }, + "TextReplace": { + "enabled": false + }, + "ThemeAttributes": { + "enabled": false + }, + "Translate": { + "enabled": false + }, + "TypingIndicator": { + "enabled": false, + "includeCurrentChannel": true, + "includeMutedChannels": false, + "includeBlockedUsers": false, + "indicatorMode": 3 + }, + "TypingTweaks": { + "enabled": true, + "showAvatars": true, + "showRoleColors": true, + "alternativeFormatting": true + }, + "Unindent": { + "enabled": false + }, + "UnlockedAvatarZoom": { + "enabled": true + }, + "UnsuppressEmbeds": { + "enabled": false + }, + "UserMessagesPronouns": { + "enabled": false + }, + "UserVoiceShow": { + "enabled": false + }, + "USRBG": { + "enabled": false + }, + "ValidReply": { + "enabled": false + }, + "ValidUser": { + "enabled": true + }, + "VoiceChatDoubleClick": { + "enabled": true + }, + "VcNarrator": { + "enabled": false + }, + "VencordToolbox": { + "enabled": false + }, + "ViewIcons": { + "enabled": false + }, + "ViewRaw": { + "enabled": false + }, + "VoiceDownload": { + "enabled": true + }, + "VoiceMessages": { + "enabled": true, + "noiseSuppression": true, + "echoCancellation": true + }, + "VolumeBooster": { + "enabled": true + }, + "WebKeybinds": { + "enabled": true + }, + "WebScreenShareFixes": { + "enabled": true + }, + "WhoReacted": { + "enabled": true + }, + "XSOverlay": { + "enabled": false + }, + "YoutubeAdblock": { + "enabled": false + }, + "NoTrack": { + "enabled": true, + "disableAnalytics": true + }, + "WebContextMenus": { + "enabled": true, + "addBack": true + }, + "Settings": { + "enabled": true, + "settingsLocation": "aboveNitro" + }, + "SupportHelper": { + "enabled": true + } + }, + "notifications": { + "timeout": 5000, + "position": "bottom-right", + "useNative": "not-focused", + "logLimit": 50 + }, + "cloud": { + "authenticated": false, + "url": "https://api.vencord.dev/", + "settingsSync": false + } +} diff --git a/flake.lock b/flake.lock @@ -927,11 +927,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1712129369, - "narHash": "sha256-v3i9RMQjJ8Vgk8i0HK4CQgXAOuRtvPVupHri6rkjWzY=", + "lastModified": 1732998037, + "narHash": "sha256-HugmFD5pODeXZ22g+34Xv7cjPCXDiKsKqV1R3M9xppg=", "owner": "maydayv7", "repo": "proprietary", - "rev": "45552f2069239c3b59bee339503fc005423b5da6", + "rev": "d2c901db758e8a0ac0b007218ce8b930ab462f87", "type": "github" }, "original": { diff --git a/modules/apps/discord.nix b/modules/apps/discord.nix @@ -4,27 +4,19 @@ pkgs, files, ... -}: let +}: +with files.vesktop; let enable = builtins.elem "discord" config.apps.list; in { ## Discord Configuration ## config = lib.mkIf enable { - environment.systemPackages = with pkgs; [betterdiscordctl discord]; + environment.systemPackages = [pkgs.vesktop]; user = { - persist.directories = [".config/BetterDiscord" ".config/discord"]; - homeConfig.home = { - # Plugins - file.".config/BetterDiscord/plugins" = { - source = files.proprietary.discord; - recursive = true; - }; - - # Discord Activation - activation.discordSetup = lib.hm.dag.entryAfter ["writeBoundary"] '' - echo "Setting up Discord..." - run /usr/bin/env betterdiscordctl $VERBOSE_ARG install || true - ''; + persist.directories = [".config/vesktop"]; + homeConfig.home.file = { + ".config/vesktop/settings.json".text = prefs; + ".config/vesktop/settings/settings.json".text = settings; }; }; }; diff --git a/modules/apps/notes.nix b/modules/apps/notes.nix @@ -8,6 +8,10 @@ }: with files.logseq; let enable = builtins.elem "notes" config.apps.list; + mutable = { + mutable = true; + force = true; + }; in { ## Logseq Configuration ## config = lib.mkIf enable { @@ -18,13 +22,13 @@ in { homeConfig.home.file = { ".config/logseq/configs.edn".text = ''{:window/native-titlebar? true}''; - ".logseq/preferences.json".text = prefs; + ".logseq/preferences.json" = {text = prefs;} // mutable; } // util.map.folder { directory = settings; path = ".logseq/settings"; extension = ".json"; - apply = text: {inherit text;}; + apply = text: {inherit text;} // mutable; replace = { placeholders = ["@bg"]; values = [config.lib.stylix.colors.base00]; diff --git a/modules/gui/desktop/gnome/default.nix b/modules/gui/desktop/gnome/default.nix @@ -216,7 +216,7 @@ in { ".mozilla/firefox/default/chrome/userContent.css".text = ''@import "${pkgs.custom.firefox-gnome-theme}/userContent.css";''; # Discord DNOME Theme - ".config/BetterDiscord/data/stable/custom.css" = + ".config/vesktop/settings/quickCss.css" = mkIf (exists "discord") {text = ''@import url("https://raw.githack.com/GeopJr/DNOME/dist/DNOME.css");'';}; # Logseq Bonofix Theme diff --git a/modules/gui/desktop/hyprland/apps/default.nix b/modules/gui/desktop/hyprland/apps/default.nix @@ -332,7 +332,7 @@ in { ## 3rd Party Apps Configuration // { # Discord Chat - ".config/BetterDiscord/data/stable/custom.css" = with theme; + ".config/vesktop/settings/quickCss.css" = with theme; mkIf (exists "discord") {text = ''@import url("https://${name}.github.io/discord/dist/${name}-${variant}-${accent}.theme.css");'';}; # Logseq Notes diff --git a/modules/gui/desktop/xfce/default.nix b/modules/gui/desktop/xfce/default.nix @@ -222,7 +222,7 @@ in { user.homeConfig = { home.file = { # Discord Nord Theme - ".config/BetterDiscord/data/stable/custom.css" = + ".config/vesktop/settings/quickCss.css" = mkIf (exists "discord") {text = ''@import url(https://rawcdn.githack.com/orblazer/discord-nordic/f3f6833c70d0b27b1cde986233b7009d61917812/nordic.theme.css);'';}; # Logseq Nord Theme