From d6c2be09f737805616b42c7ac6d9f068c9744faa Mon Sep 17 00:00:00 2001
From: Aly Raffauf <alyraffauf@gmail.com>
Date: Tue, 12 Mar 2024 22:25:47 -0400
Subject: [PATCH] moved user and system modules to host files

---
 desktop/gnome/default.nix   | 4 ----
 flake.nix                   | 8 +-------
 hosts/lavaridge/default.nix | 2 ++
 hosts/mauville/default.nix  | 2 ++
 hosts/petalburg/default.nix | 2 ++
 hosts/rustboro/default.nix  | 2 ++
 6 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/desktop/gnome/default.nix b/desktop/gnome/default.nix
index 2ea4f454..8c8b47eb 100644
--- a/desktop/gnome/default.nix
+++ b/desktop/gnome/default.nix
@@ -22,10 +22,6 @@
     # pkgs.libsForQt5.kwalletmanager
   ];
 
-  services.flatpak.packages = [
-    "com.github.tchx84.Flatseal"
-  ];
-
   # Prefer baset set of gnome apps from Flatpaks.
   # environment.gnome.excludePackages = (with pkgs; [
   #   baobab
diff --git a/flake.nix b/flake.nix
index 1a6e344d..ffe98e0c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -34,7 +34,7 @@
     
     # Pre-baked hardware support for various devices.
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
-  };
+  };<nixos-hardware/framework/13-inch/7040-amd>
 
   outputs = inputs@{ nixpkgs, home-manager, nixpkgs-unstable, home-manager-unstable, nix-flatpak, nixos-hardware, ... }: {
 
@@ -45,8 +45,6 @@
         system = "x86_64-linux";
         modules = [
           ./hosts/rustboro
-          ./system
-          ./users/aly
           ./desktop/kde
 
           # Add managed flatpak module.
@@ -69,8 +67,6 @@
         system = "x86_64-linux";
         modules = [
           ./hosts/petalburg
-          ./system
-          ./users/aly
           ./desktop/gnome
 
           # Add managed flatpak module.
@@ -92,8 +88,6 @@
         system = "x86_64-linux";
         modules = [
           ./hosts/mauville
-          ./system
-          ./users/aly
           ./desktop/gnome
           ./modules/homelab
           ./modules/steam
diff --git a/hosts/lavaridge/default.nix b/hosts/lavaridge/default.nix
index 5421d99e..8123f2be 100644
--- a/hosts/lavaridge/default.nix
+++ b/hosts/lavaridge/default.nix
@@ -6,6 +6,8 @@
   imports =
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
+      ../../users/aly
+      ../../system
     ];
 
   # Bootloader.
diff --git a/hosts/mauville/default.nix b/hosts/mauville/default.nix
index 802cbebc..27c6f3ce 100644
--- a/hosts/mauville/default.nix
+++ b/hosts/mauville/default.nix
@@ -6,6 +6,8 @@
   imports =
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
+      ../../users/aly
+      ../../system
     ];
 
   # Bootloader.
diff --git a/hosts/petalburg/default.nix b/hosts/petalburg/default.nix
index 2863dc22..0536c3a9 100644
--- a/hosts/petalburg/default.nix
+++ b/hosts/petalburg/default.nix
@@ -43,6 +43,8 @@ in {
   imports =
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
+      ../../users/aly
+      ../../system
     ];
 
   # Bootloader.
diff --git a/hosts/rustboro/default.nix b/hosts/rustboro/default.nix
index 1b5ae22b..f5e62a99 100644
--- a/hosts/rustboro/default.nix
+++ b/hosts/rustboro/default.nix
@@ -6,6 +6,8 @@
   imports =
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
+      ../../users/aly
+      ../../system
     ];
 
   # Bootloader.