split nixos from darwin

required because they don't share all attributes

darwin/utilities.nix

@@ -34,7 +34,7 @@ in {
       ipcalc # Make IP network calculations
       (mkScript {
         name = "ocr";
-        file = ../shell/bash/scripts/ocr.sh;
+        file = ../modules/shell/bash/scripts/ocr.sh;
         env = [ tesseract ];
       })
     ];

hosts/desktop/default.nix

@@ -7,6 +7,9 @@ nixpkgs.lib.nixosSystem {
   system = "x86_64-linux";
   specialArgs = { };
   modules = [
+    ./hardware-configuration.nix
+    ../../modules
+    ../../nixos
     globals
     home-manager.nixosModules.home-manager
     {
@@ -42,8 +45,5 @@ nixpkgs.lib.nixosSystem {
       nixlang.enable = true;
       dotfiles.enable = true;
     }
-
-    ./hardware-configuration.nix
-    ../../modules
   ];
 }

hosts/macbook/default.nix

@@ -8,6 +8,7 @@ darwin.lib.darwinSystem {
   specialArgs = { };
   modules = [
     ../../modules
+    ../../darwin
     (globals // {
       user = "Noah.Masur";
       gitName = "Noah-Masur_1701";
@@ -26,7 +27,6 @@ darwin.lib.darwinSystem {
       nixpkgs.overlays = [ firefox-darwin.overlay ] ++ overlays;
       # Set registry to flake packages, used for nix X commands
       nix.registry.nixpkgs.flake = nixpkgs;
-
       mail.aerc.enable = true;
       mail.himalaya.enable = true;
       kitty.enable = true;

hosts/oracle/default.nix

@@ -13,6 +13,7 @@ nixpkgs.lib.nixosSystem {
   modules = [
     ./hardware-configuration.nix
     ../../modules
+    ../../nixos
     (removeAttrs globals [ "mail.server" ])
     home-manager.nixosModules.home-manager
     {

hosts/wsl/default.nix

@@ -11,6 +11,7 @@ nixpkgs.lib.nixosSystem {
     wsl.nixosModules.wsl
     home-manager.nixosModules.home-manager
     ../../modules
+    ../../nixos
     {
       networking.hostName = "wsl";
       # Set registry to flake packages, used for nix X commands

modules/applications/default.nix

@@ -3,7 +3,6 @@
   imports = [
     ./1password.nix
     ./alacritty.nix
-    ./calibre.nix
     ./discord.nix
     ./firefox.nix
     ./kitty.nix

modules/default.nix

@@ -1,20 +1,7 @@
 { config, lib, pkgs, ... }: {
 
-  imports = [
-    ./applications
-    ./darwin
-    ./gaming
-    ./graphical
-    ./hardware
-    ./mail
-    ./neovim
-    ./nixos
-    ./programming
-    ./repositories
-    ./services
-    ./shell
-    ./wsl
-  ];
+  imports =
+    [ ./applications ./mail ./neovim ./programming ./repositories ./shell ];
 
   options = {
     user = lib.mkOption {

nixos/default.nix

@@ -0,0 +1,13 @@
+{ ... }: {
+
+  imports = [
+    ./applications
+    ./gaming
+    ./graphical
+    ./hardware
+    ./services
+    ./system
+    ./wsl
+  ];
+
+}