diff --git a/hosts/hl-minipc1.nix b/hosts/hl-minipc1.nix index 30be545..4bc47a5 100644 --- a/hosts/hl-minipc1.nix +++ b/hosts/hl-minipc1.nix @@ -21,7 +21,7 @@ options = [ "nofail" ]; }; # Services - homelab.services.audiobookshelf = { + skg.homelab.services.audiobookshelf = { enable = true; host = "0.0.0.0"; openFirewall = true; diff --git a/hosts/hl-minipc2.nix b/hosts/hl-minipc2.nix index 0a17591..ed20ebf 100644 --- a/hosts/hl-minipc2.nix +++ b/hosts/hl-minipc2.nix @@ -9,7 +9,7 @@ boot.loader.efi.canTouchEfiVariables = true; # Special udev rule for google's coral tpu - homelab.udevrules.coraltpu.enable = true; + skg.homelab.udevrules.coraltpu.enable = true; # Containers virtualisation.oci-containers = { diff --git a/modules/main.nix b/modules/main.nix index cf26f83..15fc0ab 100644 --- a/modules/main.nix +++ b/modules/main.nix @@ -18,8 +18,7 @@ { pkgs, ... }: { imports = [ (import ./skyg) - (import ./hl-services) - (import ./hl-hardware) + (import ./nixos) ] ++ (if desktop.enable then [ (import ./desktop ({ user = user; } // desktop)) ] else diff --git a/modules/nixos/common/default.nix b/modules/nixos/common/default.nix new file mode 100644 index 0000000..1b7d70b --- /dev/null +++ b/modules/nixos/common/default.nix @@ -0,0 +1,6 @@ +{ ... }: +{ + imports = [ + ./hardware + ]; +} diff --git a/modules/hl-hardware/default.nix b/modules/nixos/common/hardware/default.nix similarity index 100% rename from modules/hl-hardware/default.nix rename to modules/nixos/common/hardware/default.nix diff --git a/modules/hl-hardware/fan2go.nix b/modules/nixos/common/hardware/fan2go.nix similarity index 95% rename from modules/hl-hardware/fan2go.nix rename to modules/nixos/common/hardware/fan2go.nix index 9964170..57c6d42 100644 --- a/modules/hl-hardware/fan2go.nix +++ b/modules/nixos/common/hardware/fan2go.nix @@ -5,7 +5,7 @@ , ... }: let - cfg = config.homelab.hardware.fan2go; + cfg = config.skyg.hardware.fan2go; fan2goConfig = pkgs.writeText "fan2go.yaml" '' dbPath: ${cfg.dbPath} @@ -65,7 +65,7 @@ let ''; in { - options.homelab.hardware.fan2go = with lib; { + options.skyg.hardware.fan2go = with lib; { enable = mkEnableOption "fan2go"; dbPath = mkOption { diff --git a/modules/hl-hardware/fancontrol.nix b/modules/nixos/common/hardware/fancontrol.nix similarity index 85% rename from modules/hl-hardware/fancontrol.nix rename to modules/nixos/common/hardware/fancontrol.nix index 37b4a24..a3bbe06 100644 --- a/modules/hl-hardware/fancontrol.nix +++ b/modules/nixos/common/hardware/fancontrol.nix @@ -4,10 +4,10 @@ , ... }: let - cfg = config.homelab.hardware.fancontrol; + cfg = config.skyg.hardware.fancontrol; in { - options.homelab.hardware.fancontrol = with lib; { + options.skyg.hardware.fancontrol = with lib; { enable = mkEnableOption "fancontrol"; configName = mkOption { type = types.str; diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix new file mode 100644 index 0000000..e998ce2 --- /dev/null +++ b/modules/nixos/default.nix @@ -0,0 +1,7 @@ +{ ... }: +{ + imports = [ + ./common + ./server + ]; +} diff --git a/modules/nixos/desktop/default.nix b/modules/nixos/desktop/default.nix new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/modules/nixos/desktop/default.nix @@ -0,0 +1 @@ + diff --git a/modules/hl-services/audiobookshelf.nix b/modules/nixos/server/audiobookshelf.nix similarity index 96% rename from modules/hl-services/audiobookshelf.nix rename to modules/nixos/server/audiobookshelf.nix index cf9d9e5..755ea60 100644 --- a/modules/hl-services/audiobookshelf.nix +++ b/modules/nixos/server/audiobookshelf.nix @@ -2,10 +2,10 @@ with lib; -let cfg = config.homelab.services.audiobookshelf; +let cfg = config.skyg.homelab.services.audiobookshelf; in { options = { - homelab.services.audiobookshelf = { + skyg.homelab.services.audiobookshelf = { enable = mkEnableOption "Audiobookshelf, self-hosted audiobook and podcast server."; diff --git a/modules/hl-services/coral-tpu-udev.nix b/modules/nixos/server/coral-tpu-udev.nix similarity index 87% rename from modules/hl-services/coral-tpu-udev.nix rename to modules/nixos/server/coral-tpu-udev.nix index 6c32f25..dad16b9 100644 --- a/modules/hl-services/coral-tpu-udev.nix +++ b/modules/nixos/server/coral-tpu-udev.nix @@ -1,9 +1,9 @@ { config, lib, ... }: with lib; -let cfg = config.homelab.udevrules.coraltpu; +let cfg = config.skyg.homelab.udevrules.coraltpu; in { options = { - homelab.udevrules.coraltpu = { + skyg.homelab.udevrules.coraltpu = { enable = mkEnableOption "Enable Coral TPU Udev rules"; symlinkName = mkOption { diff --git a/modules/hl-services/default.nix b/modules/nixos/server/default.nix similarity index 100% rename from modules/hl-services/default.nix rename to modules/nixos/server/default.nix