From 0b066ea9deddaa224e7abeb49023432f3e404f4a Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Wed, 10 Apr 2024 19:21:46 +0200 Subject: [PATCH] fixed even more typos --- hosts/default.nix | 12 +- hosts/vali/configuration.nix | 16 +- {modules/graphics/wms => hosts/vali}/i3wm.nix | 0 hosts/vali/programs.nix | 4 +- modules/cli/zsh.nix | 4 +- modules/default.nix | 12 +- modules/graphics/default.nix | 6 - modules/gui/default.nix | 382 +----------------- modules/gui/vesktop.nix | 373 +++++++++++++++++ modules/gui/zathura.nix | 30 ++ modules/services/pipewire.nix | 4 +- modules/tui/btop.nix | 7 +- modules/tui/default.nix | 2 +- options/common/gpu/nvidia.nix | 4 +- 14 files changed, 446 insertions(+), 410 deletions(-) rename {modules/graphics/wms => hosts/vali}/i3wm.nix (100%) delete mode 100644 modules/graphics/default.nix create mode 100644 modules/gui/vesktop.nix create mode 100644 modules/gui/zathura.nix diff --git a/hosts/default.nix b/hosts/default.nix index a4a8c4a..a2e48b5 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -6,11 +6,11 @@ in { vali = lib.nixosSystem { system = "x86_64-linux"; specialArgs = { inherit lib inputs self; }; + modules = [ + ./vali + ../modules + inputs.home-manager.nixosModules.home-manager + inputs.agenix.nixosModules.default + ]; }; - modules = [ - ./vali - ../modules - inputs.home-manager.nixosModules.home-manager - inputs.agenix.nixosModules.default - ]; } diff --git a/hosts/vali/configuration.nix b/hosts/vali/configuration.nix index 1fe6d16..401e4d3 100644 --- a/hosts/vali/configuration.nix +++ b/hosts/vali/configuration.nix @@ -1,5 +1,6 @@ { config, inputs, pkgs, ... }: { + nixpkgs.config.allowUnfree = true; time.timeZone = "Europe/Zurich"; security.sudo.package = pkgs.sudo.override { withInsults = true; }; security.polkit.enable = true; @@ -12,14 +13,14 @@ }; home-manager = { enable = true; + enableDirenv = true; }; }; programs = { - vesktop.enable = true; + # vesktop.enable = true; btop.enable = true; mpv.enable = true; neovim.enable = true; - pipewire.enable = true; git = { enable = true; userName = "vali"; @@ -31,10 +32,11 @@ enable = true; profiling = false; }; - i3 = { - - }; + #i3 = { }; }; + services = { + pipewire.enable = true; + }; themes = { cursor = { enable = true; @@ -50,13 +52,13 @@ accentColour = "green"; iconTtheme = { name = "Papirus-Dark"; - package = pkgs.catppuccin-papirus-foldersM + package = pkgs.catppuccin-papirus-folders; }; }; qt = { enable = true; package = pkgs.catppuccin-kde; - name = "Catppuccin-Mocha-Dark" + name = "Catppuccin-Mocha-Dark"; variant = "mocha"; accentColour = "green"; }; diff --git a/modules/graphics/wms/i3wm.nix b/hosts/vali/i3wm.nix similarity index 100% rename from modules/graphics/wms/i3wm.nix rename to hosts/vali/i3wm.nix diff --git a/hosts/vali/programs.nix b/hosts/vali/programs.nix index fc3d363..3011911 100644 --- a/hosts/vali/programs.nix +++ b/hosts/vali/programs.nix @@ -1,7 +1,7 @@ { config, inputs, pkgs, ... }: let username = config.myOptions.other.system.usermame; -in +in { home-manager.users.${username} = { home.packages = let @@ -54,4 +54,4 @@ in strawberry ]; }; - } +} diff --git a/modules/cli/zsh.nix b/modules/cli/zsh.nix index 47b4b27..052ab2c 100644 --- a/modules/cli/zsh.nix +++ b/modules/cli/zsh.nix @@ -34,11 +34,11 @@ in { rm = "trash -v"; l = "eza -a --icons"; la = "eza -lha --icons --git"; - cd = "zoxide" + cd = "zoxide"; } // cfg.extraAliases; initExtraFirst = mkIf cfg.profiling "zmodload zsh/zprof"; initExtra = mkIf cfg.profiling "zprof"; - history { + history = { path = "${config.home-manager.users.${username}.xdg.dataHome}/zsh/zsh_history"; size = 99999; save = 99999; diff --git a/modules/default.nix b/modules/default.nix index 48e5635..6e2b2ef 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -1,9 +1,9 @@ -{ pkgs, lib, config, ...}: -{ +_: { imports = [ - ./cli/default.nix - ./gui/default.nix - ./other/default.nix - ./services/default.nix + ./cli + ./gui + ./tui + ./other + ./services ]; } diff --git a/modules/graphics/default.nix b/modules/graphics/default.nix deleted file mode 100644 index 2acb87b..0000000 --- a/modules/graphics/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ pkgs, lib, config, ... }: -{ - imports = [ - ./wms/i3wm.nix - ]; -} diff --git a/modules/gui/default.nix b/modules/gui/default.nix index ab8eb18..7768a1e 100644 --- a/modules/gui/default.nix +++ b/modules/gui/default.nix @@ -1,373 +1,11 @@ -{ - config, - lib, - pkgs, - ... -}: with lib; let - cfg = config.myOptions.programs.vesktop; - username = config.myOptions.other.system.username; -in { - options.myOptions.programs.vesktop = { - enable = mkEnableOption "vesktop"; - }; - - config = mkIf cfg.enable { - home-manager.users.${username} = { - xdg.configFile."vesktop/settings.json".text = builtins.toJSON { - discordBranch = "ptb"; - firstLaunch = false; - arRPC = "on"; - splashColor = "rgb(219, 222, 225)"; - splashBackground = "rgb(49, 51, 56)"; - checkUpdates = false; - staticTitle = true; - disableMinSize = true; - minimizeToTray = false; - tray = false; - appBadge = false; - }; - - xdg.configFile."vesktop/settings/settings.json".text = builtins.toJSON { - notifyAboutUpdates = false; - autoUpdate = false; - autoUpdateNotification = false; - useQuickCss = true; - themeLinks = []; - enabledThemes = ["Catppuccin.theme.css"]; - enableReactDevtools = true; - frameless = false; - transparent = false; - winCtrlQ = false; - macosTranslucency = false; - disableMinSize = true; - winNativeTitleBar = false; - plugins = { - BadgeAPI.enabled = true; - CommandsAPI.enabled = true; - ContextMenuAPI.enabled = true; - MemberListDecoratorsAPI.enabled = true; - MessageAccessoriesAPI.enabled = true; - MessageDecorationsAPI.enabled = true; - MessageEventsAPI.enabled = true; - MessagePopoverAPI.enabled = true; - NoticesAPI.enabled = true; - ServerListAPI.enabled = true; - SettingsStoreAPI.enabled = true; - NoTrack.enabled = true; - Settings = { - enabled = true; - settingsLocation = "aboveActivity"; - }; - AlwaysAnimate.enabled = false; - AlwaysTrust.enabled = false; - AnonymiseFileNames.enabled = false; - "WebRichPresence (arRPC)".enabled = false; - BANger.enabled = false; - BetterFolders = { - enabled = true; - sidebar = true; - sidebarAnim = true; - closeAllFolders = false; - closeAllHomeButton = false; - closeOthers = false; - forceOpen = false; - keepIcons = false; - showFolderIcon = 1; - }; - BetterGifAltText.enabled = false; - BetterNotesBox.enabled = false; - BetterRoleDot.enabled = false; - BetterUploadButton.enabled = true; - BiggerStreamPreview.enabled = true; - BlurNSFW.enabled = false; - CallTimer = { - enabled = true; - format = "human"; - }; - ClearURLs.enabled = true; - ColorSighted.enabled = true; - ConsoleShortcuts.enabled = false; - CopyUserURLs.enabled = true; - CrashHandler.enabled = true; - CustomRPC.enabled = false; - Dearrow.enabled = true; - DisableDMCallIdle.enabled = true; - EmoteCloner.enabled = false; - Experiments = { - enabled = true; - enableIsStaff = false; - }; - F8Break.enabled = false; - FakeNitro = { - enabled = true; - enableEmojiBypass = true; - emojiSize = 48; - transformEmojis = true; - enableStickerBypass = true; - stickerSize = 160; - transformStickers = true; - transformCompoundSentence = false; - enableStreamQualityBypass = true; - }; - FakeProfileThemes = { - enabled = true; - nitroFirst = true; - }; - FavoriteEmojiFirst.enabled = true; - FavoriteGifSearch = { - enabled = true; - searchOption = "hostandpath"; - }; - FixImagesQuality.enabled = true; - FixSpotifyEmbed = { - enabled = true; - volume = 10; - }; - ForceOwnerCrown.enabled = true; - FriendInvites.enabled = false; - GameActivityToggle.enabled = true; - GifPaste.enabled = true; - HideAttachments.enabled = true; - iLoveSpam.enabled = true; - IgnoreActivities = { - enabled = true; - ignoredActivities = []; - }; - ImageZoom = { - enabled = true; - saveZoomValues = true; - invertScroll = true; - nearestNeighbour = false; - square = false; - zoom = 2; - size = 100; - zoomSpeed = 0.5; - }; - InvisibleChat = { - enabled = true; - savedPasswords = "password"; - }; - KeepCurrentChannel.enabled = true; - LastFMRichPresence.enabled = false; - LoadingQuotes.enabled = false; - MemberCount.enabled = true; - MessageClickActions = { - enabled = true; - enableDeleteOnClick = true; - enableDoubleClickToEdit = true; - enableDoubeClickToReply = true; - requireModifier = true; - }; - MessageLinkEmbeds = { - enabled = true; - automodEmbeds = "never"; - listMode = "blacklist"; - idList = ""; - }; - MessageLogger = { - enabled = true; - deleteStyle = "text"; - ignoreBots = false; - ignoreSelf = false; - ignoreUsers = ""; - ignoreChannels = ""; - ignoreGuilds = ""; - }; - MessageTags.enabled = false; - MoreCommands.enabled = true; - MoreKaomoji.enabled = true; - MoreUserTags.enabled = true; - Moyai.enabled = false; - MuteNewGuild = { - enabled = true; - guild = false; - everyone = true; - role = true; - }; - MutualGroupDMs.enabled = true; - NoBlockedMessages = { - enabled = false; - ignoreBlockedMessages = false; - }; - NoDevtoolsWarning.enabled = false; - NoF1.enabled = false; - NoPendingCount.enabled = false; - NoProfileThemes.enabled = true; - NoReplyMention = { - enabled = true; - userList = "372809091208445953"; - shouldPingListed = false; - inverseShiftReply = true; - }; - NoScreensharePreview.enabled = true; - NoTypingAnimation = true; - NoUnblockToJump.enabled = true; - NSFWGateBypass.enabled = true; - oneko.enabled = false; - OpenInApp.enabled = false; - "Party mode 🎉".enabled = false; - PermissionFreeWill = { - enabled = true; - lockout = true; - onboarding = true; - }; - PermissionsViewer = { - enabled = true; - permissionsSortOrder = 0; - defaultPermissionsDropdownState = false; - }; - petpet.enabled = true; - PictureInPicture = { - enabled = true; - loop = false; - }; - PinDMs.enabled = true; - PlainFolderIcon.enabled = false; - PlatformIndicators = { - enabled = true; - list = true; - badges = true; - messages = true; - colorMobileIndicator = true; - }; - PreviewMessage.enabled = true; - PronounDB.enabled = false; - QuickMention.enabled = false; - QuickReply.enabled = false; - ReactErrorDecoder.enabled = false; - ReadAllNotificationsButton.enabled = false; - RelationshipNotifier = { - enabled = true; - notices = true; - offlineRemovals = true; - friends = true; - friendRequestCancels = true; - servers = true; - groups = true; - }; - RevealAllSpoilers.enabled = true; - ReverseImageSearch.enabled = false; - ReviewDB.enabled = false; - RoleColorEverywhere = { - enabled = true; - chatMentions = true; - memberList = true; - voiceUsers = true; - }; - SearchReply.enabled = true; - SendTimestamps.enabled = false; - ServerListIndicators = { - enabled = true; - mode = 3; - }; - ServerProfile.enabled = true; - ShikiCodeblocks = { - enabled = true; - theme = "https://raw.githubusercontent.com/shikijs/shiki/0b28ad8ccfbf2615f2d9d38ea8255416b8ac3043/packages/shiki/themes/dark-plus.json"; - tryHljs = "SECONDARY"; - uesDevIcon = "GREYSCALE"; - bgOpacity = 100; - }; - ShowAllMessageButtons.enabled = true; - ShowConnections = { - enabled = true; - iconSize = 32; - iconSpacing = 1; - }; - ShowHiddenChannels = { - enabled = true; - hideUnreads = true; - showMode = 0; - defaultAllowedUsersAndRolesDropdownState = true; - }; - ShowMeYourName.enabled = false; - ShowTimeouts.enabled = true; - SilentMessageToggle = { - enabled = true; - persistState = false; - autoDisable = true; - }; - SilentTyping = { - enabled = true; - showIcon = false; - isEnabled = true; - }; - SortFriendRequests.enabled = false; - SpotifyControls.enabled = false; - SpotifyCrack.enabled = false; - SpotifyShareCommands.enabled = false; - StartupTimings.enabled = false; - SupportHelper.enabled = true; - TextReplace.enabled = false; - TimeBarAllActivities.enabled = false; - Translate.enabled = false; - TypingIndicator = { - enabled = true; - includeMutedChannels = false; - includeBlockedUsers = true; - }; - TypingTweaks = { - enabled = true; - showAvatars = true; - showRoleColors = true; - alternativeFormatting = true; - }; - Unindent.enabled = true; - UnsuppressEmbeds.enabled = true; - UrbanDictionary.enabled = false; - UserVoiceShow = { - enabled = true; - showInUserProfileModal = true; - showVoiceChannelSectionHeader = true; - }; - USRBG.enabled = false; - UwUifier.enabled = false; - ValidUser.enabled = false; - VoiceChatDoubleClick.enabled = true; - VcNarrator.enabled = false; - VencordToolbox.enabled = false; - ViewIcons = { - enabled = true; - format = "png"; - imgSize = "2048"; - }; - ViewRaw = { - enabled = true; - clickMethod = "Left"; - }; - VoiceMessages = { - enabled = true; - noiseSuppression = true; - echoCancellation = true; - }; - WebContextMenus = { - enabled = true; - addBack = true; - }; - WebKeybinds.enabled = true; - GreetStickerPicker.enabled = false; - WhoReacted.enabled = true; - Wikisearch.enabled = false; - NormalizeMessageLinks.enabled = false; - "AI Noise Suppression" = { - enabled = true; - isEnabled = true; - }; - SecretRingToneEnabler.enabled = false; - }; - notifications = { - timeout = 5000; - position = "bottom-right"; - useNative = "not-focused"; - logLimit = 50; - }; - cloud = { - authenticated = false; - url = "https://api.vencord.dev/"; - settingsSync = false; - settingsSyncVersion = 1682768329526; - }; - }; - }; - }; +_: { + imports = [ + ./vesktop.nix + ./cursor.nix + ./gtk.nix + ./mpv.nix + ./qt.nix + ./schizofox.nix + ./zathura.nix + ]; } diff --git a/modules/gui/vesktop.nix b/modules/gui/vesktop.nix new file mode 100644 index 0000000..ab8eb18 --- /dev/null +++ b/modules/gui/vesktop.nix @@ -0,0 +1,373 @@ +{ + config, + lib, + pkgs, + ... +}: with lib; let + cfg = config.myOptions.programs.vesktop; + username = config.myOptions.other.system.username; +in { + options.myOptions.programs.vesktop = { + enable = mkEnableOption "vesktop"; + }; + + config = mkIf cfg.enable { + home-manager.users.${username} = { + xdg.configFile."vesktop/settings.json".text = builtins.toJSON { + discordBranch = "ptb"; + firstLaunch = false; + arRPC = "on"; + splashColor = "rgb(219, 222, 225)"; + splashBackground = "rgb(49, 51, 56)"; + checkUpdates = false; + staticTitle = true; + disableMinSize = true; + minimizeToTray = false; + tray = false; + appBadge = false; + }; + + xdg.configFile."vesktop/settings/settings.json".text = builtins.toJSON { + notifyAboutUpdates = false; + autoUpdate = false; + autoUpdateNotification = false; + useQuickCss = true; + themeLinks = []; + enabledThemes = ["Catppuccin.theme.css"]; + enableReactDevtools = true; + frameless = false; + transparent = false; + winCtrlQ = false; + macosTranslucency = false; + disableMinSize = true; + winNativeTitleBar = false; + plugins = { + BadgeAPI.enabled = true; + CommandsAPI.enabled = true; + ContextMenuAPI.enabled = true; + MemberListDecoratorsAPI.enabled = true; + MessageAccessoriesAPI.enabled = true; + MessageDecorationsAPI.enabled = true; + MessageEventsAPI.enabled = true; + MessagePopoverAPI.enabled = true; + NoticesAPI.enabled = true; + ServerListAPI.enabled = true; + SettingsStoreAPI.enabled = true; + NoTrack.enabled = true; + Settings = { + enabled = true; + settingsLocation = "aboveActivity"; + }; + AlwaysAnimate.enabled = false; + AlwaysTrust.enabled = false; + AnonymiseFileNames.enabled = false; + "WebRichPresence (arRPC)".enabled = false; + BANger.enabled = false; + BetterFolders = { + enabled = true; + sidebar = true; + sidebarAnim = true; + closeAllFolders = false; + closeAllHomeButton = false; + closeOthers = false; + forceOpen = false; + keepIcons = false; + showFolderIcon = 1; + }; + BetterGifAltText.enabled = false; + BetterNotesBox.enabled = false; + BetterRoleDot.enabled = false; + BetterUploadButton.enabled = true; + BiggerStreamPreview.enabled = true; + BlurNSFW.enabled = false; + CallTimer = { + enabled = true; + format = "human"; + }; + ClearURLs.enabled = true; + ColorSighted.enabled = true; + ConsoleShortcuts.enabled = false; + CopyUserURLs.enabled = true; + CrashHandler.enabled = true; + CustomRPC.enabled = false; + Dearrow.enabled = true; + DisableDMCallIdle.enabled = true; + EmoteCloner.enabled = false; + Experiments = { + enabled = true; + enableIsStaff = false; + }; + F8Break.enabled = false; + FakeNitro = { + enabled = true; + enableEmojiBypass = true; + emojiSize = 48; + transformEmojis = true; + enableStickerBypass = true; + stickerSize = 160; + transformStickers = true; + transformCompoundSentence = false; + enableStreamQualityBypass = true; + }; + FakeProfileThemes = { + enabled = true; + nitroFirst = true; + }; + FavoriteEmojiFirst.enabled = true; + FavoriteGifSearch = { + enabled = true; + searchOption = "hostandpath"; + }; + FixImagesQuality.enabled = true; + FixSpotifyEmbed = { + enabled = true; + volume = 10; + }; + ForceOwnerCrown.enabled = true; + FriendInvites.enabled = false; + GameActivityToggle.enabled = true; + GifPaste.enabled = true; + HideAttachments.enabled = true; + iLoveSpam.enabled = true; + IgnoreActivities = { + enabled = true; + ignoredActivities = []; + }; + ImageZoom = { + enabled = true; + saveZoomValues = true; + invertScroll = true; + nearestNeighbour = false; + square = false; + zoom = 2; + size = 100; + zoomSpeed = 0.5; + }; + InvisibleChat = { + enabled = true; + savedPasswords = "password"; + }; + KeepCurrentChannel.enabled = true; + LastFMRichPresence.enabled = false; + LoadingQuotes.enabled = false; + MemberCount.enabled = true; + MessageClickActions = { + enabled = true; + enableDeleteOnClick = true; + enableDoubleClickToEdit = true; + enableDoubeClickToReply = true; + requireModifier = true; + }; + MessageLinkEmbeds = { + enabled = true; + automodEmbeds = "never"; + listMode = "blacklist"; + idList = ""; + }; + MessageLogger = { + enabled = true; + deleteStyle = "text"; + ignoreBots = false; + ignoreSelf = false; + ignoreUsers = ""; + ignoreChannels = ""; + ignoreGuilds = ""; + }; + MessageTags.enabled = false; + MoreCommands.enabled = true; + MoreKaomoji.enabled = true; + MoreUserTags.enabled = true; + Moyai.enabled = false; + MuteNewGuild = { + enabled = true; + guild = false; + everyone = true; + role = true; + }; + MutualGroupDMs.enabled = true; + NoBlockedMessages = { + enabled = false; + ignoreBlockedMessages = false; + }; + NoDevtoolsWarning.enabled = false; + NoF1.enabled = false; + NoPendingCount.enabled = false; + NoProfileThemes.enabled = true; + NoReplyMention = { + enabled = true; + userList = "372809091208445953"; + shouldPingListed = false; + inverseShiftReply = true; + }; + NoScreensharePreview.enabled = true; + NoTypingAnimation = true; + NoUnblockToJump.enabled = true; + NSFWGateBypass.enabled = true; + oneko.enabled = false; + OpenInApp.enabled = false; + "Party mode 🎉".enabled = false; + PermissionFreeWill = { + enabled = true; + lockout = true; + onboarding = true; + }; + PermissionsViewer = { + enabled = true; + permissionsSortOrder = 0; + defaultPermissionsDropdownState = false; + }; + petpet.enabled = true; + PictureInPicture = { + enabled = true; + loop = false; + }; + PinDMs.enabled = true; + PlainFolderIcon.enabled = false; + PlatformIndicators = { + enabled = true; + list = true; + badges = true; + messages = true; + colorMobileIndicator = true; + }; + PreviewMessage.enabled = true; + PronounDB.enabled = false; + QuickMention.enabled = false; + QuickReply.enabled = false; + ReactErrorDecoder.enabled = false; + ReadAllNotificationsButton.enabled = false; + RelationshipNotifier = { + enabled = true; + notices = true; + offlineRemovals = true; + friends = true; + friendRequestCancels = true; + servers = true; + groups = true; + }; + RevealAllSpoilers.enabled = true; + ReverseImageSearch.enabled = false; + ReviewDB.enabled = false; + RoleColorEverywhere = { + enabled = true; + chatMentions = true; + memberList = true; + voiceUsers = true; + }; + SearchReply.enabled = true; + SendTimestamps.enabled = false; + ServerListIndicators = { + enabled = true; + mode = 3; + }; + ServerProfile.enabled = true; + ShikiCodeblocks = { + enabled = true; + theme = "https://raw.githubusercontent.com/shikijs/shiki/0b28ad8ccfbf2615f2d9d38ea8255416b8ac3043/packages/shiki/themes/dark-plus.json"; + tryHljs = "SECONDARY"; + uesDevIcon = "GREYSCALE"; + bgOpacity = 100; + }; + ShowAllMessageButtons.enabled = true; + ShowConnections = { + enabled = true; + iconSize = 32; + iconSpacing = 1; + }; + ShowHiddenChannels = { + enabled = true; + hideUnreads = true; + showMode = 0; + defaultAllowedUsersAndRolesDropdownState = true; + }; + ShowMeYourName.enabled = false; + ShowTimeouts.enabled = true; + SilentMessageToggle = { + enabled = true; + persistState = false; + autoDisable = true; + }; + SilentTyping = { + enabled = true; + showIcon = false; + isEnabled = true; + }; + SortFriendRequests.enabled = false; + SpotifyControls.enabled = false; + SpotifyCrack.enabled = false; + SpotifyShareCommands.enabled = false; + StartupTimings.enabled = false; + SupportHelper.enabled = true; + TextReplace.enabled = false; + TimeBarAllActivities.enabled = false; + Translate.enabled = false; + TypingIndicator = { + enabled = true; + includeMutedChannels = false; + includeBlockedUsers = true; + }; + TypingTweaks = { + enabled = true; + showAvatars = true; + showRoleColors = true; + alternativeFormatting = true; + }; + Unindent.enabled = true; + UnsuppressEmbeds.enabled = true; + UrbanDictionary.enabled = false; + UserVoiceShow = { + enabled = true; + showInUserProfileModal = true; + showVoiceChannelSectionHeader = true; + }; + USRBG.enabled = false; + UwUifier.enabled = false; + ValidUser.enabled = false; + VoiceChatDoubleClick.enabled = true; + VcNarrator.enabled = false; + VencordToolbox.enabled = false; + ViewIcons = { + enabled = true; + format = "png"; + imgSize = "2048"; + }; + ViewRaw = { + enabled = true; + clickMethod = "Left"; + }; + VoiceMessages = { + enabled = true; + noiseSuppression = true; + echoCancellation = true; + }; + WebContextMenus = { + enabled = true; + addBack = true; + }; + WebKeybinds.enabled = true; + GreetStickerPicker.enabled = false; + WhoReacted.enabled = true; + Wikisearch.enabled = false; + NormalizeMessageLinks.enabled = false; + "AI Noise Suppression" = { + enabled = true; + isEnabled = true; + }; + SecretRingToneEnabler.enabled = false; + }; + notifications = { + timeout = 5000; + position = "bottom-right"; + useNative = "not-focused"; + logLimit = 50; + }; + cloud = { + authenticated = false; + url = "https://api.vencord.dev/"; + settingsSync = false; + settingsSyncVersion = 1682768329526; + }; + }; + }; + }; +} diff --git a/modules/gui/zathura.nix b/modules/gui/zathura.nix new file mode 100644 index 0000000..74082fb --- /dev/null +++ b/modules/gui/zathura.nix @@ -0,0 +1,30 @@ +{ + config, + lib, + pkgs, + ... +}: with lib; let + cfg = config.myOptions.programs.zathura; + username = config.myOptions.other.system.username; +in { + options.myOptions.programs.zathura.enable = mkEnableOption "zathura"; + + config = mkIf cfg.enable { + home-manager.users.${username} = { + xdg.configFile."zathura/catppuccin-mocha".source = pkgs.fetchurl { + url = "https://raw.githubusercontent.com/catppuccin/zathura/main/src/catppuccin-mocha"; + hash = "sha256-/HXecio3My2eXTpY7JoYiN9mnXsps4PAThDPs4OCsAk="; + }; + + programs.zathura = { + enable = true; + extraConfig = '' + include catppuccin-mocha + ''; + options = { + selection-clipboard = "clipboard"; + }; + }; + }; + }; +} diff --git a/modules/services/pipewire.nix b/modules/services/pipewire.nix index 9265e58..665822a 100644 --- a/modules/services/pipewire.nix +++ b/modules/services/pipewire.nix @@ -1,8 +1,10 @@ { config, lib, ... }: +with lib; let + cfg = config.myOptions.services.pipewire; in { options.myOptions.services.enable = mkEnableOption "pipewire"; - config = mkIf config.myOptions.services.pipewire.enable { + config = mkIf cfg.enable { hardware.pulseaudio.enable = false; services.pipewire = { enable = true; diff --git a/modules/tui/btop.nix b/modules/tui/btop.nix index 5611903..332d0f7 100644 --- a/modules/tui/btop.nix +++ b/modules/tui/btop.nix @@ -1,8 +1,5 @@ -{ - config, - lib, - ... -}: with lib; let +{ config, lib, ... }: +with lib; let cfg = config.myOptions.programs.btop; username = config.myOptions.other.system.username; in { diff --git a/modules/tui/default.nix b/modules/tui/default.nix index 89f194e..e425429 100644 --- a/modules/tui/default.nix +++ b/modules/tui/default.nix @@ -2,7 +2,7 @@ _: { imports = [ ./btop.nix # ./helix.nix -# ./neovim.nix + ./neovim.nix # ./newsboat.nix ]; } diff --git a/options/common/gpu/nvidia.nix b/options/common/gpu/nvidia.nix index 14b81ea..c17e851 100644 --- a/options/common/gpu/nvidia.nix +++ b/options/common/gpu/nvidia.nix @@ -1,6 +1,6 @@ -{ pkgs, ...}: +{ config, lib, pkgs, ...}: { - services.xserver.videoDrivers = [ "nvidia" ] + services.xserver.videoDrivers = [ "nvidia" ]; hardware.opengl = { enable = true; driSupport = true;