Revert "add global settings and import them"

This reverts commit f5763b39fe.

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];
           }
        ];

global/system-imports.nix

@@ -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
-    ];
-}

global/system-packages/sys.pkg-dev.nix

@@ -1,9 +0,0 @@
-{ pkgs, ... }:
-{
-  programs.zsh.enable = true;
-
-  environment.systemPackages =
-   (with pkgs; [
-    git
-    ]);
-}

global/system-settings/sys.set-boot.nix

@@ -1,6 +0,0 @@
-{ ... }:
-{
-  boot.initrd.verbose = false;
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-}

global/user-imports.nix

@@ -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
-  ];
-}

global/user-packages/usr.pkg-dev.nix

@@ -1,6 +0,0 @@
-{ ... }:
-{
-  programs.git = {
-   enable = true;
-  };
-}

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
     ];
 }

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
     ]);

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;

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
   ];
 }