From 97fa1e39b4aaa3f7d0d9c9a7f5419c8443a026c5 Mon Sep 17 00:00:00 2001
From: "Mohamed C." <mohamed@chrayed.de>
Date: Sat, 10 Aug 2024 16:56:25 +0200
Subject: [PATCH] Revert "add global settings and import them"

This reverts commit f5763b39fed2a74dfd9f2392235baae54d949113.
---
 flake.nix                                        |  6 +-----
 global/system-imports.nix                        | 16 ----------------
 global/system-packages/sys.pkg-dev.nix           |  9 ---------
 global/system-settings/sys.set-boot.nix          |  6 ------
 global/user-imports.nix                          | 11 -----------
 global/user-packages/usr.pkg-dev.nix             |  6 ------
 hosts/computer-mo/system-imports.nix             |  6 ++++++
 .../computer-mo/system-packages/sys.pkg-dev.nix  |  3 +++
 .../computer-mo/system-settings/sys.set-boot.nix |  3 +++
 .../computer-mo}/system-settings/sys.set-dev.nix |  0
 .../system-settings/sys.set-locale.nix           |  0
 .../system-settings/sys.set-networking.nix       |  0
 .../system-settings/sys.set-system.nix           |  0
 .../system-settings/sys.set-updates.nix          |  0
 .../system-settings/sys.set-users.nix            |  0
 hosts/computer-mo/user-imports.nix               |  6 ++++--
 .../computer-mo}/user-settings/usr.set-dev.nix   |  0
 .../user-settings/usr.set-system.nix             |  0
 18 files changed, 17 insertions(+), 55 deletions(-)
 delete mode 100644 global/system-imports.nix
 delete mode 100644 global/system-packages/sys.pkg-dev.nix
 delete mode 100644 global/system-settings/sys.set-boot.nix
 delete mode 100644 global/user-imports.nix
 delete mode 100644 global/user-packages/usr.pkg-dev.nix
 rename {global => hosts/computer-mo}/system-settings/sys.set-dev.nix (100%)
 rename {global => hosts/computer-mo}/system-settings/sys.set-locale.nix (100%)
 rename {global => hosts/computer-mo}/system-settings/sys.set-networking.nix (100%)
 rename {global => hosts/computer-mo}/system-settings/sys.set-system.nix (100%)
 rename {global => hosts/computer-mo}/system-settings/sys.set-updates.nix (100%)
 rename {global => hosts/computer-mo}/system-settings/sys.set-users.nix (100%)
 rename {global => hosts/computer-mo}/user-settings/usr.set-dev.nix (100%)
 rename {global => hosts/computer-mo}/user-settings/usr.set-system.nix (100%)

diff --git a/flake.nix b/flake.nix
index 7538eb8..63d5964 100644
--- a/flake.nix
+++ b/flake.nix
@@ -26,7 +26,6 @@
        specialArgs = {inherit user host;};
        modules = [
           ./hosts/${host}/system-imports.nix
-          ./global/system-imports.nix
           jovian.nixosModules.jovian
           home-manager.nixosModules.home-manager
           {
@@ -34,10 +33,7 @@
             home-manager.useUserPackages = true;
             home-manager.backupFileExtension = "backup";
             home-manager.extraSpecialArgs = {inherit pkgs;};
-            home-manager.users.${user}.imports = [
-                                  ./hosts/${host}/user-imports.nix
-                                  ./global/user-imports.nix
-                                  ];
+            home-manager.users.${user}.imports = [./hosts/${host}/user-imports.nix];
             home-manager.sharedModules = [ plasma-manager.homeManagerModules.plasma-manager];
           }
        ];
diff --git a/global/system-imports.nix b/global/system-imports.nix
deleted file mode 100644
index 27bfa91..0000000
--- a/global/system-imports.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ ... }:
-{
-  imports =
-    [ 
-      # Packages
-      ./system-packages/sys.pkg-dev.nix
-      # Settings
-      ./system-settings/sys.set-boot.nix
-      ./system-settings/sys.set-dev.nix
-      ./system-settings/sys.set-locale.nix
-      ./system-settings/sys.set-networking.nix
-      ./system-settings/sys.set-system.nix
-      ./system-settings/sys.set-updates.nix
-      ./system-settings/sys.set-users.nix
-    ];
-}
diff --git a/global/system-packages/sys.pkg-dev.nix b/global/system-packages/sys.pkg-dev.nix
deleted file mode 100644
index db04665..0000000
--- a/global/system-packages/sys.pkg-dev.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ pkgs, ... }:
-{
-  programs.zsh.enable = true;
-
-  environment.systemPackages =
-   (with pkgs; [
-    git
-    ]);
-}
diff --git a/global/system-settings/sys.set-boot.nix b/global/system-settings/sys.set-boot.nix
deleted file mode 100644
index 6613bca..0000000
--- a/global/system-settings/sys.set-boot.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ ... }:
-{
-  boot.initrd.verbose = false;
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-}
diff --git a/global/user-imports.nix b/global/user-imports.nix
deleted file mode 100644
index 03b7a08..0000000
--- a/global/user-imports.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ ... }:
-
-{
-  imports = [
-   # Home-Manager Packages
-   ./user-packages/usr.pkg-dev.nix
-   # Home-Manager Settings
-   ./user-settings/usr.set-dev.nix
-   ./user-settings/usr.set-system.nix
-  ];
-}
diff --git a/global/user-packages/usr.pkg-dev.nix b/global/user-packages/usr.pkg-dev.nix
deleted file mode 100644
index b4cf876..0000000
--- a/global/user-packages/usr.pkg-dev.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ ... }:
-{
-  programs.git = {
-   enable = true;
-  };
-}
diff --git a/hosts/computer-mo/system-imports.nix b/hosts/computer-mo/system-imports.nix
index 5b86536..4feb818 100644
--- a/hosts/computer-mo/system-imports.nix
+++ b/hosts/computer-mo/system-imports.nix
@@ -17,9 +17,15 @@
       ./system-settings/sys.set-boot.nix
       ./system-settings/sys.set-controller.nix
       ./system-settings/sys.set-desktop.nix
