From 4c562fc8c0ff485b293d0927820f0a23c7f86f42 Mon Sep 17 00:00:00 2001
From: twoneis <sanjay29@sapura.de>
Date: Mon, 13 Nov 2023 18:22:16 +0100
Subject: [PATCH] moved desktop to system instead of home scope

---
 devices/desktop/default.nix          | 2 --
 devices/surface/default.nix          | 2 --
 flake.nix                            | 3 +++
 modules/{home => }/gnome/default.nix | 2 +-
 modules/home/default.nix             | 1 -
 modules/system/default.nix           | 4 ++++
 6 files changed, 8 insertions(+), 6 deletions(-)
 rename modules/{home => }/gnome/default.nix (89%)

diff --git a/devices/desktop/default.nix b/devices/desktop/default.nix
index 1c76fb0..97acb10 100644
--- a/devices/desktop/default.nix
+++ b/devices/desktop/default.nix
@@ -1,7 +1,5 @@
 { config, ... }: {
   imports = [
-    ../../modules/system
-
     ./hardware-config.nix
   ];
 
diff --git a/devices/surface/default.nix b/devices/surface/default.nix
index 29944b5..b49a868 100644
--- a/devices/surface/default.nix
+++ b/devices/surface/default.nix
@@ -1,7 +1,5 @@
 { ... }: {
   imports = [
-    ../../modules/system
-
     ./hardware-config.nix
   ];
 
diff --git a/flake.nix b/flake.nix
index 773beea..810d68f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -15,12 +15,14 @@
   outputs = { nixpkgs, home-manager, ... }:
   let
     x86 = "x86_64-linux";
+    common = ./modules/system;
   in {
     nixosConfigurations = {
       desktop = nixpkgs.lib.nixosSystem {
         specialArgs = { inherit x86; };
 
         modules = [
+          common
           ./devices/desktop
 
           home-manager.nixosModules.home-manager {
@@ -37,6 +39,7 @@
         specialArgs = { inherit x86; };
 
         modules = [
+          common
           ./devices/surface
 
           home-manager.nixosModules.home-manager {
diff --git a/modules/home/gnome/default.nix b/modules/gnome/default.nix
similarity index 89%
rename from modules/home/gnome/default.nix
rename to modules/gnome/default.nix
index 31a60cf..fd069ff 100644
--- a/modules/home/gnome/default.nix
+++ b/modules/gnome/default.nix
@@ -6,7 +6,7 @@
   services.gnome.core-utilities.enable = false;
   environment.gnome.excludePackages = [ pkgs.gnome-tour ];
 
-  home.packages = with pkgs; [
+  environment.systemPackages = with pkgs; [
     gnomeExtensions.paperwm
     gnome.gnome-characters
   ];
diff --git a/modules/home/default.nix b/modules/home/default.nix
index 931220b..3e2f428 100644
--- a/modules/home/default.nix
+++ b/modules/home/default.nix
@@ -8,7 +8,6 @@
     ./email
     ./gdb
     ./git
-    ./gnome
     ./media
     ./terminal
     ./utils
diff --git a/modules/system/default.nix b/modules/system/default.nix
index c7d26d4..fbb813c 100644
--- a/modules/system/default.nix
+++ b/modules/system/default.nix
@@ -3,6 +3,10 @@
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
 { pkgs, ... }: {
+  imports = [
+    ../gnome
+  ];
+
   # Enable nix flakes
   nix.settings.experimental-features = [ "nix-command" "flakes" ];