From c664a90a560401016b2c85cd701b52e1003e673f Mon Sep 17 00:00:00 2001 From: Fuwn Date: Sat, 31 Aug 2024 19:04:52 -0700 Subject: hi --- .../fortune/communication/discord/default.nix | 5 +- .../fortune/communication/discord/vesktop.nix | 651 +++++++++++++++++++++ .../communication/discord/vesktop/default.nix | 651 --------------------- home/ebisu/fortune/desktop/agnostic.nix | 12 + home/ebisu/fortune/desktop/agnostic/default.nix | 12 - home/ebisu/fortune/desktop/default.nix | 4 +- home/ebisu/fortune/desktop/xorg.nix | 17 + home/ebisu/fortune/desktop/xorg/default.nix | 17 - home/ebisu/fortune/education/calculator.nix | 7 + .../ebisu/fortune/education/calculator/default.nix | 7 - home/ebisu/fortune/education/default.nix | 5 +- home/ebisu/fortune/filesystem/archive.nix | 8 + home/ebisu/fortune/filesystem/archive/default.nix | 8 - home/ebisu/fortune/filesystem/default.nix | 2 +- home/ebisu/fortune/gaming/default.nix | 2 +- home/ebisu/fortune/multimedia/audio/default.nix | 7 +- home/ebisu/fortune/multimedia/audio/spotify.nix | 11 + .../fortune/multimedia/audio/spotify/default.nix | 11 - home/ebisu/fortune/multimedia/default.nix | 7 +- home/ebisu/fortune/multimedia/document.nix | 10 + home/ebisu/fortune/multimedia/document/default.nix | 10 - home/ebisu/fortune/multimedia/image.nix | 17 + home/ebisu/fortune/multimedia/image/default.nix | 17 - home/ebisu/fortune/multimedia/video/anime.nix | 7 + .../fortune/multimedia/video/anime/default.nix | 7 - home/ebisu/fortune/multimedia/video/default.nix | 5 +- home/ebisu/fortune/system/bitwarden.nix | 7 + home/ebisu/fortune/system/bitwarden/default.nix | 7 - home/ebisu/fortune/system/default.nix | 6 +- home/ebisu/fortune/system/opengl.nix | 23 + home/ebisu/fortune/system/opengl/default.nix | 23 - home/ebisu/fortune/system/peripheral.nix | 6 + home/ebisu/fortune/system/peripheral/default.nix | 6 - home/ebisu/fortune/system/shell/default.nix | 4 +- home/ebisu/fortune/system/shell/fish.nix | 159 +++++ home/ebisu/fortune/system/shell/fish/default.nix | 159 ----- .../system/shell/scripting/charmbracelet.nix | 6 + .../shell/scripting/charmbracelet/default.nix | 6 - .../fortune/system/shell/scripting/default.nix | 7 +- .../fortune/system/shell/scripting/ripgrep.nix | 7 + .../system/shell/scripting/ripgrep/default.nix | 7 - home/ebisu/fortune/system/shell/starship.nix | 305 ++++++++++ .../fortune/system/shell/starship/default.nix | 305 ---------- home/ebisu/fortune/system/terminal/default.nix | 7 +- home/ebisu/fortune/system/terminal/foot.nix | 49 ++ .../ebisu/fortune/system/terminal/foot/default.nix | 49 -- home/ebisu/fortune/system/terminal/kitty.nix | 113 ++++ .../fortune/system/terminal/kitty/default.nix | 113 ---- .../fortune/system/virtualisation/default.nix | 2 +- .../ebisu/fortune/system/virtualisation/docker.nix | 10 + .../system/virtualisation/docker/default.nix | 10 - home/ebisu/fortune/utility/ai.nix | 7 + home/ebisu/fortune/utility/ai/default.nix | 12 - home/ebisu/fortune/utility/default.nix | 7 +- modules/default.nix | 2 +- modules/nixpkgs.nix | 6 + modules/services/ollama.nix | 6 + 57 files changed, 1482 insertions(+), 1471 deletions(-) create mode 100644 home/ebisu/fortune/communication/discord/vesktop.nix delete mode 100644 home/ebisu/fortune/communication/discord/vesktop/default.nix create mode 100644 home/ebisu/fortune/desktop/agnostic.nix delete mode 100644 home/ebisu/fortune/desktop/agnostic/default.nix create mode 100644 home/ebisu/fortune/desktop/xorg.nix delete mode 100644 home/ebisu/fortune/desktop/xorg/default.nix create mode 100644 home/ebisu/fortune/education/calculator.nix delete mode 100644 home/ebisu/fortune/education/calculator/default.nix create mode 100644 home/ebisu/fortune/filesystem/archive.nix delete mode 100644 home/ebisu/fortune/filesystem/archive/default.nix create mode 100644 home/ebisu/fortune/multimedia/audio/spotify.nix delete mode 100644 home/ebisu/fortune/multimedia/audio/spotify/default.nix create mode 100644 home/ebisu/fortune/multimedia/document.nix delete mode 100644 home/ebisu/fortune/multimedia/document/default.nix create mode 100644 home/ebisu/fortune/multimedia/image.nix delete mode 100644 home/ebisu/fortune/multimedia/image/default.nix create mode 100644 home/ebisu/fortune/multimedia/video/anime.nix delete mode 100644 home/ebisu/fortune/multimedia/video/anime/default.nix create mode 100644 home/ebisu/fortune/system/bitwarden.nix delete mode 100644 home/ebisu/fortune/system/bitwarden/default.nix create mode 100644 home/ebisu/fortune/system/opengl.nix delete mode 100644 home/ebisu/fortune/system/opengl/default.nix create mode 100644 home/ebisu/fortune/system/peripheral.nix delete mode 100644 home/ebisu/fortune/system/peripheral/default.nix create mode 100644 home/ebisu/fortune/system/shell/fish.nix delete mode 100644 home/ebisu/fortune/system/shell/fish/default.nix create mode 100644 home/ebisu/fortune/system/shell/scripting/charmbracelet.nix delete mode 100644 home/ebisu/fortune/system/shell/scripting/charmbracelet/default.nix create mode 100644 home/ebisu/fortune/system/shell/scripting/ripgrep.nix delete mode 100644 home/ebisu/fortune/system/shell/scripting/ripgrep/default.nix create mode 100644 home/ebisu/fortune/system/shell/starship.nix delete mode 100644 home/ebisu/fortune/system/shell/starship/default.nix create mode 100644 home/ebisu/fortune/system/terminal/foot.nix delete mode 100644 home/ebisu/fortune/system/terminal/foot/default.nix create mode 100644 home/ebisu/fortune/system/terminal/kitty.nix delete mode 100644 home/ebisu/fortune/system/terminal/kitty/default.nix create mode 100644 home/ebisu/fortune/system/virtualisation/docker.nix delete mode 100644 home/ebisu/fortune/system/virtualisation/docker/default.nix create mode 100644 home/ebisu/fortune/utility/ai.nix delete mode 100644 home/ebisu/fortune/utility/ai/default.nix create mode 100644 modules/nixpkgs.nix create mode 100644 modules/services/ollama.nix diff --git a/home/ebisu/fortune/communication/discord/default.nix b/home/ebisu/fortune/communication/discord/default.nix index 5e8f79d..239a89e 100644 --- a/home/ebisu/fortune/communication/discord/default.nix +++ b/home/ebisu/fortune/communication/discord/default.nix @@ -1,6 +1,7 @@ -{ pkgs, ... }: { +{ pkgs, ... }: +{ imports = [ - ./vesktop + ./vesktop.nix ]; home.packages = with pkgs; [ diff --git a/home/ebisu/fortune/communication/discord/vesktop.nix b/home/ebisu/fortune/communication/discord/vesktop.nix new file mode 100644 index 0000000..7d35c84 --- /dev/null +++ b/home/ebisu/fortune/communication/discord/vesktop.nix @@ -0,0 +1,651 @@ +{ pkgs, ... }: { + home.packages = with pkgs; [ + vesktop + ]; + + services.arrpc.enable = false; + + xdg.configFile = { + "vesktop/settings.json".text = '' + { + "discordBranch": "canary", + "arRPC": "on", + "splashColor": "rgba(255, 255, 255, 0.6)", + "splashBackground": "rgba(21, 14, 13, 0.52)", + "enableMenu": false, + "splashTheming": true, + "staticTitle": false, + "disableMinSize": true, + "minimizeToTray": false, + "tray": false, + "appBadge": false + } + ''; + + "vesktop/settings/quickCss.css".text = '' + /** + * @name Dark Matter + * @author Tropical#8908, Hammock#3110 + * @version 3.0.0 + * @description A cold, dark & frosty theme. + * @source https://github.com/DiscordStyles/DarkMatter/ + */ + + @import url('https://DiscordStyles.github.io/DarkMatter/src/base.css'); + + /* Variables */ + :root { + --avatar-size: 32px; + --background-image: url('https://images6.alphacoders.com/109/1093313.jpg'); + --home-image: url('https://shinobu.fuwn.workers.dev/shinobu'); + --background-solid: #150e0d85; + --background-solid-dark: #0f0a0985; + --background-solid-darker: #0b070685; + --accent: 216, 161, 110; + --accent-alt: 196, 141, 90; + } + ''; + + "vesktop/settings/settings.json".text = '' + { + "notifyAboutUpdates": true, + "autoUpdate": true, + "autoUpdateNotification": true, + "useQuickCss": true, + "themeLinks": [], + "enabledThemes": [], + "enableReactDevtools": true, + "frameless": true, + "transparent": false, + "winCtrlQ": false, + "macosTranslucency": false, + "disableMinSize": false, + "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 + }, + "NoTrack": { + "enabled": true + }, + "Settings": { + "enabled": true, + "settingsLocation": "aboveActivity" + }, + "SupportHelper": { + "enabled": true + }, + "AlwaysAnimate": { + "enabled": true + }, + "AlwaysTrust": { + "enabled": true + }, + "AnonymiseFileNames": { + "enabled": true, + "method": 0, + "randomisedLength": 7, + "consistent": "image" + }, + "WebRichPresence (arRPC)": { + "enabled": true + }, + "BANger": { + "enabled": false + }, + "BetterFolders": { + "enabled": false, + "sidebar": true, + "showFolderIcon": 1, + "closeAllHomeButton": false, + "keepIcons": false, + "sidebarAnim": true, + "closeOthers": false, + "closeAllFolders": false, + "forceOpen": false + }, + "BetterGifAltText": { + "enabled": true + }, + "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, + "attemptToPreventCrashes": true, + "attemptToNavigateToHome": true + }, + "CustomRPC": { + "enabled": false + }, + "Dearrow": { + "enabled": true + }, + "EmoteCloner": { + "enabled": true + }, + "Experiments": { + "enabled": true, + "enableIsStaff": false + }, + "F8Break": { + "enabled": false + }, + "FakeNitro": { + "enabled": false, + "enableEmojiBypass": true, + "emojiSize": 48, + "transformEmojis": true, + "enableStickerBypass": true, + "stickerSize": 160, + "transformStickers": true, + "transformCompoundSentence": false, + "enableStreamQualityBypass": true + }, + "FakeProfileThemes": { + "enabled": false + }, + "FavoriteEmojiFirst": { + "enabled": true + }, + "FavoriteGifSearch": { + "enabled": true + }, + "FixSpotifyEmbeds": { + "enabled": true, + "volume": 5 + }, + "ForceOwnerCrown": { + "enabled": false + }, + "FriendInvites": { + "enabled": false + }, + "GameActivityToggle": { + "enabled": true + }, + "GifPaste": { + "enabled": false + }, + "GreetStickerPicker": { + "enabled": true + }, + "HideAttachments": { + "enabled": false + }, + "iLoveSpam": { + "enabled": false + }, + "IgnoreActivities": { + "enabled": false + }, + "ImageZoom": { + "enabled": true, + "saveZoomValues": true, + "invertScroll": true, + "nearestNeighbour": false, + "square": false, + "zoom": 2, + "size": 100, + "zoomSpeed": 0.5 + }, + "InvisibleChat": { + "enabled": true, + "savedPasswords": "password, Password" + }, + "KeepCurrentChannel": { + "enabled": false + }, + "LastFMRichPresence": { + "enabled": false + }, + "LoadingQuotes": { + "enabled": true, + "replaceEvents": true + }, + "MemberCount": { + "enabled": true + }, + "MessageClickActions": { + "enabled": false + }, + "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": false + }, + "Moyai": { + "enabled": false, + "volume": 0.5, + "quality": "Normal", + "triggerWhenUnfocused": true, + "ignoreBots": true, + "ignoreBlocked": true + }, + "MutualGroupDMs": { + "enabled": true + }, + "NoBlockedMessages": { + "enabled": false + }, + "NoDevtoolsWarning": { + "enabled": true + }, + "NoF1": { + "enabled": true + }, + "NoMosaic": { + "enabled": false + }, + "NoPendingCount": { + "enabled": false + }, + "NoProfileThemes": { + "enabled": false + }, + "NoReplyMention": { + "enabled": false + }, + "NoScreensharePreview": { + "enabled": true + }, + "NoTypingAnimation": { + "enabled": true + }, + "NoUnblockToJump": { + "enabled": true + }, + "NormalizeMessageLinks": { + "enabled": true + }, + "NSFWGateBypass": { + "enabled": false + }, + "OnePingPerDM": { + "enabled": true, + "channelToAffect": "both_dms", + "allowMentions": false, + "allowEveryone": false + }, + "oneko": { + "enabled": true + }, + "OpenInApp": { + "enabled": false + }, + "PermissionFreeWill": { + "enabled": false + }, + "PermissionsViewer": { + "enabled": true, + "permissionsSortOrder": 0, + "defaultPermissionsDropdownState": false + }, + "petpet": { + "enabled": true + }, + "PictureInPicture": { + "enabled": false + }, + "PinDMs": { + "enabled": false + }, + "PlainFolderIcon": { + "enabled": false + }, + "PlatformIndicators": { + "enabled": true, + "list": true, + "badges": true, + "messages": true, + "colorMobileIndicator": true + }, + "PreviewMessage": { + "enabled": false + }, + "PronounDB": { + "enabled": true, + "pronounsFormat": "LOWERCASE", + "pronounSource": 0, + "showSelf": true, + "showInMessages": true, + "showInProfile": true + }, + "QuickMention": { + "enabled": false + }, + "QuickReply": { + "enabled": false + }, + "ReactErrorDecoder": { + "enabled": true + }, + "ReadAllNotificationsButton": { + "enabled": true + }, + "RelationshipNotifier": { + "enabled": true, + "offlineRemovals": true, + "groups": true, + "servers": true, + "notices": false, + "friends": true, + "friendRequestCancels": true + }, + "RevealAllSpoilers": { + "enabled": false + }, + "ReverseImageSearch": { + "enabled": true + }, + "RoleColorEverywhere": { + "enabled": true, + "chatMentions": true, + "memberList": true, + "voiceUsers": true + }, + "SearchReply": { + "enabled": true + }, + "SecretRingToneEnabler": { + "enabled": true + }, + "SendTimestamps": { + "enabled": false + }, + "ServerListIndicators": { + "enabled": true, + "mode": 2 + }, + "ShikiCodeblocks": { + "enabled": true, + "theme": "https://raw.githubusercontent.com/shikijs/shiki/0b28ad8ccfbf2615f2d9d38ea8255416b8ac3043/packages/shiki/themes/dark-plus.json", + "tryHljs": "SECONDARY", + "useDevIcon": "GREYSCALE", + "bgOpacity": 100 + }, + "ShowAllMessageButtons": { + "enabled": false + }, + "ShowConnections": { + "enabled": true, + "iconSpacing": 1, + "iconSize": 32 + }, + "ShowHiddenChannels": { + "enabled": true, + "hideUnreads": true, + "showMode": 0, + "defaultAllowedUsersAndRolesDropdownState": true + }, + "ShowMeYourName": { + "enabled": true, + "mode": "nick-user", + "displayNames": false, + "inReplies": false + }, + "SilentMessageToggle": { + "enabled": false + }, + "SilentTyping": { + "enabled": true, + "showIcon": true, + "isEnabled": true + }, + "SortFriendRequests": { + "enabled": true, + "showDates": true + }, + "SpotifyControls": { + "enabled": true, + "hoverControls": true, + "useSpotifyUris": true + }, + "SpotifyCrack": { + "enabled": true, + "noSpotifyAutoPause": true, + "keepSpotifyActivityOnIdle": false + }, + "SpotifyShareCommands": { + "enabled": true + }, + "StartupTimings": { + "enabled": true + }, + "TextReplace": { + "enabled": false + }, + "ThemeAttributes": { + "enabled": false + }, + "TimeBarAllActivities": { + "enabled": false + }, + "Translate": { + "enabled": true, + "autoTranslate": false + }, + "TypingIndicator": { + "enabled": false + }, + "TypingTweaks": { + "enabled": false + }, + "Unindent": { + "enabled": false + }, + "UnsuppressEmbeds": { + "enabled": false + }, + "UrbanDictionary": { + "enabled": false + }, + "UserVoiceShow": { + "enabled": true + }, + "USRBG": { + "enabled": false, + "nitroFirst": true, + "voiceBackground": true + }, + "ValidUser": { + "enabled": false + }, + "VoiceChatDoubleClick": { + "enabled": true + }, + "VcNarrator": { + "enabled": false + }, + "VencordToolbox": { + "enabled": false + }, + "ViewIcons": { + "enabled": false + }, + "ViewRaw": { + "enabled": false + }, + "VoiceMessages": { + "enabled": false + }, + "WebContextMenus": { + "enabled": true, + "addBack": true + }, + "WebKeybinds": { + "enabled": true + }, + "WhoReacted": { + "enabled": false + }, + "Wikisearch": { + "enabled": false + }, + "SuperReactionTweaks": { + "enabled": false + }, + "ChatInputButtonAPI": { + "enabled": true + }, + "BetterGifPicker": { + "enabled": false + }, + "ClientTheme": { + "enabled": false + }, + "Decor": { + "enabled": false + }, + "FixCodeblockGap": { + "enabled": false + }, + "FixYoutubeEmbeds": { + "enabled": false + }, + "DisableCallIdle": { + "enabled": true + }, + "NewGuildSettings": { + "enabled": true, + "guild": true, + "everyone": true, + "role": true + }, + "ShowHiddenThings": { + "enabled": false + }, + "PartyMode": { + "enabled": false, + "superIntensePartyMode": 0 + }, + "MessageUpdaterAPI": { + "enabled": true + }, + "AutomodContext": { + "enabled": false + }, + "BetterRoleContext": { + "enabled": false + }, + "BetterSessions": { + "enabled": false + }, + "BetterSettings": { + "enabled": false + }, + "CtrlEnterSend": { + "enabled": false + }, + "CustomIdle": { + "enabled": false + }, + "DontRoundMyTimestamps": { + "enabled": false + }, + "FriendsSince": { + "enabled": false + }, + "ImageLink": { + "enabled": false + }, + "ImplicitRelationships": { + "enabled": false + }, + "ServerInfo": { + "enabled": true + } + }, + "notifications": { + "timeout": 5000, + "position": "bottom-right", + "useNative": "not-focused", + "logLimit": 50 + }, + "cloud": { + "authenticated": false, + "url": "https://api.vencord.dev/", + "settingsSync": false, + "settingsSyncVersion": 1717817629006 + } + } + ''; + }; +} diff --git a/home/ebisu/fortune/communication/discord/vesktop/default.nix b/home/ebisu/fortune/communication/discord/vesktop/default.nix deleted file mode 100644 index 7d35c84..0000000 --- a/home/ebisu/fortune/communication/discord/vesktop/default.nix +++ /dev/null @@ -1,651 +0,0 @@ -{ pkgs, ... }: { - home.packages = with pkgs; [ - vesktop - ]; - - services.arrpc.enable = false; - - xdg.configFile = { - "vesktop/settings.json".text = '' - { - "discordBranch": "canary", - "arRPC": "on", - "splashColor": "rgba(255, 255, 255, 0.6)", - "splashBackground": "rgba(21, 14, 13, 0.52)", - "enableMenu": false, - "splashTheming": true, - "staticTitle": false, - "disableMinSize": true, - "minimizeToTray": false, - "tray": false, - "appBadge": false - } - ''; - - "vesktop/settings/quickCss.css".text = '' - /** - * @name Dark Matter - * @author Tropical#8908, Hammock#3110 - * @version 3.0.0 - * @description A cold, dark & frosty theme. - * @source https://github.com/DiscordStyles/DarkMatter/ - */ - - @import url('https://DiscordStyles.github.io/DarkMatter/src/base.css'); - - /* Variables */ - :root { - --avatar-size: 32px; - --background-image: url('https://images6.alphacoders.com/109/1093313.jpg'); - --home-image: url('https://shinobu.fuwn.workers.dev/shinobu'); - --background-solid: #150e0d85; - --background-solid-dark: #0f0a0985; - --background-solid-darker: #0b070685; - --accent: 216, 161, 110; - --accent-alt: 196, 141, 90; - } - ''; - - "vesktop/settings/settings.json".text = '' - { - "notifyAboutUpdates": true, - "autoUpdate": true, - "autoUpdateNotification": true, - "useQuickCss": true, - "themeLinks": [], - "enabledThemes": [], - "enableReactDevtools": true, - "frameless": true, - "transparent": false, - "winCtrlQ": false, - "macosTranslucency": false, - "disableMinSize": false, - "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 - }, - "NoTrack": { - "enabled": true - }, - "Settings": { - "enabled": true, - "settingsLocation": "aboveActivity" - }, - "SupportHelper": { - "enabled": true - }, - "AlwaysAnimate": { - "enabled": true - }, - "AlwaysTrust": { - "enabled": true - }, - "AnonymiseFileNames": { - "enabled": true, - "method": 0, - "randomisedLength": 7, - "consistent": "image" - }, - "WebRichPresence (arRPC)": { - "enabled": true - }, - "BANger": { - "enabled": false - }, - "BetterFolders": { - "enabled": false, - "sidebar": true, - "showFolderIcon": 1, - "closeAllHomeButton": false, - "keepIcons": false, - "sidebarAnim": true, - "closeOthers": false, - "closeAllFolders": false, - "forceOpen": false - }, - "BetterGifAltText": { - "enabled": true - }, - "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, - "attemptToPreventCrashes": true, - "attemptToNavigateToHome": true - }, - "CustomRPC": { - "enabled": false - }, - "Dearrow": { - "enabled": true - }, - "EmoteCloner": { - "enabled": true - }, - "Experiments": { - "enabled": true, - "enableIsStaff": false - }, - "F8Break": { - "enabled": false - }, - "FakeNitro": { - "enabled": false, - "enableEmojiBypass": true, - "emojiSize": 48, - "transformEmojis": true, - "enableStickerBypass": true, - "stickerSize": 160, - "transformStickers": true, - "transformCompoundSentence": false, - "enableStreamQualityBypass": true - }, - "FakeProfileThemes": { - "enabled": false - }, - "FavoriteEmojiFirst": { - "enabled": true - }, - "FavoriteGifSearch": { - "enabled": true - }, - "FixSpotifyEmbeds": { - "enabled": true, - "volume": 5 - }, - "ForceOwnerCrown": { - "enabled": false - }, - "FriendInvites": { - "enabled": false - }, - "GameActivityToggle": { - "enabled": true - }, - "GifPaste": { - "enabled": false - }, - "GreetStickerPicker": { - "enabled": true - }, - "HideAttachments": { - "enabled": false - }, - "iLoveSpam": { - "enabled": false - }, - "IgnoreActivities": { - "enabled": false - }, - "ImageZoom": { - "enabled": true, - "saveZoomValues": true, - "invertScroll": true, - "nearestNeighbour": false, - "square": false, - "zoom": 2, - "size": 100, - "zoomSpeed": 0.5 - }, - "InvisibleChat": { - "enabled": true, - "savedPasswords": "password, Password" - }, - "KeepCurrentChannel": { - "enabled": false - }, - "LastFMRichPresence": { - "enabled": false - }, - "LoadingQuotes": { - "enabled": true, - "replaceEvents": true - }, - "MemberCount": { - "enabled": true - }, - "MessageClickActions": { - "enabled": false - }, - "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": false - }, - "Moyai": { - "enabled": false, - "volume": 0.5, - "quality": "Normal", - "triggerWhenUnfocused": true, - "ignoreBots": true, - "ignoreBlocked": true - }, - "MutualGroupDMs": { - "enabled": true - }, - "NoBlockedMessages": { - "enabled": false - }, - "NoDevtoolsWarning": { - "enabled": true - }, - "NoF1": { - "enabled": true - }, - "NoMosaic": { - "enabled": false - }, - "NoPendingCount": { - "enabled": false - }, - "NoProfileThemes": { - "enabled": false - }, - "NoReplyMention": { - "enabled": false - }, - "NoScreensharePreview": { - "enabled": true - }, - "NoTypingAnimation": { - "enabled": true - }, - "NoUnblockToJump": { - "enabled": true - }, - "NormalizeMessageLinks": { - "enabled": true - }, - "NSFWGateBypass": { - "enabled": false - }, - "OnePingPerDM": { - "enabled": true, - "channelToAffect": "both_dms", - "allowMentions": false, - "allowEveryone": false - }, - "oneko": { - "enabled": true - }, - "OpenInApp": { - "enabled": false - }, - "PermissionFreeWill": { - "enabled": false - }, - "PermissionsViewer": { - "enabled": true, - "permissionsSortOrder": 0, - "defaultPermissionsDropdownState": false - }, - "petpet": { - "enabled": true - }, - "PictureInPicture": { - "enabled": false - }, - "PinDMs": { - "enabled": false - }, - "PlainFolderIcon": { - "enabled": false - }, - "PlatformIndicators": { - "enabled": true, - "list": true, - "badges": true, - "messages": true, - "colorMobileIndicator": true - }, - "PreviewMessage": { - "enabled": false - }, - "PronounDB": { - "enabled": true, - "pronounsFormat": "LOWERCASE", - "pronounSource": 0, - "showSelf": true, - "showInMessages": true, - "showInProfile": true - }, - "QuickMention": { - "enabled": false - }, - "QuickReply": { - "enabled": false - }, - "ReactErrorDecoder": { - "enabled": true - }, - "ReadAllNotificationsButton": { - "enabled": true - }, - "RelationshipNotifier": { - "enabled": true, - "offlineRemovals": true, - "groups": true, - "servers": true, - "notices": false, - "friends": true, - "friendRequestCancels": true - }, - "RevealAllSpoilers": { - "enabled": false - }, - "ReverseImageSearch": { - "enabled": true - }, - "RoleColorEverywhere": { - "enabled": true, - "chatMentions": true, - "memberList": true, - "voiceUsers": true - }, - "SearchReply": { - "enabled": true - }, - "SecretRingToneEnabler": { - "enabled": true - }, - "SendTimestamps": { - "enabled": false - }, - "ServerListIndicators": { - "enabled": true, - "mode": 2 - }, - "ShikiCodeblocks": { - "enabled": true, - "theme": "https://raw.githubusercontent.com/shikijs/shiki/0b28ad8ccfbf2615f2d9d38ea8255416b8ac3043/packages/shiki/themes/dark-plus.json", - "tryHljs": "SECONDARY", - "useDevIcon": "GREYSCALE", - "bgOpacity": 100 - }, - "ShowAllMessageButtons": { - "enabled": false - }, - "ShowConnections": { - "enabled": true, - "iconSpacing": 1, - "iconSize": 32 - }, - "ShowHiddenChannels": { - "enabled": true, - "hideUnreads": true, - "showMode": 0, - "defaultAllowedUsersAndRolesDropdownState": true - }, - "ShowMeYourName": { - "enabled": true, - "mode": "nick-user", - "displayNames": false, - "inReplies": false - }, - "SilentMessageToggle": { - "enabled": false - }, - "SilentTyping": { - "enabled": true, - "showIcon": true, - "isEnabled": true - }, - "SortFriendRequests": { - "enabled": true, - "showDates": true - }, - "SpotifyControls": { - "enabled": true, - "hoverControls": true, - "useSpotifyUris": true - }, - "SpotifyCrack": { - "enabled": true, - "noSpotifyAutoPause": true, - "keepSpotifyActivityOnIdle": false - }, - "SpotifyShareCommands": { - "enabled": true - }, - "StartupTimings": { - "enabled": true - }, - "TextReplace": { - "enabled": false - }, - "ThemeAttributes": { - "enabled": false - }, - "TimeBarAllActivities": { - "enabled": false - }, - "Translate": { - "enabled": true, - "autoTranslate": false - }, - "TypingIndicator": { - "enabled": false - }, - "TypingTweaks": { - "enabled": false - }, - "Unindent": { - "enabled": false - }, - "UnsuppressEmbeds": { - "enabled": false - }, - "UrbanDictionary": { - "enabled": false - }, - "UserVoiceShow": { - "enabled": true - }, - "USRBG": { - "enabled": false, - "nitroFirst": true, - "voiceBackground": true - }, - "ValidUser": { - "enabled": false - }, - "VoiceChatDoubleClick": { - "enabled": true - }, - "VcNarrator": { - "enabled": false - }, - "VencordToolbox": { - "enabled": false - }, - "ViewIcons": { - "enabled": false - }, - "ViewRaw": { - "enabled": false - }, - "VoiceMessages": { - "enabled": false - }, - "WebContextMenus": { - "enabled": true, - "addBack": true - }, - "WebKeybinds": { - "enabled": true - }, - "WhoReacted": { - "enabled": false - }, - "Wikisearch": { - "enabled": false - }, - "SuperReactionTweaks": { - "enabled": false - }, - "ChatInputButtonAPI": { - "enabled": true - }, - "BetterGifPicker": { - "enabled": false - }, - "ClientTheme": { - "enabled": false - }, - "Decor": { - "enabled": false - }, - "FixCodeblockGap": { - "enabled": false - }, - "FixYoutubeEmbeds": { - "enabled": false - }, - "DisableCallIdle": { - "enabled": true - }, - "NewGuildSettings": { - "enabled": true, - "guild": true, - "everyone": true, - "role": true - }, - "ShowHiddenThings": { - "enabled": false - }, - "PartyMode": { - "enabled": false, - "superIntensePartyMode": 0 - }, - "MessageUpdaterAPI": { - "enabled": true - }, - "AutomodContext": { - "enabled": false - }, - "BetterRoleContext": { - "enabled": false - }, - "BetterSessions": { - "enabled": false - }, - "BetterSettings": { - "enabled": false - }, - "CtrlEnterSend": { - "enabled": false - }, - "CustomIdle": { - "enabled": false - }, - "DontRoundMyTimestamps": { - "enabled": false - }, - "FriendsSince": { - "enabled": false - }, - "ImageLink": { - "enabled": false - }, - "ImplicitRelationships": { - "enabled": false - }, - "ServerInfo": { - "enabled": true - } - }, - "notifications": { - "timeout": 5000, - "position": "bottom-right", - "useNative": "not-focused", - "logLimit": 50 - }, - "cloud": { - "authenticated": false, - "url": "https://api.vencord.dev/", - "settingsSync": false, - "settingsSyncVersion": 1717817629006 - } - } - ''; - }; -} diff --git a/home/ebisu/fortune/desktop/agnostic.nix b/home/ebisu/fortune/desktop/agnostic.nix new file mode 100644 index 0000000..4531cc4 --- /dev/null +++ b/home/ebisu/fortune/desktop/agnostic.nix @@ -0,0 +1,12 @@ +{ pkgs, ... }: +{ + home.packages = with pkgs; [ + showmethekey + brightnessctl + bibata-cursors + xorg.xlsclients + libnotify + # lemurs + # emptty + ]; +} diff --git a/home/ebisu/fortune/desktop/agnostic/default.nix b/home/ebisu/fortune/desktop/agnostic/default.nix deleted file mode 100644 index 4531cc4..0000000 --- a/home/ebisu/fortune/desktop/agnostic/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ pkgs, ... }: -{ - home.packages = with pkgs; [ - showmethekey - brightnessctl - bibata-cursors - xorg.xlsclients - libnotify - # lemurs - # emptty - ]; -} diff --git a/home/ebisu/fortune/desktop/default.nix b/home/ebisu/fortune/desktop/default.nix index 061a773..3ea8654 100644 --- a/home/ebisu/fortune/desktop/default.nix +++ b/home/ebisu/fortune/desktop/default.nix @@ -1,8 +1,8 @@ { ... }: { imports = [ - ./agnostic ./wayland - # ./xorg + ./agnostic.nix + # ./xorg.nix ]; } diff --git a/home/ebisu/fortune/desktop/xorg.nix b/home/ebisu/fortune/desktop/xorg.nix new file mode 100644 index 0000000..801a736 --- /dev/null +++ b/home/ebisu/fortune/desktop/xorg.nix @@ -0,0 +1,17 @@ +{ pkgs, ... }: { + home.packages = with pkgs; [ + gifsicle + main + unclutter + xcape + xcolor + xclip + xsel + # xrootgif + xwallpaper + xbanish + xdotool + clipnotify + sxhkd + ]; +} diff --git a/home/ebisu/fortune/desktop/xorg/default.nix b/home/ebisu/fortune/desktop/xorg/default.nix deleted file mode 100644 index 801a736..0000000 --- a/home/ebisu/fortune/desktop/xorg/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ pkgs, ... }: { - home.packages = with pkgs; [ - gifsicle - main - unclutter - xcape - xcolor - xclip - xsel - # xrootgif - xwallpaper - xbanish - xdotool - clipnotify - sxhkd - ]; -} diff --git a/home/ebisu/fortune/education/calculator.nix b/home/ebisu/fortune/education/calculator.nix new file mode 100644 index 0000000..a8bcc7f --- /dev/null +++ b/home/ebisu/fortune/education/calculator.nix @@ -0,0 +1,7 @@ +{ pkgs, ... }: { + home.packages = with pkgs; [ + gavin-bc + qalculate-gtk + programmer-calculator + ]; +} diff --git a/home/ebisu/fortune/education/calculator/default.nix b/home/ebisu/fortune/education/calculator/default.nix deleted file mode 100644 index a8bcc7f..0000000 --- a/home/ebisu/fortune/education/calculator/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ pkgs, ... }: { - home.packages = with pkgs; [ - gavin-bc - qalculate-gtk - programmer-calculator - ]; -} diff --git a/home/ebisu/fortune/education/default.nix b/home/ebisu/fortune/education/default.nix index ccddf02..3ed4b6b 100644 --- a/home/ebisu/fortune/education/default.nix +++ b/home/ebisu/fortune/education/default.nix @@ -1,6 +1,7 @@ -{ pkgs, ... }: { +{ pkgs, ... }: +{ imports = [ - ./calculator + ./calculator.nix ]; home.packages = with pkgs; [ diff --git a/home/ebisu/fortune/filesystem/archive.nix b/home/ebisu/fortune/filesystem/archive.nix new file mode 100644 index 0000000..f52123b --- /dev/null +++ b/home/ebisu/fortune/filesystem/archive.nix @@ -0,0 +1,8 @@ +{ pkgs, ... }: { + home.packages = with pkgs; [ + unrar + xar + pigz + unzip + ]; +} diff --git a/home/ebisu/fortune/filesystem/archive/default.nix b/home/ebisu/fortune/filesystem/archive/default.nix deleted file mode 100644 index f52123b..0000000 --- a/home/ebisu/fortune/filesystem/archive/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ pkgs, ... }: { - home.packages = with pkgs; [ - unrar - xar - pigz - unzip - ]; -} diff --git a/home/ebisu/fortune/filesystem/default.nix b/home/ebisu/fortune/filesystem/default.nix index 698084c..303bf73 100644 --- a/home/ebisu/fortune/filesystem/default.nix +++ b/home/ebisu/fortune/filesystem/default.nix @@ -1,8 +1,8 @@ { pkgs, ... }: { imports = [ - ./archive ./core + ./archive.nix ]; programs.nnn.enable = true; diff --git a/home/ebisu/fortune/gaming/default.nix b/home/ebisu/fortune/gaming/default.nix index e39bec4..bf0d842 100644 --- a/home/ebisu/fortune/gaming/default.nix +++ b/home/ebisu/fortune/gaming/default.nix @@ -4,7 +4,7 @@ programs.gamemode = { enable = true; - enableRenice = true; + enableRenice = false; }; home.packages = with pkgs; [ diff --git a/home/ebisu/fortune/multimedia/audio/default.nix b/home/ebisu/fortune/multimedia/audio/default.nix index 7944a63..635d449 100644 --- a/home/ebisu/fortune/multimedia/audio/default.nix +++ b/home/ebisu/fortune/multimedia/audio/default.nix @@ -1,7 +1,6 @@ -{ pkgs, ... }: { - imports = [ - ./spotify - ]; +{ pkgs, ... }: +{ + imports = [ ./spotify.nix ]; home.packages = with pkgs; [ alsa-plugins diff --git a/home/ebisu/fortune/multimedia/audio/spotify.nix b/home/ebisu/fortune/multimedia/audio/spotify.nix new file mode 100644 index 0000000..ad0b0b4 --- /dev/null +++ b/home/ebisu/fortune/multimedia/audio/spotify.nix @@ -0,0 +1,11 @@ +{ pkgs, ... }: +{ + home.packages = with pkgs; [ + spotify + spotify-player + spicetify-cli + ncspot + psst + playerctl + ]; +} diff --git a/home/ebisu/fortune/multimedia/audio/spotify/default.nix b/home/ebisu/fortune/multimedia/audio/spotify/default.nix deleted file mode 100644 index 5276e07..0000000 --- a/home/ebisu/fortune/multimedia/audio/spotify/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ pkgs, ... }: { - home.packages = with pkgs; [ - # spotify-edge - spotify - spotify-player - spicetify-cli - ncspot - psst - playerctl - ]; -} diff --git a/home/ebisu/fortune/multimedia/default.nix b/home/ebisu/fortune/multimedia/default.nix index 86da8c4..97b5ff9 100644 --- a/home/ebisu/fortune/multimedia/default.nix +++ b/home/ebisu/fortune/multimedia/default.nix @@ -1,10 +1,11 @@ -{ pkgs, ... }: { +{ pkgs, ... }: +{ imports = [ ./audio ./browser - ./document - ./image ./video + ./document.nix + ./image.nix ]; home.packages = with pkgs; [ diff --git a/home/ebisu/fortune/multimedia/document.nix b/home/ebisu/fortune/multimedia/document.nix new file mode 100644 index 0000000..8be41e2 --- /dev/null +++ b/home/ebisu/fortune/multimedia/document.nix @@ -0,0 +1,10 @@ +{ pkgs, ... }: { + home.packages = with pkgs; [ + libreoffice-fresh + manga-cli + zathura + thunderbird + rfc + tdf + ]; +} diff --git a/home/ebisu/fortune/multimedia/document/default.nix b/home/ebisu/fortune/multimedia/document/default.nix deleted file mode 100644 index 8be41e2..0000000 --- a/home/ebisu/fortune/multimedia/document/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ pkgs, ... }: { - home.packages = with pkgs; [ - libreoffice-fresh - manga-cli - zathura - thunderbird - rfc - tdf - ]; -} diff --git a/home/ebisu/fortune/multimedia/image.nix b/home/ebisu/fortune/multimedia/image.nix new file mode 100644 index 0000000..4121f63 --- /dev/null +++ b/home/ebisu/fortune/multimedia/image.nix @@ -0,0 +1,17 @@ +{ pkgs, ... }: +{ + home.packages = with pkgs; [ + (pkgs.callPackage ../../../../pkgs/ahoviewer.nix { }) + emulsion + feh + imv + gallery-dl + gthumb + nsxiv + pngcrush + viewnior + viu + optipng + (pkgs.callPackage ../../../../pkgs/chan-downloader.nix { }) + ]; +} diff --git a/home/ebisu/fortune/multimedia/image/default.nix b/home/ebisu/fortune/multimedia/image/default.nix deleted file mode 100644 index 08a5372..0000000 --- a/home/ebisu/fortune/multimedia/image/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ pkgs, ... }: -{ - home.packages = with pkgs; [ - (pkgs.callPackage ../../../../../pkgs/ahoviewer.nix { }) - emulsion - feh - imv - gallery-dl - gthumb - nsxiv - pngcrush - viewnior - viu - optipng - (pkgs.callPackage ../../../../../pkgs/chan-downloader.nix { }) - ]; -} diff --git a/home/ebisu/fortune/multimedia/video/anime.nix b/home/ebisu/fortune/multimedia/video/anime.nix new file mode 100644 index 0000000..471bb7a --- /dev/null +++ b/home/ebisu/fortune/multimedia/video/anime.nix @@ -0,0 +1,7 @@ +{ pkgs, ... }: +{ + home.packages = with pkgs; [ + ani-cli + # miru + ]; +} diff --git a/home/ebisu/fortune/multimedia/video/anime/default.nix b/home/ebisu/fortune/multimedia/video/anime/default.nix deleted file mode 100644 index 471bb7a..0000000 --- a/home/ebisu/fortune/multimedia/video/anime/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ pkgs, ... }: -{ - home.packages = with pkgs; [ - ani-cli - # miru - ]; -} diff --git a/home/ebisu/fortune/multimedia/video/default.nix b/home/ebisu/fortune/multimedia/video/default.nix index 1d5a964..50f2a77 100644 --- a/home/ebisu/fortune/multimedia/video/default.nix +++ b/home/ebisu/fortune/multimedia/video/default.nix @@ -1,6 +1,7 @@ -{ pkgs, ... }: { +{ pkgs, ... }: +{ imports = [ - ./anime + ./anime.nix ]; home.packages = with pkgs; [ diff --git a/home/ebisu/fortune/system/bitwarden.nix b/home/ebisu/fortune/system/bitwarden.nix new file mode 100644 index 0000000..2ac188f --- /dev/null +++ b/home/ebisu/fortune/system/bitwarden.nix @@ -0,0 +1,7 @@ +{ pkgs, ... }: { + home.packages = with pkgs; [ + bitwarden-desktop + # bitwarden-cli + # bitwarden-menu + ]; +} diff --git a/home/ebisu/fortune/system/bitwarden/default.nix b/home/ebisu/fortune/system/bitwarden/default.nix deleted file mode 100644 index 2ac188f..0000000 --- a/home/ebisu/fortune/system/bitwarden/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ pkgs, ... }: { - home.packages = with pkgs; [ - bitwarden-desktop - # bitwarden-cli - # bitwarden-menu - ]; -} diff --git a/home/ebisu/fortune/system/default.nix b/home/ebisu/fortune/system/default.nix index fd68070..5e3a43b 100644 --- a/home/ebisu/fortune/system/default.nix +++ b/home/ebisu/fortune/system/default.nix @@ -1,13 +1,13 @@ { pkgs, ... }: { imports = [ - ./bitwarden ./fonts - ./opengl - ./peripheral ./shell ./terminal ./virtualisation + ./bitwarden.nix + ./opengl.nix + ./peripheral.nix ./tracing.nix ./variables.nix ./xdg.nix diff --git a/home/ebisu/fortune/system/opengl.nix b/home/ebisu/fortune/system/opengl.nix new file mode 100644 index 0000000..cabb8f9 --- /dev/null +++ b/home/ebisu/fortune/system/opengl.nix @@ -0,0 +1,23 @@ +{ pkgs +, config +, inputs +, ... +}: +let + nixGLIntel = inputs.nixGL.packages.${pkgs.system}.nixGLIntel; +in +{ + imports = [ + (builtins.fetchurl { + url = "https://raw.githubusercontent.com/nix-community/home-manager/5e59fe27d938a8c2d5e215f64f5d937c2f863fed/modules/misc/nixgl.nix"; + sha256 = "74f9fb98f22581eaca2e3c518a0a3d6198249fb1490ab4a08f33ec47827e85db"; + }) + ]; + + # Ref. https://github.com/nix-community/home-manager/issues/3968 + nixGL.prefix = "${nixGLIntel}/bin/nixGLIntel"; + + home.packages = [ + nixGLIntel + ]; +} diff --git a/home/ebisu/fortune/system/opengl/default.nix b/home/ebisu/fortune/system/opengl/default.nix deleted file mode 100644 index cabb8f9..0000000 --- a/home/ebisu/fortune/system/opengl/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ pkgs -, config -, inputs -, ... -}: -let - nixGLIntel = inputs.nixGL.packages.${pkgs.system}.nixGLIntel; -in -{ - imports = [ - (builtins.fetchurl { - url = "https://raw.githubusercontent.com/nix-community/home-manager/5e59fe27d938a8c2d5e215f64f5d937c2f863fed/modules/misc/nixgl.nix"; - sha256 = "74f9fb98f22581eaca2e3c518a0a3d6198249fb1490ab4a08f33ec47827e85db"; - }) - ]; - - # Ref. https://github.com/nix-community/home-manager/issues/3968 - nixGL.prefix = "${nixGLIntel}/bin/nixGLIntel"; - - home.packages = [ - nixGLIntel - ]; -} diff --git a/home/ebisu/fortune/system/peripheral.nix b/home/ebisu/fortune/system/peripheral.nix new file mode 100644 index 0000000..f05379c --- /dev/null +++ b/home/ebisu/fortune/system/peripheral.nix @@ -0,0 +1,6 @@ +{ pkgs, ... }: { + home.packages = with pkgs; [ + # openrgb + solaar + ]; +} diff --git a/home/ebisu/fortune/system/peripheral/default.nix b/home/ebisu/fortune/system/peripheral/default.nix deleted file mode 100644 index f05379c..0000000 --- a/home/ebisu/fortune/system/peripheral/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ pkgs, ... }: { - home.packages = with pkgs; [ - # openrgb - solaar - ]; -} diff --git a/home/ebisu/fortune/system/shell/default.nix b/home/ebisu/fortune/system/shell/default.nix index 2ee83d1..05e84a7 100644 --- a/home/ebisu/fortune/system/shell/default.nix +++ b/home/ebisu/fortune/system/shell/default.nix @@ -1,9 +1,9 @@ { pkgs, ... }: { imports = [ - ./fish - ./starship ./scripting + ./fish.nix + ./starship.nix ]; home.packages = with pkgs; [ diff --git a/home/ebisu/fortune/system/shell/fish.nix b/home/ebisu/fortune/system/shell/fish.nix new file mode 100644 index 0000000..d58b065 --- /dev/null +++ b/home/ebisu/fortune/system/shell/fish.nix @@ -0,0 +1,159 @@ +{ pkgs, config, ... }: +{ + programs.fish = { + enable = true; + + shellInit = '' + if status is-interactive + set fish_greeting + + fish_vi_key_bindings + + function fish_postexec --on-event fish_postexec + if test "$argv" != "clear" + echo + end + end + + function vpn + env BIND_INTERFACE=wgpia0 LD_PRELOAD=/usr/lib/bindToInterface.so $argv + end + + function nh + if test "$argv[1]" = "home" -a "$argv[2]" = "switch" + command nh $argv -- --impure + else + command nh $argv + end + end + + function nix-find + find $argv -type f -exec test ! -L {} \; -exec realpath {} \; | grep -v "^/nix/store" + end + end + + set -l config_home (set -q XDG_CONFIG_HOME; and echo $XDG_CONFIG_HOME; or echo $HOME/.config) + set HISTSIZE -1 + set HISTFILESIZE -1 + set SAVEHIST -1 + + bind \ce edit_command_buffer + + cat ~/.cache/wal/sequences + + zoxide init fish | source + direnv hook fish | source + starship init fish | source + ''; + + plugins = [ + { + name = "fzf.fish"; + + src = pkgs.fetchFromGitHub { + owner = "patrickf1"; + repo = "fzf.fish"; + rev = "8920367cf85eee5218cc25a11e209d46e2591e7a"; + sha256 = "sha256-T8KYLA/r/gOKvAivKRoeqIwE2pINlxFQtZJHpOy9GMM="; + }; + } + { + name = "bass"; + + src = pkgs.fetchFromGitHub { + owner = "edc"; + repo = "bass"; + rev = "79b62958ecf4e87334f24d6743e5766475bcf4d0"; + sha256 = "sha256-3d/qL+hovNA4VMWZ0n1L+dSM1lcz7P5CQJyy+/8exTc="; + }; + } + { + name = "nvm.fish"; + + src = pkgs.fetchFromGitHub { + owner = "jorgebucaran"; + repo = "nvm.fish"; + rev = "b8edb1ee24cbbf7259196b0cb3c6c4ab65b07929"; + sha256 = "sha256-7JxIQSseBv81SSpWH1pufx8fh9EQhbo3r2nVVREwc58="; + }; + } + { + name = "sponge"; + + src = pkgs.fetchFromGitHub { + owner = "meaningful-ooo"; + repo = "sponge"; + rev = "384299545104d5256648cee9d8b117aaa9a6d7be"; + sha256 = "sha256-MdcZUDRtNJdiyo2l9o5ma7nAX84xEJbGFhAVhK+Zm1w="; + }; + } + { + name = "autopair.fish"; + + src = pkgs.fetchFromGitHub { + owner = "jorgebucaran"; + repo = "autopair.fish"; + rev = "4d1752ff5b39819ab58d7337c69220342e9de0e2"; + sha256 = "sha256-qt3t1iKRRNuiLWiVoiAYOu+9E7jsyECyIqZJ/oRIT1A="; + }; + } + ]; + + shellAliases = { + # Verbosity + cp = "cp -iv"; + mv = "mv -iv"; + # rm = "rm -vI"; + bc = "bc -ql"; + rsync = "rsync -vrPlu"; + mkd = "mkdir -pv"; + yt = "yt-dlp --embed-metadata -i"; + yta = "yt -x -f bestaudio/best"; + ytt = "yt --skip-download --write-thumbnail"; + ffmpeg = "ffmpeg -hide_banner"; + wdic = "wdic --homophones --kanji --color --pager"; + hakuneko = "hakuneko-desktop --no-sandbox"; + fastfetch = "clear && /usr/bin/env fastfetch"; + wget = "wget --hsts-file=${config.xdg.dataHome}/wget-hsts"; + + # Modern Alternatives & Alias Rewrites + sxiv = "nsxiv"; + unzip = "ripunzip unzip-file"; + nvim = "lvim"; + vim = "lvim"; + vimdiff = "lvim -d"; + rm = "rip"; + + # Colourise + ls = "exa -h --no-quotes --color=auto --group-directories-first"; + grep = "grep --color=auto"; + diff = "diff --color=auto"; + ccat = "highlight --out-format=ansi"; + ip = "ip -color=auto"; + + # Abbreviations + ka = "killall"; + g = "git"; + sdn = "shutdown -h now"; + e = "$EDITOR"; + v = "$EDITOR"; + ff = "fastfetch"; + + # Other + pacbins = "comm -23 <(yay -Qqett | sort) <(yay -Qqg base -g base-devel | sort | uniq)"; + chan = "chan-downloader -c 10"; + taiga = "bottles-cli run -b Taiga -p Taiga"; + rotd = "systemctl --user restart opentabledriver.service"; + ks = "kaguya stream --user-agent 'Mozilla/5.0 (X11; Linux x86_64; rv:120.0) Gecko/20100101 Firefox/120.0'"; + def = "myougiden"; + suzuri = "SUZURI_MINIMAL=1 SUZURI_REVERSE=1 ~/Documents/Code/Git/Fuwn/suzuri/suzuri"; + "5ch" = "html2md -i 'https://ff5ch.syoboi.jp/' -s section | glow"; + shinobu = "curl --silent https://shinobu.fuwn.workers.dev/shinobu -o /tmp/shinobu && nsxiv /tmp/shinobu"; + auto_subtitle = "source $HOME/Documents/Code/Git/Random/auto-subtitle/venv/bin/activate && auto_subtitle --model medium --task translate --srt_only True"; + steamy = "mangohud gamemoderun steam-runtime"; + koix = "koi -f"; + seamonkey = "$HOME/.local/src/seamonkey/seamonkey-bin"; + doom = "$HOME/.config/emacs/bin/doom"; + }; + }; +} diff --git a/home/ebisu/fortune/system/shell/fish/default.nix b/home/ebisu/fortune/system/shell/fish/default.nix deleted file mode 100644 index d58b065..0000000 --- a/home/ebisu/fortune/system/shell/fish/default.nix +++ /dev/null @@ -1,159 +0,0 @@ -{ pkgs, config, ... }: -{ - programs.fish = { - enable = true; - - shellInit = '' - if status is-interactive - set fish_greeting - - fish_vi_key_bindings - - function fish_postexec --on-event fish_postexec - if test "$argv" != "clear" - echo - end - end - - function vpn - env BIND_INTERFACE=wgpia0 LD_PRELOAD=/usr/lib/bindToInterface.so $argv - end - - function nh - if test "$argv[1]" = "home" -a "$argv[2]" = "switch" - command nh $argv -- --impure - else - command nh $argv - end - end - - function nix-find - find $argv -type f -exec test ! -L {} \; -exec realpath {} \; | grep -v "^/nix/store" - end - end - - set -l config_home (set -q XDG_CONFIG_HOME; and echo $XDG_CONFIG_HOME; or echo $HOME/.config) - set HISTSIZE -1 - set HISTFILESIZE -1 - set SAVEHIST -1 - - bind \ce edit_command_buffer - - cat ~/.cache/wal/sequences - - zoxide init fish | source - direnv hook fish | source - starship init fish | source - ''; - - plugins = [ - { - name = "fzf.fish"; - - src = pkgs.fetchFromGitHub { - owner = "patrickf1"; - repo = "fzf.fish"; - rev = "8920367cf85eee5218cc25a11e209d46e2591e7a"; - sha256 = "sha256-T8KYLA/r/gOKvAivKRoeqIwE2pINlxFQtZJHpOy9GMM="; - }; - } - { - name = "bass"; - - src = pkgs.fetchFromGitHub { - owner = "edc"; - repo = "bass"; - rev = "79b62958ecf4e87334f24d6743e5766475bcf4d0"; - sha256 = "sha256-3d/qL+hovNA4VMWZ0n1L+dSM1lcz7P5CQJyy+/8exTc="; - }; - } - { - name = "nvm.fish"; - - src = pkgs.fetchFromGitHub { - owner = "jorgebucaran"; - repo = "nvm.fish"; - rev = "b8edb1ee24cbbf7259196b0cb3c6c4ab65b07929"; - sha256 = "sha256-7JxIQSseBv81SSpWH1pufx8fh9EQhbo3r2nVVREwc58="; - }; - } - { - name = "sponge"; - - src = pkgs.fetchFromGitHub { - owner = "meaningful-ooo"; - repo = "sponge"; - rev = "384299545104d5256648cee9d8b117aaa9a6d7be"; - sha256 = "sha256-MdcZUDRtNJdiyo2l9o5ma7nAX84xEJbGFhAVhK+Zm1w="; - }; - } - { - name = "autopair.fish"; - - src = pkgs.fetchFromGitHub { - owner = "jorgebucaran"; - repo = "autopair.fish"; - rev = "4d1752ff5b39819ab58d7337c69220342e9de0e2"; - sha256 = "sha256-qt3t1iKRRNuiLWiVoiAYOu+9E7jsyECyIqZJ/oRIT1A="; - }; - } - ]; - - shellAliases = { - # Verbosity - cp = "cp -iv"; - mv = "mv -iv"; - # rm = "rm -vI"; - bc = "bc -ql"; - rsync = "rsync -vrPlu"; - mkd = "mkdir -pv"; - yt = "yt-dlp --embed-metadata -i"; - yta = "yt -x -f bestaudio/best"; - ytt = "yt --skip-download --write-thumbnail"; - ffmpeg = "ffmpeg -hide_banner"; - wdic = "wdic --homophones --kanji --color --pager"; - hakuneko = "hakuneko-desktop --no-sandbox"; - fastfetch = "clear && /usr/bin/env fastfetch"; - wget = "wget --hsts-file=${config.xdg.dataHome}/wget-hsts"; - - # Modern Alternatives & Alias Rewrites - sxiv = "nsxiv"; - unzip = "ripunzip unzip-file"; - nvim = "lvim"; - vim = "lvim"; - vimdiff = "lvim -d"; - rm = "rip"; - - # Colourise - ls = "exa -h --no-quotes --color=auto --group-directories-first"; - grep = "grep --color=auto"; - diff = "diff --color=auto"; - ccat = "highlight --out-format=ansi"; - ip = "ip -color=auto"; - - # Abbreviations - ka = "killall"; - g = "git"; - sdn = "shutdown -h now"; - e = "$EDITOR"; - v = "$EDITOR"; - ff = "fastfetch"; - - # Other - pacbins = "comm -23 <(yay -Qqett | sort) <(yay -Qqg base -g base-devel | sort | uniq)"; - chan = "chan-downloader -c 10"; - taiga = "bottles-cli run -b Taiga -p Taiga"; - rotd = "systemctl --user restart opentabledriver.service"; - ks = "kaguya stream --user-agent 'Mozilla/5.0 (X11; Linux x86_64; rv:120.0) Gecko/20100101 Firefox/120.0'"; - def = "myougiden"; - suzuri = "SUZURI_MINIMAL=1 SUZURI_REVERSE=1 ~/Documents/Code/Git/Fuwn/suzuri/suzuri"; - "5ch" = "html2md -i 'https://ff5ch.syoboi.jp/' -s section | glow"; - shinobu = "curl --silent https://shinobu.fuwn.workers.dev/shinobu -o /tmp/shinobu && nsxiv /tmp/shinobu"; - auto_subtitle = "source $HOME/Documents/Code/Git/Random/auto-subtitle/venv/bin/activate && auto_subtitle --model medium --task translate --srt_only True"; - steamy = "mangohud gamemoderun steam-runtime"; - koix = "koi -f"; - seamonkey = "$HOME/.local/src/seamonkey/seamonkey-bin"; - doom = "$HOME/.config/emacs/bin/doom"; - }; - }; -} diff --git a/home/ebisu/fortune/system/shell/scripting/charmbracelet.nix b/home/ebisu/fortune/system/shell/scripting/charmbracelet.nix new file mode 100644 index 0000000..e3b78df --- /dev/null +++ b/home/ebisu/fortune/system/shell/scripting/charmbracelet.nix @@ -0,0 +1,6 @@ +{ pkgs, ... }: { + home.packages = with pkgs; [ + gum + mods + ]; +} diff --git a/home/ebisu/fortune/system/shell/scripting/charmbracelet/default.nix b/home/ebisu/fortune/system/shell/scripting/charmbracelet/default.nix deleted file mode 100644 index e3b78df..0000000 --- a/home/ebisu/fortune/system/shell/scripting/charmbracelet/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ pkgs, ... }: { - home.packages = with pkgs; [ - gum - mods - ]; -} diff --git a/home/ebisu/fortune/system/shell/scripting/default.nix b/home/ebisu/fortune/system/shell/scripting/default.nix index 2fe33df..02ce752 100644 --- a/home/ebisu/fortune/system/shell/scripting/default.nix +++ b/home/ebisu/fortune/system/shell/scripting/default.nix @@ -1,7 +1,8 @@ -{ pkgs, ... }: { +{ pkgs, ... }: +{ imports = [ - ./charmbracelet - ./ripgrep + ./charmbracelet.nix + ./ripgrep.nix ]; programs.fzf.enable = true; diff --git a/home/ebisu/fortune/system/shell/scripting/ripgrep.nix b/home/ebisu/fortune/system/shell/scripting/ripgrep.nix new file mode 100644 index 0000000..00de07f --- /dev/null +++ b/home/ebisu/fortune/system/shell/scripting/ripgrep.nix @@ -0,0 +1,7 @@ +{ pkgs, ... }: { + programs.ripgrep.enable = true; + + home.packages = with pkgs; [ + ripgrep-all + ]; +} diff --git a/home/ebisu/fortune/system/shell/scripting/ripgrep/default.nix b/home/ebisu/fortune/system/shell/scripting/ripgrep/default.nix deleted file mode 100644 index 00de07f..0000000 --- a/home/ebisu/fortune/system/shell/scripting/ripgrep/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ pkgs, ... }: { - programs.ripgrep.enable = true; - - home.packages = with pkgs; [ - ripgrep-all - ]; -} diff --git a/home/ebisu/fortune/system/shell/starship.nix b/home/ebisu/fortune/system/shell/starship.nix new file mode 100644 index 0000000..0088038 --- /dev/null +++ b/home/ebisu/fortune/system/shell/starship.nix @@ -0,0 +1,305 @@ +{ pkgs, ... }: { + home.packages = with pkgs; [ + starship + ]; + + programs.starship = { + enable = true; + enableFishIntegration = true; + + # I CBA to update the formatting to match the rest of the expressions, since + # this is a one-off that I tend to import over directly from starship. + settings = { + format = "[term%](bold green) "; + right_format = "$character$all"; + add_newline = false; + + line_break = { + disabled = true; + }; + + character = { + success_symbol = "[i](bold green)"; + error_symbol = "[x](bold red)"; + vimcmd_symbol = "[n](bold green)"; + vimcmd_visual_symbol = "[v](bold green)"; + vimcmd_replace_symbol = "[R](bold green)"; + vimcmd_replace_one_symbol = "[r](bold green)"; + }; + + git_commit = { + tag_symbol = " tag "; + }; + + git_status = { + ahead = ">"; + behind = "<"; + diverged = "<>"; + renamed = "r"; + deleted = "x"; + }; + + aws = { + symbol = "aws "; + }; + + azure = { + symbol = "az "; + }; + + bun = { + symbol = "bun "; + }; + + c = { + symbol = "C "; + }; + + cobol = { + symbol = "cobol "; + }; + + conda = { + symbol = "conda "; + }; + + crystal = { + symbol = "cr "; + }; + + cmake = { + symbol = "cmake "; + }; + + daml = { + symbol = "daml "; + }; + + dart = { + symbol = "dart "; + }; + + deno = { + symbol = "deno "; + }; + + dotnet = { + symbol = ".NET "; + }; + + directory = { + read_only = " ro"; + }; + + docker_context = { + symbol = "docker "; + }; + + elixir = { + symbol = "exs "; + }; + + elm = { + symbol = "elm "; + }; + + fennel = { + symbol = "fnl "; + }; + + fossil_branch = { + symbol = "fossil "; + }; + + gcloud = { + symbol = "gcp "; + }; + + git_branch = { + symbol = "git "; + }; + + golang = { + symbol = "go "; + }; + + gradle = { + symbol = "gradle "; + }; + + guix_shell = { + symbol = "guix "; + }; + + hg_branch = { + symbol = "hg "; + }; + + java = { + symbol = "java "; + }; + + julia = { + symbol = "jl "; + }; + + kotlin = { + symbol = "kt "; + }; + + lua = { + symbol = "lua "; + }; + + nodejs = { + symbol = "nodejs "; + }; + + memory_usage = { + symbol = "memory "; + }; + + meson = { + symbol = "meson "; + }; + + nim = { + symbol = "nim "; + }; + + nix_shell = { + symbol = "nix "; + }; + + ocaml = { + symbol = "ml "; + }; + + opa = { + symbol = "opa "; + }; + + os = { + symbols = { + Alpaquita = "alq "; + Alpine = "alp "; + Amazon = "amz "; + Android = "andr "; + Arch = "rch "; + Artix = "atx "; + CentOS = "cent "; + Debian = "deb "; + DragonFly = "dfbsd "; + Emscripten = "emsc "; + EndeavourOS = "ndev "; + Fedora = "fed "; + FreeBSD = "fbsd "; + Garuda = "garu "; + Gentoo = "gent "; + HardenedBSD = "hbsd "; + Illumos = "lum "; + Linux = "lnx "; + Mabox = "mbox "; + Macos = "mac "; + Manjaro = "mjo "; + Mariner = "mrn "; + MidnightBSD = "mid "; + Mint = "mint "; + NetBSD = "nbsd "; + NixOS = "nix "; + OpenBSD = "obsd "; + OpenCloudOS = "ocos "; + openEuler = "oeul "; + openSUSE = "osuse "; + OracleLinux = "orac "; + Pop = "pop "; + Raspbian = "rasp "; + Redhat = "rhl "; + RedHatEnterprise = "rhel "; + Redox = "redox "; + Solus = "sol "; + SUSE = "suse "; + Ubuntu = "ubnt "; + Unknown = "unk "; + Windows = "win "; + }; + }; + + package = { + symbol = "pkg "; + }; + + perl = { + symbol = "pl "; + }; + + php = { + symbol = "php "; + }; + + pijul_channel = { + symbol = "pijul "; + }; + + pulumi = { + symbol = "pulumi "; + }; + + purescript = { + symbol = "purs "; + }; + + python = { + symbol = "py "; + }; + + raku = { + symbol = "raku "; + }; + + ruby = { + symbol = "rb "; + }; + + rust = { + symbol = "rs "; + }; + + scala = { + symbol = "scala "; + }; + + spack = { + symbol = "spack "; + }; + + solidity = { + symbol = "solidity "; + }; + + status = { + symbol = "[x](bold red) "; + }; + + sudo = { + symbol = "sudo "; + }; + + swift = { + symbol = "swift "; + }; + + typst = { + symbol = "typst "; + }; + + terraform = { + symbol = "terraform "; + }; + + zig = { + symbol = "zig "; + }; + }; + }; +} diff --git a/home/ebisu/fortune/system/shell/starship/default.nix b/home/ebisu/fortune/system/shell/starship/default.nix deleted file mode 100644 index 0088038..0000000 --- a/home/ebisu/fortune/system/shell/starship/default.nix +++ /dev/null @@ -1,305 +0,0 @@ -{ pkgs, ... }: { - home.packages = with pkgs; [ - starship - ]; - - programs.starship = { - enable = true; - enableFishIntegration = true; - - # I CBA to update the formatting to match the rest of the expressions, since - # this is a one-off that I tend to import over directly from starship. - settings = { - format = "[term%](bold green) "; - right_format = "$character$all"; - add_newline = false; - - line_break = { - disabled = true; - }; - - character = { - success_symbol = "[i](bold green)"; - error_symbol = "[x](bold red)"; - vimcmd_symbol = "[n](bold green)"; - vimcmd_visual_symbol = "[v](bold green)"; - vimcmd_replace_symbol = "[R](bold green)"; - vimcmd_replace_one_symbol = "[r](bold green)"; - }; - - git_commit = { - tag_symbol = " tag "; - }; - - git_status = { - ahead = ">"; - behind = "<"; - diverged = "<>"; - renamed = "r"; - deleted = "x"; - }; - - aws = { - symbol = "aws "; - }; - - azure = { - symbol = "az "; - }; - - bun = { - symbol = "bun "; - }; - - c = { - symbol = "C "; - }; - - cobol = { - symbol = "cobol "; - }; - - conda = { - symbol = "conda "; - }; - - crystal = { - symbol = "cr "; - }; - - cmake = { - symbol = "cmake "; - }; - - daml = { - symbol = "daml "; - }; - - dart = { - symbol = "dart "; - }; - - deno = { - symbol = "deno "; - }; - - dotnet = { - symbol = ".NET "; - }; - - directory = { - read_only = " ro"; - }; - - docker_context = { - symbol = "docker "; - }; - - elixir = { - symbol = "exs "; - }; - - elm = { - symbol = "elm "; - }; - - fennel = { - symbol = "fnl "; - }; - - fossil_branch = { - symbol = "fossil "; - }; - - gcloud = { - symbol = "gcp "; - }; - - git_branch = { - symbol = "git "; - }; - - golang = { - symbol = "go "; - }; - - gradle = { - symbol = "gradle "; - }; - - guix_shell = { - symbol = "guix "; - }; - - hg_branch = { - symbol = "hg "; - }; - - java = { - symbol = "java "; - }; - - julia = { - symbol = "jl "; - }; - - kotlin = { - symbol = "kt "; - }; - - lua = { - symbol = "lua "; - }; - - nodejs = { - symbol = "nodejs "; - }; - - memory_usage = { - symbol = "memory "; - }; - - meson = { - symbol = "meson "; - }; - - nim = { - symbol = "nim "; - }; - - nix_shell = { - symbol = "nix "; - }; - - ocaml = { - symbol = "ml "; - }; - - opa = { - symbol = "opa "; - }; - - os = { - symbols = { - Alpaquita = "alq "; - Alpine = "alp "; - Amazon = "amz "; - Android = "andr "; - Arch = "rch "; - Artix = "atx "; - CentOS = "cent "; - Debian = "deb "; - DragonFly = "dfbsd "; - Emscripten = "emsc "; - EndeavourOS = "ndev "; - Fedora = "fed "; - FreeBSD = "fbsd "; - Garuda = "garu "; - Gentoo = "gent "; - HardenedBSD = "hbsd "; - Illumos = "lum "; - Linux = "lnx "; - Mabox = "mbox "; - Macos = "mac "; - Manjaro = "mjo "; - Mariner = "mrn "; - MidnightBSD = "mid "; - Mint = "mint "; - NetBSD = "nbsd "; - NixOS = "nix "; - OpenBSD = "obsd "; - OpenCloudOS = "ocos "; - openEuler = "oeul "; - openSUSE = "osuse "; - OracleLinux = "orac "; - Pop = "pop "; - Raspbian = "rasp "; - Redhat = "rhl "; - RedHatEnterprise = "rhel "; - Redox = "redox "; - Solus = "sol "; - SUSE = "suse "; - Ubuntu = "ubnt "; - Unknown = "unk "; - Windows = "win "; - }; - }; - - package = { - symbol = "pkg "; - }; - - perl = { - symbol = "pl "; - }; - - php = { - symbol = "php "; - }; - - pijul_channel = { - symbol = "pijul "; - }; - - pulumi = { - symbol = "pulumi "; - }; - - purescript = { - symbol = "purs "; - }; - - python = { - symbol = "py "; - }; - - raku = { - symbol = "raku "; - }; - - ruby = { - symbol = "rb "; - }; - - rust = { - symbol = "rs "; - }; - - scala = { - symbol = "scala "; - }; - - spack = { - symbol = "spack "; - }; - - solidity = { - symbol = "solidity "; - }; - - status = { - symbol = "[x](bold red) "; - }; - - sudo = { - symbol = "sudo "; - }; - - swift = { - symbol = "swift "; - }; - - typst = { - symbol = "typst "; - }; - - terraform = { - symbol = "terraform "; - }; - - zig = { - symbol = "zig "; - }; - }; - }; -} diff --git a/home/ebisu/fortune/system/terminal/default.nix b/home/ebisu/fortune/system/terminal/default.nix index 6375e0a..6cd5378 100644 --- a/home/ebisu/fortune/system/terminal/default.nix +++ b/home/ebisu/fortune/system/terminal/default.nix @@ -1,7 +1,8 @@ -{ pkgs, ... }: { +{ pkgs, ... }: +{ imports = [ - ./kitty - ./foot + ./kitty.nix + ./foot.nix ]; home.packages = with pkgs; [ diff --git a/home/ebisu/fortune/system/terminal/foot.nix b/home/ebisu/fortune/system/terminal/foot.nix new file mode 100644 index 0000000..ed0820b --- /dev/null +++ b/home/ebisu/fortune/system/terminal/foot.nix @@ -0,0 +1,49 @@ +{ pkgs, ... }: { + programs.foot = { + enable = true; + + settings = { + main = { + font = "SF Mono:size=12"; + font-bold = "SF Mono:size=12:weight=medium"; + font-italic = "SF Mono:size=12:slant=italic"; + font-bold-italic = "SF Mono:size=12:slant=italic:weight=medium"; + + # Font Fine-tuning + # vertical-letter-offset = -1; + # line-height = 13; + # underline-thickness = 0.6; + # underline-offset = 2; + + # Styling + bold-text-in-bright = "palette-based"; + pad = "15x15"; # "24x24" + + # Misc. + resize-delay-ms = "0"; + term = "xterm"; + # locked-title = "yes"; + selection-target = "both"; + # workers = "0"; + # utmp-helper = "none"; + }; + + url.osc8-underline = "always"; + bell.urgent = "yes"; + # scrollback.lines = "1000"; + mouse.hide-when-typing = "yes"; + key-bindings.clipboard-paste = "Control+v Control+Shift+v"; + + tweak = { + scaling-filter = "none"; + # font-monospace-warn = "no"; + # grapheme-width-method = "wcswidth"; + # grapheme-shaping = "no"; + }; + + colors = { + alpha = "0.8"; + }; + }; + }; +} diff --git a/home/ebisu/fortune/system/terminal/foot/default.nix b/home/ebisu/fortune/system/terminal/foot/default.nix deleted file mode 100644 index ed0820b..0000000 --- a/home/ebisu/fortune/system/terminal/foot/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ pkgs, ... }: { - programs.foot = { - enable = true; - - settings = { - main = { - font = "SF Mono:size=12"; - font-bold = "SF Mono:size=12:weight=medium"; - font-italic = "SF Mono:size=12:slant=italic"; - font-bold-italic = "SF Mono:size=12:slant=italic:weight=medium"; - - # Font Fine-tuning - # vertical-letter-offset = -1; - # line-height = 13; - # underline-thickness = 0.6; - # underline-offset = 2; - - # Styling - bold-text-in-bright = "palette-based"; - pad = "15x15"; # "24x24" - - # Misc. - resize-delay-ms = "0"; - term = "xterm"; - # locked-title = "yes"; - selection-target = "both"; - # workers = "0"; - # utmp-helper = "none"; - }; - - url.osc8-underline = "always"; - bell.urgent = "yes"; - # scrollback.lines = "1000"; - mouse.hide-when-typing = "yes"; - key-bindings.clipboard-paste = "Control+v Control+Shift+v"; - - tweak = { - scaling-filter = "none"; - # font-monospace-warn = "no"; - # grapheme-width-method = "wcswidth"; - # grapheme-shaping = "no"; - }; - - colors = { - alpha = "0.8"; - }; - }; - }; -} diff --git a/home/ebisu/fortune/system/terminal/kitty.nix b/home/ebisu/fortune/system/terminal/kitty.nix new file mode 100644 index 0000000..4346e8d --- /dev/null +++ b/home/ebisu/fortune/system/terminal/kitty.nix @@ -0,0 +1,113 @@ +{ pkgs, config, ... }: +{ + programs.kitty = { + enable = true; + + settings = { + # Font + # MesloLGS NF + font_family = "SF Mono Light"; + bold_font = "SF Mono Medium"; + italic_font = "SF Mono Light Italic"; + bold_italic_font = "SF Mono Medium Italic"; + font_size = 12; # 13.5 + + # Optimisation + resize_debounce_time = 0; + sync_to_monitor = true; + repaint_delay = 0; + input_delay = 0; + + # Style + background_opacity = "0.8"; + window_border_width = 0; + window_margin_width = 15; + hide_window_decorations = "titlebar-only"; + include = "~/.cache/wal/colors-kitty.conf"; + + # Cursor + cursor_blink_interval = 0; # 0.5 + cursor_stop_blinking_after = 0; # 15 + + # Other + scrollback_pager = "less +G -R"; + wheel_scroll_multiplier = 5; + click_interval = "0.5"; + select_by_word_characters = ":@-./_~?&=%+#"; + mouse_hide_wait = 0; + enabled_layouts = "*"; + remember_window_size = false; + macos_option_as_alt = false; + allow_remote_control = true; + confirm_os_window_close = 0; + term = "xterm-kitty"; + + # Bell + visual_bell_duration = 0; + enable_audio_bell = false; + + # URL Handling + open_url_modifiers = "ctrl+shift"; + open_url_with = "default"; + }; + + extraConfig = '' + # Clipboard + map super+v paste_from_clipboard + map ctrl+shift+s paste_from_selection + map super+c copy_to_clipboard + map shift+insert paste_from_selection + + # Scrolling + map ctrl+shift+up scroll_line_up + map ctrl+shift+down scroll_line_down + map ctrl+shift+k scroll_line_up + map ctrl+shift+j scroll_line_down + map ctrl+shift+page_up scroll_page_up + map ctrl+shift+page_down scroll_page_down + map ctrl+shift+home scroll_home + map ctrl+shift+end scroll_end + map ctrl+shift+h show_scrollback + + # Window management + map super+n new_os_window + map super+w close_window + map ctrl+shift+enter new_window + map ctrl+shift+] next_window + map ctrl+shift+[ previous_window + map ctrl+shift+f move_window_forward + map ctrl+shift+b move_window_backward + map ctrl+shift+` move_window_to_top + map ctrl+shift+1 first_window + map ctrl+shift+2 second_window + map ctrl+shift+3 third_window + map ctrl+shift+4 fourth_window + map ctrl+shift+5 fifth_window + map ctrl+shift+6 sixth_window + map ctrl+shift+7 seventh_window + map ctrl+shift+8 eighth_window + map ctrl+shift+9 ninth_window + map ctrl+shift+0 tenth_window + + # Tab management + map ctrl+shift+right next_tab + map ctrl+shift+left previous_tab + map ctrl+shift+t new_tab + map ctrl+shift+q close_tab + map ctrl+shift+l next_layout + map ctrl+shift+. move_tab_forward + map ctrl+shift+, move_tab_backward + + # Miscellaneous + map ctrl+shift+up increase_font_size + map ctrl+shift+down decrease_font_size + map ctrl+shift+backspace restore_font_size + + map ctrl+/ launch --allow-remote-control kitty +kitten kitty_search/search.py @active-kitty-window-id + ''; + }; + + # read the file, but remove the line with shell_integration + # xdg.configFile."kitty/kitty.conf".text = + # builtins.map (line: if builtins.match "shell_integration" line then "" else line) (builtins.split "\n" (builtins.readFile ~/.config/kitty/kitty.conf)); +} diff --git a/home/ebisu/fortune/system/terminal/kitty/default.nix b/home/ebisu/fortune/system/terminal/kitty/default.nix deleted file mode 100644 index 4346e8d..0000000 --- a/home/ebisu/fortune/system/terminal/kitty/default.nix +++ /dev/null @@ -1,113 +0,0 @@ -{ pkgs, config, ... }: -{ - programs.kitty = { - enable = true; - - settings = { - # Font - # MesloLGS NF - font_family = "SF Mono Light"; - bold_font = "SF Mono Medium"; - italic_font = "SF Mono Light Italic"; - bold_italic_font = "SF Mono Medium Italic"; - font_size = 12; # 13.5 - - # Optimisation - resize_debounce_time = 0; - sync_to_monitor = true; - repaint_delay = 0; - input_delay = 0; - - # Style - background_opacity = "0.8"; - window_border_width = 0; - window_margin_width = 15; - hide_window_decorations = "titlebar-only"; - include = "~/.cache/wal/colors-kitty.conf"; - - # Cursor - cursor_blink_interval = 0; # 0.5 - cursor_stop_blinking_after = 0; # 15 - - # Other - scrollback_pager = "less +G -R"; - wheel_scroll_multiplier = 5; - click_interval = "0.5"; - select_by_word_characters = ":@-./_~?&=%+#"; - mouse_hide_wait = 0; - enabled_layouts = "*"; - remember_window_size = false; - macos_option_as_alt = false; - allow_remote_control = true; - confirm_os_window_close = 0; - term = "xterm-kitty"; - - # Bell - visual_bell_duration = 0; - enable_audio_bell = false; - - # URL Handling - open_url_modifiers = "ctrl+shift"; - open_url_with = "default"; - }; - - extraConfig = '' - # Clipboard - map super+v paste_from_clipboard - map ctrl+shift+s paste_from_selection - map super+c copy_to_clipboard - map shift+insert paste_from_selection - - # Scrolling - map ctrl+shift+up scroll_line_up - map ctrl+shift+down scroll_line_down - map ctrl+shift+k scroll_line_up - map ctrl+shift+j scroll_line_down - map ctrl+shift+page_up scroll_page_up - map ctrl+shift+page_down scroll_page_down - map ctrl+shift+home scroll_home - map ctrl+shift+end scroll_end - map ctrl+shift+h show_scrollback - - # Window management - map super+n new_os_window - map super+w close_window - map ctrl+shift+enter new_window - map ctrl+shift+] next_window - map ctrl+shift+[ previous_window - map ctrl+shift+f move_window_forward - map ctrl+shift+b move_window_backward - map ctrl+shift+` move_window_to_top - map ctrl+shift+1 first_window - map ctrl+shift+2 second_window - map ctrl+shift+3 third_window - map ctrl+shift+4 fourth_window - map ctrl+shift+5 fifth_window - map ctrl+shift+6 sixth_window - map ctrl+shift+7 seventh_window - map ctrl+shift+8 eighth_window - map ctrl+shift+9 ninth_window - map ctrl+shift+0 tenth_window - - # Tab management - map ctrl+shift+right next_tab - map ctrl+shift+left previous_tab - map ctrl+shift+t new_tab - map ctrl+shift+q close_tab - map ctrl+shift+l next_layout - map ctrl+shift+. move_tab_forward - map ctrl+shift+, move_tab_backward - - # Miscellaneous - map ctrl+shift+up increase_font_size - map ctrl+shift+down decrease_font_size - map ctrl+shift+backspace restore_font_size - - map ctrl+/ launch --allow-remote-control kitty +kitten kitty_search/search.py @active-kitty-window-id - ''; - }; - - # read the file, but remove the line with shell_integration - # xdg.configFile."kitty/kitty.conf".text = - # builtins.map (line: if builtins.match "shell_integration" line then "" else line) (builtins.split "\n" (builtins.readFile ~/.config/kitty/kitty.conf)); -} diff --git a/home/ebisu/fortune/system/virtualisation/default.nix b/home/ebisu/fortune/system/virtualisation/default.nix index 85e082f..3352886 100644 --- a/home/ebisu/fortune/system/virtualisation/default.nix +++ b/home/ebisu/fortune/system/virtualisation/default.nix @@ -1,6 +1,6 @@ { pkgs, ... }: { - imports = [ ./docker ]; + imports = [ ./docker.nix ]; home.packages = with pkgs; [ bottles diff --git a/home/ebisu/fortune/system/virtualisation/docker.nix b/home/ebisu/fortune/system/virtualisation/docker.nix new file mode 100644 index 0000000..4d395ff --- /dev/null +++ b/home/ebisu/fortune/system/virtualisation/docker.nix @@ -0,0 +1,10 @@ +{ pkgs, ... }: +{ + home.packages = with pkgs; [ + act + earthly + dive + docker-buildx + docker-slim + ]; +} diff --git a/home/ebisu/fortune/system/virtualisation/docker/default.nix b/home/ebisu/fortune/system/virtualisation/docker/default.nix deleted file mode 100644 index 4d395ff..0000000 --- a/home/ebisu/fortune/system/virtualisation/docker/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ pkgs, ... }: -{ - home.packages = with pkgs; [ - act - earthly - dive - docker-buildx - docker-slim - ]; -} diff --git a/home/ebisu/fortune/utility/ai.nix b/home/ebisu/fortune/utility/ai.nix new file mode 100644 index 0000000..37b4e4d --- /dev/null +++ b/home/ebisu/fortune/utility/ai.nix @@ -0,0 +1,7 @@ +{ pkgs, ... }: +{ + home.packages = with pkgs; [ + ollama-cuda + shell-gpt + ]; +} diff --git a/home/ebisu/fortune/utility/ai/default.nix b/home/ebisu/fortune/utility/ai/default.nix deleted file mode 100644 index 2ac248a..0000000 --- a/home/ebisu/fortune/utility/ai/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ pkgs, ... }: -{ - home.packages = with pkgs; [ - ollama-cuda - shell-gpt - ]; - - # services.ollama = { - # enable = true; - # acceleration = "cuda"; - # }; -} diff --git a/home/ebisu/fortune/utility/default.nix b/home/ebisu/fortune/utility/default.nix index 4c5da73..adcd443 100644 --- a/home/ebisu/fortune/utility/default.nix +++ b/home/ebisu/fortune/utility/default.nix @@ -1,7 +1,6 @@ -{ pkgs, ... }: { - imports = [ - ./ai - ]; +{ pkgs, ... }: +{ + imports = [ ./ai.nix ]; home.packages = with pkgs; [ fontpreview diff --git a/modules/default.nix b/modules/default.nix index 1f34456..22b7854 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -8,13 +8,13 @@ ./datetime.nix ./networking.nix ./nix.nix + ./nixpkgs.nix ./security.nix ./users.nix ./virtualisation.nix ./xdg-portal.nix ]; - nixpkgs.config.allowUnfree = true; location.provider = "geoclue2"; system.autoUpgrade.enable = false; } diff --git a/modules/nixpkgs.nix b/modules/nixpkgs.nix new file mode 100644 index 0000000..206983c --- /dev/null +++ b/modules/nixpkgs.nix @@ -0,0 +1,6 @@ +{ + nixpkgs.config = { + cudaSupport = true; + allowUnfree = true; + }; +} diff --git a/modules/services/ollama.nix b/modules/services/ollama.nix new file mode 100644 index 0000000..2638d12 --- /dev/null +++ b/modules/services/ollama.nix @@ -0,0 +1,6 @@ +{ + services.ollama = { + enable = false; + acceleration = "cuda"; + }; +} -- cgit v1.2.3