From eead8facb0883e884a2c19082dc9804ede6766ef Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Mon, 4 Nov 2024 01:20:09 +0100 Subject: [PATCH] schizophrenia --- flake.lock | 23 +- flake.nix | 5 - hosts/temperance/programs.nix | 2 +- modules/other/module.nix | 2 +- modules/programs/cli/module.nix | 3 +- modules/programs/cli/nh.nix | 5 +- modules/programs/cli/zellij/default.nix | 46 --- modules/programs/gui/module.nix | 1 - modules/programs/gui/vesktop.nix | 372 ------------------------ modules/programs/other/direnv.nix | 8 +- 10 files changed, 7 insertions(+), 460 deletions(-) delete mode 100644 modules/programs/cli/zellij/default.nix delete mode 100644 modules/programs/gui/vesktop.nix diff --git a/flake.lock b/flake.lock index d651973..c86583c 100644 --- a/flake.lock +++ b/flake.lock @@ -279,26 +279,6 @@ } }, "home-manager": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1730633670, - "narHash": "sha256-ZFJqIXpvVKvzOVFKWNRDyIyAo+GYdmEPaYi1bZB6uf0=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "8f6ca7855d409aeebe2a582c6fd6b6a8d0bf5661", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_2": { "inputs": { "nixpkgs": [ "schizofox", @@ -749,7 +729,6 @@ "root": { "inputs": { "helix": "helix", - "home-manager": "home-manager", "hyprland": "hyprland", "hyprland-plugins": "hyprland-plugins", "hyprsplit": "hyprsplit", @@ -787,7 +766,7 @@ "inputs": { "flake-compat": "flake-compat_2", "flake-parts": "flake-parts", - "home-manager": "home-manager_2", + "home-manager": "home-manager", "nixpak": "nixpak", "nixpkgs": [ "nixpkgs" diff --git a/flake.nix b/flake.nix index 68189f5..dc208e6 100644 --- a/flake.nix +++ b/flake.nix @@ -30,11 +30,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - home-manager = { - url = "github:nix-community/home-manager"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - # Hyprland, my main compositor hyprland.url = "github:hyprwm/Hyprland"; diff --git a/hosts/temperance/programs.nix b/hosts/temperance/programs.nix index 28f46af..dbc5ed9 100644 --- a/hosts/temperance/programs.nix +++ b/hosts/temperance/programs.nix @@ -33,7 +33,6 @@ swww microfetch nmap - nyxt # onlyoffice-bin pandoc pavucontrol @@ -57,6 +56,7 @@ tutanota-desktop typst ungoogled-chromium + vesktop wineWowPackages.waylandFull wireguard-tools xdg-utils diff --git a/modules/other/module.nix b/modules/other/module.nix index 044212a..7c23bd0 100644 --- a/modules/other/module.nix +++ b/modules/other/module.nix @@ -1,6 +1,6 @@ _: { imports = [ - ./home-manager.nix + # ./home-manager.nix ./system.nix ./xdg.nix ./git.nix diff --git a/modules/programs/cli/module.nix b/modules/programs/cli/module.nix index 7fc47bd..a987192 100644 --- a/modules/programs/cli/module.nix +++ b/modules/programs/cli/module.nix @@ -1,7 +1,6 @@ _: { imports = [ ./nh.nix - ./beets.nix - ./zellij + # ./beets.nix ]; } diff --git a/modules/programs/cli/nh.nix b/modules/programs/cli/nh.nix index 2da0ea5..1190441 100644 --- a/modules/programs/cli/nh.nix +++ b/modules/programs/cli/nh.nix @@ -1,12 +1,11 @@ { config, lib, - self, ... -}: -with lib; let +}: let cfg = config.modules.programs.nh; inherit (config.modules.other.system) username; + inherit (lib) mkEnableOption mkIf; in { options.modules.programs.nh.enable = mkEnableOption "nh"; diff --git a/modules/programs/cli/zellij/default.nix b/modules/programs/cli/zellij/default.nix deleted file mode 100644 index 173a8ec..0000000 --- a/modules/programs/cli/zellij/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ - config, - lib, - ... -}: let - inherit (config.modules.other.system) username; - cfg = config.modules.system.programs.zellij; - inherit (lib) mkIf; -in { - config = mkIf cfg.enable { - home-manager.users.${username} = { - programs.zellij = { - enable = true; - - enableFishIntegration = true; - - settings = { - on_force_close = "quit"; - pane_frames = false; - default_layout = "compact"; - - ui = { - pane_frames = { - hide_session_name = true; - rounded_corners = true; - }; - }; - - plugins = { - tab-bar.path = "tab-bar"; - status-bar.path = "status-bar"; - strider.path = "strider"; - compact-bar.path = "compact-bar"; - }; - - keybinds = { - unbind = "Ctrl n"; - # resize = { - # bind = "Ctrl n"; - # }; - }; - }; - }; - }; - }; -} diff --git a/modules/programs/gui/module.nix b/modules/programs/gui/module.nix index 6c47248..29b9c0f 100644 --- a/modules/programs/gui/module.nix +++ b/modules/programs/gui/module.nix @@ -1,6 +1,5 @@ _: { imports = [ - ./vesktop.nix ./foot.nix ./spicetify.nix ./steam.nix diff --git a/modules/programs/gui/vesktop.nix b/modules/programs/gui/vesktop.nix deleted file mode 100644 index caec117..0000000 --- a/modules/programs/gui/vesktop.nix +++ /dev/null @@ -1,372 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: -with lib; let - cfg = config.modules.system.programs.discord; - inherit (config.modules.other.system) username; -in { - config = mkIf cfg.enable { - home-manager.users.${username} = { - home.packages = with pkgs; [vesktop]; - # 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 = [ - # "https://github.com/Costeer/Gruvbox-Material-Themes/blob/main/Discord%20Theme/gruvboxmaterial.theme.css" - # ]; - # enabledThemes = ["gruvboxmaterial.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"; - # }; - # 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/programs/other/direnv.nix b/modules/programs/other/direnv.nix index 719dd49..3698c77 100644 --- a/modules/programs/other/direnv.nix +++ b/modules/programs/other/direnv.nix @@ -1,10 +1,4 @@ -{ - config, - pkgs, - ... -}: let - inherit (config.modules.other.system) username; -in { +{pkgs, ...}: { config = { programs.direnv = { enable = true;