Commit 40c4176cc401

@@ -1,9 +1,7 @@
 {
   imports = [
     ./config.nix
-    ./home-manager.nix
     ./nix.nix
-    ./nur.nix
     ./users.nix
   ];
 

@@ -1,17 +0,0 @@
-{ config, lib, ... }:
-
-with lib;
-let
-  cfg = config.core.home-manager;
-in
-{
-  options = {
-    core.home-manager = {
-      enable = mkOption { type = types.bool; default = true; description = "Enable core.home-manager"; };
-    };
-  };
-  config = mkIf cfg.enable {
-    home-manager.useUserPackages = true;
-    home-manager.useGlobalPkgs = true;
-  };
-}

@@ -1,20 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-let
-  cfg = config.core.nur;
-in
-{
-  options = {
-    core.nur = {
-      enable = mkOption { type = types.bool; default = true; description = "Enable core.nur"; };
-    };
-  };
-  config = mkIf cfg.enable {
-    nixpkgs.config = {
-      packageOverrides = pkgs: {
-        nur = (import ../../../nix).nur { inherit pkgs; };
-      };
-    };
-  };
-}

@@ -110,10 +110,9 @@
           buildkit
           # Common modules
           # FIXME: migrate this to elsewhere, or at least split it
-          ./systems/modules/core/config.nix
-          ./systems/modules/core/nix.nix
-          ./systems/modules/core/users.nix
-          ./systems/modules/hardware/sane-extra-config.nixos.nix
+          ./systems/modules/core/default.nix
+          ./systems/modules/hardware/default.nix
+          # ./systems/modules/hardware/sane-extra-config.nixos.nix
           ./systems/modules/profiles/avahi.nix
           ./systems/modules/profiles/base.nix
           ./systems/modules/profiles/builder.nix