undid all of the wrapper nonsense

modules/features/gotify-desktop/default.nix

@@ -1,5 +1,5 @@
 {
-  wrappers,
+inputs,
   moduleWithSystem,
   ...
 }: {
@@ -24,9 +24,9 @@
           	min_priority = 1
         '';
       in
-        wrappers.lib.wrapPackage ({...}: {
+        inputs.wrappers.lib.wrapPackage ({...}: {
           inherit pkgs;
-          package = inputs'.gotify-desktop.default;
+          package = inputs'.gotify-desktop.packages.default;
           flags = {
             "-c" = config-file;
           };

modules/features/hypr/default.nix

@@ -1,7 +1,7 @@
 {
-  wrappers,
   moduleWithSystem,
   self,
+	inputs,
   ...
 }: {
   flake.nixosModules.hyprland = moduleWithSystem ({
@@ -29,13 +29,14 @@
   perSystem = {
     pkgs,
     self',
+    system,
     inputs',
     ...
   }: {
     packages = {
       hyprland = inputs'.hyprland.packages.default.override {
         runtimePackages =
-          inputs'.hyprland.lib.defaultRuntimePkgs
+          inputs.hyprland.lib.defaultRuntimePkgs.${system}
           // {
             wpaperd = self'.packages.wpaperd;
             kitty = self'.packages.kitty;
@@ -58,7 +59,7 @@
           path = "${./wallpapers/topo3.png}"
         '';
       in
-        wrappers.lib.wrapPackage ({...}: {
+        inputs.wrappers.lib.wrapPackage ({...}: {
           inherit pkgs;
           package = pkgs.wpaperd;
           flags = {

modules/features/kitty/default.nix

@@ -1,5 +1,5 @@
 {
-  wrappers,
+  inputs,
   moduleWithSystem,
   ...
 }: {
@@ -20,7 +20,7 @@
         fontDirectories = [fira-mono];
       };
     in
-      wrappers.wrappers.kitty.wrap {
+      inputs.wrappers.wrappers.kitty.wrap {
         inherit pkgs;
         environment = {
           "FONTCONFIG_FILE" = "${fontsConf}";

modules/features/otter-launcher/default.nix

@@ -1,5 +1,5 @@
 {
-  wrappers,
+  inputs,
   moduleWithSystem,
   ...
 }: {
@@ -29,7 +29,7 @@
           ${extra-config}
         '';
       in
-        wrappers.lib.wrapPackage ({...}: {
+        inputs.wrappers.lib.wrapPackage ({...}: {
           inherit pkgs;
           package = inputs'.otter-launcher.packages.default;
           runtimePkgs = with pkgs; [

modules/system/theming/gtk.nix

@@ -8,9 +8,6 @@
     lib,
     ...
   }: let
-    modules = [
-      inputs.catppuccin.nixosModules.catppuccin
-    ];
   in {
     environment.systemPackages = with pkgs; [
       (catppuccin-gtk.override {
@@ -24,16 +21,6 @@
         accent = "mauve";
       })
     ];
-    imports = modules;
-    catppuccin = {
-      enable = true;
-      autoEnable = false;
-      accent = "mauve";
-      flavor = "mocha";
-      gtk = {
-        icon.enable = true;
-      };
-    };
     programs = {
       xfconf.enable = true;
       dconf = {