refactor: overlays

flake.nix

@@ -7,21 +7,7 @@
     ...
   } @ inputs: let
     inherit (import ./machines/lib.nix {inherit inputs overlays;}) mkSystems;
-    overlays = [
+    overlays = import ./pkgs/overlays.nix {inherit inputs;};
-      (final: prev: {
-        nur = import inputs.nur {
-          nurpkgs = prev;
-          pkgs = prev;
-          repoOverrides = {
-            caarlos0 = inputs.caarlos0-nur.packages.${prev.system};
-            nekowinston = inputs.nekowinston-nur.packages.${prev.system};
-          };
-        };
-        nekowinston-nur = import inputs.nekowinston-nur {inherit (prev) pkgs;};
-        sway-unwrapped = inputs.swayfx.packages.${prev.system}.default;
-      })
-      inputs.nix-vscode-extensions.overlays.default
-    ];
   in
     flake-parts.lib.mkFlake {inherit self inputs;}
     {

home/apps/browsers.nix

@@ -156,7 +156,7 @@ in {
     };
 
     home.packages = lib.mkIf isLinux [
-      pkgs.nekowinston-nur.sizzy
+      pkgs.nur.repos.nekowinston.sizzy
     ];
 
     xdg.mimeApps.defaultApplications = {

home/default.nix

@@ -24,7 +24,6 @@ in {
         imagemagick
         just
         mdcat
-        mosh
         nix-output-monitor
         nur.repos.nekowinston.icat
         nvd
@@ -36,7 +35,7 @@ in {
       ]
       ++ lib.optionals (config.isGraphical && isLinux) [
         _1password-gui
-        nekowinston-nur.uhk-agent
+        nur.repos.nekowinston.uhk-agent
       ]);
     sessionVariables = lib.mkIf isDarwin {
       SSH_AUTH_SOCK = "${config.programs.gpg.homedir}/S.gpg-agent.ssh";

pkgs/catppuccin-gtk.nix

@@ -5,7 +5,9 @@
   lightFlavor ? "latte",
   darkFlavor ? "mocha",
 }: let
-  capitalize = s: (pkgs.lib.toUpper (builtins.substring 0 1 s)) + (builtins.substring 1 (builtins.stringLength s) s);
+  inherit (builtins) substring stringLength;
+  inherit (pkgs) lib;
+  capitalize = s: (lib.toUpper (substring 0 1 s)) + (substring 1 (stringLength s) s);
   darkName = capitalize darkFlavor;
   lightName = capitalize lightFlavor;
 in

pkgs/overlays.nix

@@ -0,0 +1,23 @@
+{inputs}: [
+  inputs.swayfx.overlays.default
+  inputs.nix-vscode-extensions.overlays.default
+  (final: prev: {
+    nur = import inputs.nur {
+      nurpkgs = prev;
+      pkgs = prev;
+      repoOverrides = {
+        nekowinston = import inputs.nekowinston-nur {inherit (prev) pkgs;};
+        caarlos0 = import inputs.caarlos0-nur {
+          inherit (prev) pkgs;
+          overlays = [
+            (final: prev: {
+              discord-applemusic-rich-presence = prev.discord-applemusic-rich-presence.overrideAttrs {
+                patches = [./patches/discord-applemusic-rich-presence.patch];
+              };
+            })
+          ];
+        };
+      };
+    };
+  })
+]

pkgs/patches/discord-applemusic-rich-presence.patch

@@ -0,0 +1,13 @@
+diff --git a/main.go b/main.go
+index a46575c..e9272d5 100644
+--- a/main.go
++++ b/main.go
+@@ -21,7 +21,7 @@ const statePlaying = "playing"
+
+ var (
+  shortSleep    = 5 * time.Second
+-	longSleep     = time.Minute
++	longSleep     = shortSleep
+  songCache     = ttlcache.New(time.Minute)
+  artworkCache  = ttlcache.New(time.Minute)
+  shareURLCache = ttlcache.New(time.Minute)