diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index fdbbc46..38e76b8 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -7,7 +7,7 @@ in { imports = [ ./fwbook.hardware-configuration.nix ]; skyg.user.enabled = true; - skyg.desktop = { + skyg.nixos.desktop = { kde.enabled = true; }; services.fwupd.enable = true; diff --git a/hosts/hl-bigbox1.nix b/hosts/hl-bigbox1.nix index 502427e..376f3fc 100644 --- a/hosts/hl-bigbox1.nix +++ b/hosts/hl-bigbox1.nix @@ -2,7 +2,7 @@ { pkgs, lib, config, ... }: { imports = [ ./hl-bigbox1.hardware-configuration.nix ]; skyg.user.enabled = true; - skyg.ssh-server.enabled = true; + skyg.nixos.common.ssh-server.enabled = true; # firmware updater services.fwupd.enable = true; virtualisation.docker.enableNvidia = true; diff --git a/hosts/hl-fws1.nix b/hosts/hl-fws1.nix index 4e052c8..83b33ed 100644 --- a/hosts/hl-fws1.nix +++ b/hosts/hl-fws1.nix @@ -2,7 +2,7 @@ { pkgs, lib, config, ... }: { imports = [ ./hl-minipc1.hardware-configuration.nix ]; skyg.user.enabled = true; - skyg.ssh-server.enabled = true; + skyg.nixos.common.ssh-server.enabled = true; # firmware updater services.fwupd.enable = true; diff --git a/hosts/hl-minipc1.nix b/hosts/hl-minipc1.nix index 2163c32..61234e7 100644 --- a/hosts/hl-minipc1.nix +++ b/hosts/hl-minipc1.nix @@ -2,7 +2,7 @@ { pkgs, lib, config, ... }: { imports = [ ./hl-minipc1.hardware-configuration.nix ]; skyg.user.enabled = true; - skyg.ssh-server.enabled = true; + skyg.nixos.common.ssh-server.enabled = true; # Nix Stores services.nix-serve = { @@ -23,7 +23,7 @@ options = [ "nofail" ]; }; # Services - skyg.homelab.services.audiobookshelf = { + skyg.nixos.server.services.audiobookshelf = { enable = true; host = "0.0.0.0"; openFirewall = true; diff --git a/hosts/hl-minipc2.nix b/hosts/hl-minipc2.nix index 4f6a1fb..c77a17c 100644 --- a/hosts/hl-minipc2.nix +++ b/hosts/hl-minipc2.nix @@ -2,7 +2,7 @@ { pkgs, lib, config, ... }: { imports = [ ./hl-minipc2.hardware-configuration.nix ]; skyg.user.enabled = true; - skyg.ssh-server.enabled = true; + skyg.nixos.common.ssh-server.enabled = true; # firmware updater services.fwupd.enable = true; # Bootloader. @@ -10,7 +10,7 @@ boot.loader.efi.canTouchEfiVariables = true; # Special udev rule for google's coral tpu - skyg.homelab.udevrules.coraltpu.enable = true; + skyg.nixos.server.udevrules.coraltpu.enable = true; # Containers virtualisation.oci-containers = { diff --git a/hosts/hl-terra1.nix b/hosts/hl-terra1.nix index e514b15..59d71a3 100644 --- a/hosts/hl-terra1.nix +++ b/hosts/hl-terra1.nix @@ -3,7 +3,7 @@ { imports = [ ./hl-terra1.hardware-configuration.nix ]; skyg.user.enabled = true; - skyg.ssh-server.enabled = true; + skyg.nixos.common.ssh-server.enabled = true; # firmware updater services.fwupd.enable = true; # Bootloader. diff --git a/modules/main.nix b/modules/main.nix index 18f1501..b0fc538 100644 --- a/modules/main.nix +++ b/modules/main.nix @@ -27,7 +27,7 @@ skyg.home-manager.version = homeManagerVersion; skyg.core.substituters = localNixCaches; skyg.networkDrives.enabled = enableNetworkDrives; - skyg.common.containers = (if os.enable then os.containers else { }); + skyg.nixos.common.containers = (if os.enable then os.containers else { }); system.stateVersion = systemStateVersion; nixpkgs.config.allowUnfree = true; nix = { diff --git a/modules/nixos/common/containers/default.nix b/modules/nixos/common/containers/default.nix index 07bc870..14e9b17 100644 --- a/modules/nixos/common/containers/default.nix +++ b/modules/nixos/common/containers/default.nix @@ -8,7 +8,7 @@ with lib; ./podman.nix ]; options = { - skyg.common.containers = { + skyg.nixos.common.containers = { runtime = mkOption { description = "Docker vs podman"; type = types.str; diff --git a/modules/nixos/common/containers/docker.nix b/modules/nixos/common/containers/docker.nix index ee8d8bc..1f17e08 100644 --- a/modules/nixos/common/containers/docker.nix +++ b/modules/nixos/common/containers/docker.nix @@ -1,7 +1,7 @@ { config, pkgs, lib, ... }: let - cfg = config.skyg.common.containers; + cfg = config.skyg.nixos.common.containers; in { config = lib.mkIf (cfg.runtime == "docker") { diff --git a/modules/nixos/common/containers/podman.nix b/modules/nixos/common/containers/podman.nix index f3b7f01..b324940 100644 --- a/modules/nixos/common/containers/podman.nix +++ b/modules/nixos/common/containers/podman.nix @@ -1,6 +1,6 @@ { config, pkgs, lib, ... }: let - cfg = config.skyg.common.containers; + cfg = config.skyg.nixos.common.containers; in { config = lib.mkIf (cfg.runtime == "podman") { diff --git a/modules/nixos/common/default.nix b/modules/nixos/common/default.nix index e5e42a4..d535d37 100644 --- a/modules/nixos/common/default.nix +++ b/modules/nixos/common/default.nix @@ -6,6 +6,7 @@ ./core.nix ./networking.nix ./user.nix + ./fonts.nix ./ssh-server.nix ]; } diff --git a/modules/skyg/fonts.nix b/modules/nixos/common/fonts.nix similarity index 100% rename from modules/skyg/fonts.nix rename to modules/nixos/common/fonts.nix diff --git a/modules/nixos/common/hardware/fan2go.nix b/modules/nixos/common/hardware/fan2go.nix index 57c6d42..3da6198 100644 --- a/modules/nixos/common/hardware/fan2go.nix +++ b/modules/nixos/common/hardware/fan2go.nix @@ -5,7 +5,7 @@ , ... }: let - cfg = config.skyg.hardware.fan2go; + cfg = config.skyg.nixos.common.hardware.fan2go; fan2goConfig = pkgs.writeText "fan2go.yaml" '' dbPath: ${cfg.dbPath} @@ -65,7 +65,7 @@ let ''; in { - options.skyg.hardware.fan2go = with lib; { + options.skyg.nixos.common.hardware.fan2go = with lib; { enable = mkEnableOption "fan2go"; dbPath = mkOption { diff --git a/modules/nixos/common/hardware/fancontrol.nix b/modules/nixos/common/hardware/fancontrol.nix index a3bbe06..96d3413 100644 --- a/modules/nixos/common/hardware/fancontrol.nix +++ b/modules/nixos/common/hardware/fancontrol.nix @@ -4,10 +4,10 @@ , ... }: let - cfg = config.skyg.hardware.fancontrol; + cfg = config.skyg.nixos.common.hardware.fancontrol; in { - options.skyg.hardware.fancontrol = with lib; { + options.skyg.nixos.common.hardware.fancontrol = with lib; { enable = mkEnableOption "fancontrol"; configName = mkOption { type = types.str; diff --git a/modules/nixos/common/ssh-server.nix b/modules/nixos/common/ssh-server.nix index e0bce1d..0e647fb 100644 --- a/modules/nixos/common/ssh-server.nix +++ b/modules/nixos/common/ssh-server.nix @@ -2,11 +2,11 @@ with lib; let - cfg = config.skyg.ssh-server; + cfg = config.skyg.nixos.common.ssh-server; in { options = { - skyg.ssh-server = { + skyg.nixos.common.ssh-server = { enabled = mkEnableOption "enable ssh server"; masterPubKey = mkOption { diff --git a/modules/nixos/desktop/hyprland.nix b/modules/nixos/desktop/hyprland.nix index 0dd16ca..4f9f5fd 100644 --- a/modules/nixos/desktop/hyprland.nix +++ b/modules/nixos/desktop/hyprland.nix @@ -2,11 +2,11 @@ with lib; let - cfg = config.skyg.desktop.hyprland; + cfg = config.skyg.nixos.desktop.hyprland; in { options = { - skyg.desktop.hyprland = { + skyg.nixos.desktop.hyprland = { enabled = mkEnableOption "Hyprland"; }; diff --git a/modules/nixos/desktop/kde.nix b/modules/nixos/desktop/kde.nix index 9df4166..50bbe2f 100644 --- a/modules/nixos/desktop/kde.nix +++ b/modules/nixos/desktop/kde.nix @@ -2,11 +2,11 @@ with lib; let - cfg = config.skyg.desktop.kde; + cfg = config.skyg.nixos.desktop.kde; in { options = { - skyg.desktop.kde = { + skyg.nixos.desktop.kde = { enabled = mkEnableOption "KDE"; }; diff --git a/modules/nixos/server/audiobookshelf.nix b/modules/nixos/server/audiobookshelf.nix index 755ea60..a91cc6d 100644 --- a/modules/nixos/server/audiobookshelf.nix +++ b/modules/nixos/server/audiobookshelf.nix @@ -2,10 +2,10 @@ with lib; -let cfg = config.skyg.homelab.services.audiobookshelf; +let cfg = config.skyg.nixos.server.services.audiobookshelf; in { options = { - skyg.homelab.services.audiobookshelf = { + skyg.nixos.server.services.audiobookshelf = { enable = mkEnableOption "Audiobookshelf, self-hosted audiobook and podcast server."; diff --git a/modules/nixos/server/coral-tpu-udev.nix b/modules/nixos/server/coral-tpu-udev.nix index dad16b9..efd1b8b 100644 --- a/modules/nixos/server/coral-tpu-udev.nix +++ b/modules/nixos/server/coral-tpu-udev.nix @@ -1,9 +1,9 @@ { config, lib, ... }: with lib; -let cfg = config.skyg.homelab.udevrules.coraltpu; +let cfg = config.skyg.nixos.server.udevrules.coraltpu; in { options = { - skyg.homelab.udevrules.coraltpu = { + skyg.nixos.server.udevrules.coraltpu = { enable = mkEnableOption "Enable Coral TPU Udev rules"; symlinkName = mkOption { diff --git a/modules/skyg/default.nix b/modules/skyg/default.nix index dfd4752..4953084 100644 --- a/modules/skyg/default.nix +++ b/modules/skyg/default.nix @@ -3,7 +3,6 @@ imports = [ ./user.nix ./macos.nix - ./fonts.nix ./nix-substituters.nix ]; }