+      ./system-settings/sys.set-dev.nix
       ./system-settings/sys.set-filesystems.nix
       ./system-settings/sys.set-hardware.nix
+      ./system-settings/sys.set-locale.nix
+      ./system-settings/sys.set-networking.nix
       ./system-settings/sys.set-steam.nix
+      ./system-settings/sys.set-system.nix
       ./system-settings/sys.set-systemd.nix
+      ./system-settings/sys.set-updates.nix
+      ./system-settings/sys.set-users.nix
     ];
 }
diff --git a/hosts/computer-mo/system-packages/sys.pkg-dev.nix b/hosts/computer-mo/system-packages/sys.pkg-dev.nix
index 0ccd73a..1cae7c5 100644
--- a/hosts/computer-mo/system-packages/sys.pkg-dev.nix
+++ b/hosts/computer-mo/system-packages/sys.pkg-dev.nix
@@ -1,8 +1,11 @@
 { pkgs, ... }:
 {
+  programs.zsh.enable = true;
+
   environment.systemPackages =
    (with pkgs; [
     kdePackages.kate
+    git
     nil
     yaml-language-server
     ]);
diff --git a/hosts/computer-mo/system-settings/sys.set-boot.nix b/hosts/computer-mo/system-settings/sys.set-boot.nix
index ccb99ca..cb8fbc6 100644
--- a/hosts/computer-mo/system-settings/sys.set-boot.nix
+++ b/hosts/computer-mo/system-settings/sys.set-boot.nix
@@ -2,8 +2,11 @@
 {
   boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
   boot.initrd.kernelModules = [ ];
+  boot.initrd.verbose = false;
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
   boot.plymouth.enable = true;
   boot.plymouth.theme = "bgrt";
   boot.consoleLogLevel = 0;
diff --git a/global/system-settings/sys.set-dev.nix b/hosts/computer-mo/system-settings/sys.set-dev.nix
similarity index 100%
rename from global/system-settings/sys.set-dev.nix
rename to hosts/computer-mo/system-settings/sys.set-dev.nix
diff --git a/global/system-settings/sys.set-locale.nix b/hosts/computer-mo/system-settings/sys.set-locale.nix
similarity index 100%
rename from global/system-settings/sys.set-locale.nix
rename to hosts/computer-mo/system-settings/sys.set-locale.nix
diff --git a/global/system-settings/sys.set-networking.nix b/hosts/computer-mo/system-settings/sys.set-networking.nix
similarity index 100%
rename from global/system-settings/sys.set-networking.nix
rename to hosts/computer-mo/system-settings/sys.set-networking.nix
diff --git a/global/system-settings/sys.set-system.nix b/hosts/computer-mo/system-settings/sys.set-system.nix
similarity index 100%
rename from global/system-settings/sys.set-system.nix
rename to hosts/computer-mo/system-settings/sys.set-system.nix
diff --git a/global/system-settings/sys.set-updates.nix b/hosts/computer-mo/system-settings/sys.set-updates.nix
similarity index 100%
rename from global/system-settings/sys.set-updates.nix
rename to hosts/computer-mo/system-settings/sys.set-updates.nix
diff --git a/global/system-settings/sys.set-users.nix b/hosts/computer-mo/system-settings/sys.set-users.nix
similarity index 100%
rename from global/system-settings/sys.set-users.nix
rename to hosts/computer-mo/system-settings/sys.set-users.nix
diff --git a/hosts/computer-mo/user-imports.nix b/hosts/computer-mo/user-imports.nix
index f973bc9..8579a10 100644
--- a/hosts/computer-mo/user-imports.nix
+++ b/hosts/computer-mo/user-imports.nix
@@ -6,8 +6,10 @@
    ./user-packages/usr.pkg-dev.nix
    ./user-packages/usr.pkg-desktop.nix
    # Home-Manager Settings
-   ./user-settings/usr.set-customization.nix
-   ./user-settings/usr.set-desktop.nix
    ./user-settings/usr.set-dotfiles.nix
+   ./user-settings/usr.set-customization.nix
+   ./user-settings/usr.set-dev.nix
+   ./user-settings/usr.set-desktop.nix
+   ./user-settings/usr.set-system.nix
   ];
 }
diff --git a/global/user-settings/usr.set-dev.nix b/hosts/computer-mo/user-settings/usr.set-dev.nix
similarity index 100%
rename from global/user-settings/usr.set-dev.nix
rename to hosts/computer-mo/user-settings/usr.set-dev.nix
diff --git a/global/user-settings/usr.set-system.nix b/hosts/computer-mo/user-settings/usr.set-system.nix
similarity index 100%
rename from global/user-settings/usr.set-system.nix
rename to hosts/computer-mo/user-settings/usr.set-system.nix