apps/default.nix

@@ -12,7 +12,6 @@
     ./gpg.nix
     ./git.nix
     ./go.nix
-    ./gtk.nix
     ./helix.nix
     ./jq.nix
     ./nushell.nix

apps/gtk.nix

@@ -1,55 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}: {
-  home.pointerCursor = {
-    name = "catppuccin-cursors";
-    package = pkgs.catppuccin-cursors.mochaLavender;
-    size = 24;
-  };
-  gtk = {
-    enable = true;
-    iconTheme = {
-      name = "Papirus-Dark";
-      package = pkgs.catppuccin-papirus-folders.override {
-        flavor = "mocha";
-        accent = "lavender";
-      };
-    };
-    theme = {
-      name = "Catppuccin-Mocha-Compact-Lavender-Dark";
-      package = pkgs.catppuccin-gtk.override {
-        accents = ["lavender"];
-        variant = "mocha";
-        size = "compact";
-      };
-    };
-    gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc";
-    gtk2.extraConfig = ''
-      gtk-xft-antialias=1
-      gtk-xft-hinting=1
-      gtk-xft-hintstyle="hintslight"
-      gtk-xft-rgba="rgb"
-    '';
-    gtk3.extraConfig = {
-      gtk-xft-antialias = 1;
-      gtk-xft-hinting = 1;
-      gtk-xft-hintstyle = "hintslight";
-      gtk-xft-rgba = "rgb";
-    };
-  };
-
-  xdg = let
-    themeDir = "${config.gtk.theme.package}/share/themes/${config.gtk.theme.name}";
-  in
-    lib.mkIf config.gtk.enable {
-      configFile."gtk-4.0/assets" = {
-        source = "${themeDir}/gtk-4.0/assets";
-        recursive = true;
-      };
-      configFile."gtk-4.0/gtk.css".source = "${themeDir}/gtk-4.0/gtk.css";
-      configFile."gtk-4.0/gtk-dark.css".source = "${themeDir}/gtk-4.0/gtk-dark.css";
-    };
-}

flake.nix

@@ -37,12 +37,7 @@
       config,
       pkgs,
       ...
-    }: let
-      userSecret = path: {
-        file = path;
-        owner = username;
-      };
-    in {
+    }: {
       config = {
         nixpkgs.overlays = [overlays];
         home-manager = {
@@ -54,9 +49,18 @@
           };
         };
         age.secrets = {
-          ssh-config = userSecret ./secrets/shared/ssh-config.age;
-          ssh-config-work = userSecret ./secrets/shared/ssh-config-work.age;
-          spotify-pw = userSecret ./secrets/shared/spotify-pw.age;
+          ssh-config = {
+            file = ./secrets/shared/ssh-config.age;
+            owner = username;
+          };
+          ssh-config-work = {
+            file = ./secrets/shared/ssh-config-work.age;
+            owner = username;
+          };
+          spotify-pw = {
+            file = ./secrets/shared/spotify-pw.age;
+            owner = username;
+          };
         };
       };
     };