Common/atuin: bring back pre 18.4 behaviour

roles/common/programs/atuin.nix

@@ -5,6 +5,7 @@
       enter_accept = true;
       workspaces = true;
       style = "auto";
+      inline_height = 0;
       stats = {
         common_prefix = [
           "sudo"

roles/desktop/programs/discord.nix

@@ -8,8 +8,66 @@
 in {
   nixpkgs.overlays = [discordOverlay];
   home-manager.users.toast = {
-    home.packages = with pkgs; [
-      vesktop
-    ];
+    programs.vesktop = {
+      enable = true;
+      settings = {
+        arRPC = true;
+        minimizeToTray = true;
+        discordBranch = "stable";
+        customTitleBar = true;
+        spellCheckLanguages = ["en-US" "en" "es"];
+        enableMenu = false;
+      };
+      vencord = {
+        settings = {
+          enabledThemes = ["catpuccin-mocha.css"];
+          plugins = {
+            BetterGifPicker.enabled = true;
+            BetterSettings.enabled = true;
+            CallTimer.enabled = true;
+            ClearURLs.enabled = true;
+            FakeNitro.enabled = true;
+            FixSpotifyEmbeds.enabled = true;
+            FixYoutubeEmbeds.enabled = true;
+            FriendsSince.enabled = true;
+            iLoveSpam.enabled = true;
+            LoadingQuotes = {
+              enabled = true;
+              enableDiscordPresetQuotes = true;
+            };
+            MessageClickActions.enabled = true;
+            MessageLinkEmbeds.enabled = true;
+            MessageLogger.enabled = true;
+            Moyai = {
+              enabled = true;
+              volume = 1;
+              quality = "HD";
+            };
+            OpenInApp.enabled = true;
+            petpet.enabled = true;
+            PlatformIndicators.enabled = true;
+            ShowHiddenChannels.enabled = true;
+            ShowHiddenThings.enabled = true;
+            SpotifyControls.enabled = true;
+            YoutubeAdblock.enabled = true;
+          };
+        };
+        themes = {
+          "catpuccin-mocha" = ''
+            /**
+              * @name Catppuccin Mocha
+              * @author winston#0001
+              * @authorId 505490445468696576
+              * @version 0.2.0
+              * @description 🎮 Soothing pastel theme for Discord
+              * @website https://github.com/catppuccin/discord
+              * @invite r6Mdz5dpFc
+              * **/
+
+            @import url("https://catppuccin.github.io/discord/dist/catppuccin-mocha.theme.css");
+          '';
+        };
+      };
+    };
   };
 }

roles/desktop/programs/keepassxc.nix

@@ -1,40 +1,32 @@
-{lib, ...}: let
-  kpxcSettings = lib.generators.toINI {} {
-    General = {
-      # Not sure what changing this does, I'll leave it alone
-      ConfigVersion = 2;
-      MinimizeAfterUnlock = true;
-      AutoSaveAfterEveryChange = false;
-    };
-    GUI = {
-      ApplicationTheme = "classic";
-      MinimizeOnStartup = false;
-      MinimizeOnClose = true;
-      MinimizeToTray = true;
-      ShowTrayIcon = true;
-      # 0 is icons, 1 is text, 2 is text next to icons, 3 is text under icons, and 4 is follow style
-      ToolButtonStyle = 0; # Would choose 4 but it's too big for a small window
-      # monochrome-light, monochrome-dark or colorful
-      TrayIconAppearance = "monochrome-light";
-    };
-    Security = {
-      HideNotes = true;
-      IconDownloadFallback = true;
-    };
-    SSHAgent.Enabled = true;
-  };
-in {
+{pkgs, ...}: {
   home-manager = {
-    extraSpecialArgs = {kpxcSettings = kpxcSettings;};
     users.toast = {
-      pkgs,
-      kpxcSettings,
-      ...
-    }: {
-      # No module for KeePassXC config :(
-      home = {
-        packages = [pkgs.keepassxc];
-        file.".config/keepassxc/keepassxc.ini".text = kpxcSettings;
+      programs.keepassxc = {
+        enable = true;
+        settings = {
+          General = {
+            # Not sure what changing this does, I'll leave it alone
+            ConfigVersion = 2;
+            MinimizeAfterUnlock = true;
+            AutoSaveAfterEveryChange = false;
+          };
+          GUI = {
+            ApplicationTheme = "classic";
+            MinimizeOnStartup = false;
+            MinimizeOnClose = true;
+            MinimizeToTray = true;
+            ShowTrayIcon = true;
+            # 0 is icons, 1 is text, 2 is text next to icons, 3 is text under icons, and 4 is follow style
+            ToolButtonStyle = 0; # Would choose 4 but it's too big for a small window
+            # monochrome-light, monochrome-dark or colorful
+            TrayIconAppearance = "monochrome-light";
+          };
+          Security = {
+            HideNotes = true;
+            IconDownloadFallback = true;
+          };
+          SSHAgent.Enabled = true;
+        };
       };
       xdg.autostart.entries = [
         "${pkgs.keepassxc}/share/applications/org.keepassxc.KeePassXC.desktop"