From ac41162a6e203842f6bbdb3a0d85319474794d00 Mon Sep 17 00:00:00 2001
From: biscuit <biscuit@nixos.com>
Date: Wed, 18 Jun 2025 12:25:27 -0500
Subject: [PATCH] terst

---
 modules/desktop/misc.nix |  1 +
 modules/misc.nix         |  9 --------
 pkgs/matugen/default.nix |  5 ++---
 system/default.nix       | 46 ++++++++++++++++++++++------------------
 4 files changed, 28 insertions(+), 33 deletions(-)
 delete mode 100644 modules/misc.nix

diff --git a/modules/desktop/misc.nix b/modules/desktop/misc.nix
index db14211..f223e2a 100644
--- a/modules/desktop/misc.nix
+++ b/modules/desktop/misc.nix
@@ -1,5 +1,6 @@
 {...}: {
   imports = [
     ../../pkgs/btop/default.nix
+    ../../pkgs/matugen/default.nix
   ];
 }
diff --git a/modules/misc.nix b/modules/misc.nix
deleted file mode 100644
index f50fbd7..0000000
--- a/modules/misc.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  pkgs,
-  inputs,
-  ...
-}: {
-  imports = [
-    ../pkgs/matugen/default.nix
-  ];
-}
diff --git a/pkgs/matugen/default.nix b/pkgs/matugen/default.nix
index 307328c..e4164a3 100644
--- a/pkgs/matugen/default.nix
+++ b/pkgs/matugen/default.nix
@@ -1,9 +1,8 @@
 {
   pkgs,
   inputs,
+  system,
   ...
 }: {
-  imports = [
-    inputs.matugen.packages.${pkgs.system}.default
-  ];
+  imports = [inputs.matugen.nixosModules.default];
 }
diff --git a/system/default.nix b/system/default.nix
index 968cb94..dfa441c 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -5,34 +5,38 @@
   touchpadSupport,
   ...
 }: {
-  environment.systemPackages = with pkgs; [
-    python3
-    python3Packages.pip
-    python3Packages.pygobject3
-    python3Packages.setuptools
-    python3Packages.wheel
+  environment.systemPackages = with pkgs;
+    [
+      python3
+      python3Packages.pip
+      python3Packages.pygobject3
+      python3Packages.setuptools
+      python3Packages.wheel
 
-    gobject-introspection
-    gtk3
-    libxml2
+      gobject-introspection
+      gtk3
+      libxml2
 
-    cargo
-    gcc
-    rustc
-    nodejs
-    yarn
+      cargo
+      gcc
+      rustc
+      nodejs
+      yarn
 
-    busybox
+      busybox
 
-    p7zip
+      p7zip
 
-    btop
-    tldr
+      btop
+      tldr
 
-    jq
+      jq
 
-    solaar
-  ];
+      solaar
+    ]
+    ++ [
+      inputs.matugen.packages.${pkgs.system}.default
+    ];
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;