Name refactor + move

This commit is contained in:
ari committed 2024-08-18 21:36:32 -04:00
1 parent 3de38b8c94
commit ebb321f671
20 files changed
+27 -27

No files matched your search

+1 -1
View File
@@ -7,7 +7,7 @@ in
{ {
imports = [ ./fwbook.hardware-configuration.nix ]; imports = [ ./fwbook.hardware-configuration.nix ];
skyg.user.enabled = true; skyg.user.enabled = true;
skyg.desktop = { skyg.nixos.desktop = {
kde.enabled = true; kde.enabled = true;
}; };
services.fwupd.enable = true; services.fwupd.enable = true;
+1 -1
View File
@@ -2,7 +2,7 @@
{ pkgs, lib, config, ... }: { { pkgs, lib, config, ... }: {
imports = [ ./hl-bigbox1.hardware-configuration.nix ]; imports = [ ./hl-bigbox1.hardware-configuration.nix ];
skyg.user.enabled = true; skyg.user.enabled = true;
skyg.ssh-server.enabled = true; skyg.nixos.common.ssh-server.enabled = true;
# firmware updater # firmware updater
services.fwupd.enable = true; services.fwupd.enable = true;
virtualisation.docker.enableNvidia = true; virtualisation.docker.enableNvidia = true;
+1 -1
View File
@@ -2,7 +2,7 @@
{ pkgs, lib, config, ... }: { { pkgs, lib, config, ... }: {
imports = [ ./hl-minipc1.hardware-configuration.nix ]; imports = [ ./hl-minipc1.hardware-configuration.nix ];
skyg.user.enabled = true; skyg.user.enabled = true;
skyg.ssh-server.enabled = true; skyg.nixos.common.ssh-server.enabled = true;
# firmware updater # firmware updater
services.fwupd.enable = true; services.fwupd.enable = true;
+2 -2
View File
@@ -2,7 +2,7 @@
{ pkgs, lib, config, ... }: { { pkgs, lib, config, ... }: {
imports = [ ./hl-minipc1.hardware-configuration.nix ]; imports = [ ./hl-minipc1.hardware-configuration.nix ];
skyg.user.enabled = true; skyg.user.enabled = true;
skyg.ssh-server.enabled = true; skyg.nixos.common.ssh-server.enabled = true;
# Nix Stores # Nix Stores
services.nix-serve = { services.nix-serve = {
@@ -23,7 +23,7 @@
options = [ "nofail" ]; options = [ "nofail" ];
}; };
# Services # Services
skyg.homelab.services.audiobookshelf = { skyg.nixos.server.services.audiobookshelf = {
enable = true; enable = true;
host = "0.0.0.0"; host = "0.0.0.0";
openFirewall = true; openFirewall = true;
+2 -2
View File
@@ -2,7 +2,7 @@
{ pkgs, lib, config, ... }: { { pkgs, lib, config, ... }: {
imports = [ ./hl-minipc2.hardware-configuration.nix ]; imports = [ ./hl-minipc2.hardware-configuration.nix ];
skyg.user.enabled = true; skyg.user.enabled = true;
skyg.ssh-server.enabled = true; skyg.nixos.common.ssh-server.enabled = true;
# firmware updater # firmware updater
services.fwupd.enable = true; services.fwupd.enable = true;
# Bootloader. # Bootloader.
@@ -10,7 +10,7 @@
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
# Special udev rule for google's coral tpu # Special udev rule for google's coral tpu
skyg.homelab.udevrules.coraltpu.enable = true; skyg.nixos.server.udevrules.coraltpu.enable = true;
# Containers # Containers
virtualisation.oci-containers = { virtualisation.oci-containers = {
+1 -1
View File
@@ -3,7 +3,7 @@
{ {
imports = [ ./hl-terra1.hardware-configuration.nix ]; imports = [ ./hl-terra1.hardware-configuration.nix ];
skyg.user.enabled = true; skyg.user.enabled = true;
skyg.ssh-server.enabled = true; skyg.nixos.common.ssh-server.enabled = true;
# firmware updater # firmware updater
services.fwupd.enable = true; services.fwupd.enable = true;
# Bootloader. # Bootloader.
+1 -1
View File
@@ -27,7 +27,7 @@
skyg.home-manager.version = homeManagerVersion; skyg.home-manager.version = homeManagerVersion;
skyg.core.substituters = localNixCaches; skyg.core.substituters = localNixCaches;
skyg.networkDrives.enabled = enableNetworkDrives; 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; system.stateVersion = systemStateVersion;
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
nix = { nix = {
+1 -1
View File
@@ -8,7 +8,7 @@ with lib;
./podman.nix ./podman.nix
]; ];
options = { options = {
skyg.common.containers = { skyg.nixos.common.containers = {
runtime = mkOption { runtime = mkOption {
description = "Docker vs podman"; description = "Docker vs podman";
type = types.str; type = types.str;
+1 -1
View File
@@ -1,7 +1,7 @@
{ config, pkgs, lib, ... }: { config, pkgs, lib, ... }:
let let
cfg = config.skyg.common.containers; cfg = config.skyg.nixos.common.containers;
in in
{ {
config = lib.mkIf (cfg.runtime == "docker") { config = lib.mkIf (cfg.runtime == "docker") {
+1 -1
View File
@@ -1,6 +1,6 @@
{ config, pkgs, lib, ... }: { config, pkgs, lib, ... }:
let let
cfg = config.skyg.common.containers; cfg = config.skyg.nixos.common.containers;
in in
{ {
config = lib.mkIf (cfg.runtime == "podman") { config = lib.mkIf (cfg.runtime == "podman") {
+1
View File
@@ -6,6 +6,7 @@
./core.nix ./core.nix
./networking.nix ./networking.nix
./user.nix ./user.nix
./fonts.nix
./ssh-server.nix ./ssh-server.nix
]; ];
} }
File renamed without changes.
+2 -2
View File
@@ -5,7 +5,7 @@
, ... , ...
}: }:
let let
cfg = config.skyg.hardware.fan2go; cfg = config.skyg.nixos.common.hardware.fan2go;
fan2goConfig = pkgs.writeText "fan2go.yaml" '' fan2goConfig = pkgs.writeText "fan2go.yaml" ''
dbPath: ${cfg.dbPath} dbPath: ${cfg.dbPath}
@@ -65,7 +65,7 @@ let
''; '';
in in
{ {
options.skyg.hardware.fan2go = with lib; { options.skyg.nixos.common.hardware.fan2go = with lib; {
enable = mkEnableOption "fan2go"; enable = mkEnableOption "fan2go";
dbPath = mkOption { dbPath = mkOption {
+2 -2
View File
@@ -4,10 +4,10 @@
, ... , ...
}: }:
let let
cfg = config.skyg.hardware.fancontrol; cfg = config.skyg.nixos.common.hardware.fancontrol;
in in
{ {
options.skyg.hardware.fancontrol = with lib; { options.skyg.nixos.common.hardware.fancontrol = with lib; {
enable = mkEnableOption "fancontrol"; enable = mkEnableOption "fancontrol";
configName = mkOption { configName = mkOption {
type = types.str; type = types.str;
+2 -2
View File
@@ -2,11 +2,11 @@
with lib; with lib;
let let
cfg = config.skyg.ssh-server; cfg = config.skyg.nixos.common.ssh-server;
in in
{ {
options = { options = {
skyg.ssh-server = { skyg.nixos.common.ssh-server = {
enabled = mkEnableOption enabled = mkEnableOption
"enable ssh server"; "enable ssh server";
masterPubKey = mkOption { masterPubKey = mkOption {
+2 -2
View File
@@ -2,11 +2,11 @@
with lib; with lib;
let let
cfg = config.skyg.desktop.hyprland; cfg = config.skyg.nixos.desktop.hyprland;
in in
{ {
options = { options = {
skyg.desktop.hyprland = { skyg.nixos.desktop.hyprland = {
enabled = mkEnableOption enabled = mkEnableOption
"Hyprland"; "Hyprland";
}; };
+2 -2
View File
@@ -2,11 +2,11 @@
with lib; with lib;
let let
cfg = config.skyg.desktop.kde; cfg = config.skyg.nixos.desktop.kde;
in in
{ {
options = { options = {
skyg.desktop.kde = { skyg.nixos.desktop.kde = {
enabled = mkEnableOption enabled = mkEnableOption
"KDE"; "KDE";
}; };
+2 -2
View File
@@ -2,10 +2,10 @@
with lib; with lib;
let cfg = config.skyg.homelab.services.audiobookshelf; let cfg = config.skyg.nixos.server.services.audiobookshelf;
in { in {
options = { options = {
skyg.homelab.services.audiobookshelf = { skyg.nixos.server.services.audiobookshelf = {
enable = mkEnableOption enable = mkEnableOption
"Audiobookshelf, self-hosted audiobook and podcast server."; "Audiobookshelf, self-hosted audiobook and podcast server.";
+2 -2
View File
@@ -1,9 +1,9 @@
{ config, lib, ... }: { config, lib, ... }:
with lib; with lib;
let cfg = config.skyg.homelab.udevrules.coraltpu; let cfg = config.skyg.nixos.server.udevrules.coraltpu;
in { in {
options = { options = {
skyg.homelab.udevrules.coraltpu = { skyg.nixos.server.udevrules.coraltpu = {
enable = mkEnableOption enable = mkEnableOption
"Enable Coral TPU Udev rules"; "Enable Coral TPU Udev rules";
symlinkName = mkOption { symlinkName = mkOption {
-1
View File
@@ -3,7 +3,6 @@
imports = [ imports = [
./user.nix ./user.nix
./macos.nix ./macos.nix
./fonts.nix
./nix-substituters.nix ./nix-substituters.nix
]; ];
} }