Moved services under modules folder, start of core module and modularization

README.md

···
 ## Module Structure
 - Home -- Home-manager module configuration
 - Hosts -- Host configuration
-- Services -- Services (mostly NixOS modules)
+- Modules -- NixOS module configuration
 - Users -- User configuration
 
 This flake is a work in progress. It is not super modular, does not follow best practices,

configuration.nix

···
     kernelPackages = pkgs.linuxPackages_latest;
   };
 
-  nix = {
-    gc = {
-      automatic = true;
-      dates = "weekly";
-      options = "--delete-older-than 1w";
-    };
-
-    settings = {
-      experimental-features = [
-        "nix-command"
-        "flakes"
-      ];
-      auto-optimise-store = true;
-    };
-  };
-
   services.displayManager.gdm.enable = true;
   services.desktopManager = {
     gnome.enable = true;
···
     useXkbConfig = true;
   };
 
-  i18n.defaultLocale = "en_US.UTF-8";
   networking.networkmanager.enable = true;
   users.users.root.hashedPassword = "$6$rounds=4096$96V6gRPM96ADrBZr$2BOE2hC7Kx3XF3z32HNYp7zjsiAcJ2BynpGlWqdPupY3Mxfcy1aDlxdyx6HixriYuuhiTV4XSgObBASKZjNmF/";
   environment.systemPackages = with pkgs; [
···
     };
   };
 
-  time.timeZone = "America/Los_Angeles";
   users.users = {
     "freyja" = {
       isNormalUser = true;
···
       shell = pkgs.nushell;
     };
   };
-  system.stateVersion = "25.11";
   zramSwap.enable = true;
 }

flake.nix

···
       ...
     }@inputs:
     {
-      nixosConfigurations.bobcat =
-        let
-          username = "freyja";
-          specialArgs = { inherit username; };
-          hostname = "bobcat";
-        in
-        nixpkgs.lib.nixosSystem {
-          system = "x86_64-linux";
-          specialArgs = {
-            inherit inputs;
+      nixosConfigurations = {
+        bobcat =
+          let
+            username = "freyja";
+            specialArgs = { inherit username; };
+            hostname = "bobcat";
+          in
+          nixpkgs.lib.nixosSystem {
+            system = "x86_64-linux";
+            specialArgs = {
+              inherit inputs;
+            };
+            modules = [
+              ./configuration.nix
+              stylix.nixosModules.stylix
+              nixos-hardware.nixosModules.lenovo-thinkpad-x280
+              ./hosts/${hostname}/hardware-configuration.nix
+              ./modules
+              home-manager.nixosModules.home-manager
+              {
+                home-manager.useGlobalPkgs = true;
+                home-manager.useUserPackages = true;
+                home-manager.extraSpecialArgs = inputs // specialArgs;
+                home-manager.users.${username} = ./users/${username}/home.nix;
+                nixpkgs = {
+                  config.allowUnfree = true;
+                };
+              }
+            ];
           };
-          modules = [
-            ./configuration.nix
-            stylix.nixosModules.stylix
-            nixos-hardware.nixosModules.lenovo-thinkpad-x280
-            ./hosts/${hostname}/hardware-configuration.nix
-            ./services
-            home-manager.nixosModules.home-manager
-            {
-              home-manager.useGlobalPkgs = true;
-              home-manager.useUserPackages = true;
-              home-manager.extraSpecialArgs = inputs // specialArgs;
-              home-manager.users.${username} = ./users/${username}/home.nix;
-              nixpkgs = {
-                config.allowUnfree = true;
-              };
-            }
-          ];
-        };
+      };
     };
 }

modules/core.nix

···
+{ lib, ... }:
+
+{
+  system.stateVersion = "25.11";
+
+  time.timeZone = lib.mkDefault "America/Los_Angeles";
+
+  i18n.defaultLocale = lib.mkDefault "en_US.UTF-8";
+
+  nixpkgs.config.allowUnfree = lib.mkDefault true;
+
+  nix = {
+    gc = {
+      automatic = true;
+      dates = "weekly";
+      options = "--delete-older-than 1w";
+    };
+
+    settings = {
+      experimental-features = [
+        "nix-command"
+        "flakes"
+      ];
+      auto-optimise-store = true;
+    };
+  };
+}

modules/default.nix

···
+{
+  imports = [
+    ./services
+    ./core.nix
+  ];
+}