From 20de142350f76f1bcfdcdca831b3ac7a38292686 Mon Sep 17 00:00:00 2001 From: Chris Kruining Date: Thu, 26 Mar 2026 15:05:37 +0100 Subject: [PATCH] add import tree --- clan.nix | 110 +++++++++--------- machines/ulmo/configuration.nix | 2 +- modules/nixos/default.nix | 15 --- modules/nixos/desktop/default.nix | 7 -- modules/nixos/editor/default.nix | 6 - modules/nixos/hardware/default.nix | 7 -- .../hardware/gpu/{amd/default.nix => amd.nix} | 0 modules/nixos/hardware/gpu/default.nix | 6 - modules/nixos/hardware/gpu/nvidia.nix | 4 +- modules/nixos/hardware/gpu/nvidia/default.nix | 52 --------- modules/nixos/hardware/keyboard/voyager.nix | 2 +- .../nixos/services/authentication/default.nix | 7 -- modules/nixos/services/backup/default.nix | 5 - .../nixos/services/communication/default.nix | 5 - modules/nixos/services/default.nix | 15 --- .../nixos/services/development/default.nix | 5 - modules/nixos/services/games/default.nix | 7 -- modules/nixos/services/media/default.nix | 9 -- modules/nixos/services/networking/default.nix | 7 -- .../nixos/services/observability/default.nix | 9 -- .../nixos/services/persistance/default.nix | 5 - modules/nixos/services/security/default.nix | 5 - .../nixos/services/virtualisation/default.nix | 5 - modules/nixos/system/security/default.nix | 38 +++--- 24 files changed, 77 insertions(+), 256 deletions(-) delete mode 100644 modules/nixos/default.nix delete mode 100644 modules/nixos/editor/default.nix delete mode 100644 modules/nixos/hardware/default.nix rename modules/nixos/hardware/gpu/{amd/default.nix => amd.nix} (100%) delete mode 100644 modules/nixos/hardware/gpu/default.nix delete mode 100644 modules/nixos/hardware/gpu/nvidia/default.nix delete mode 100644 modules/nixos/services/authentication/default.nix delete mode 100644 modules/nixos/services/backup/default.nix delete mode 100644 modules/nixos/services/communication/default.nix delete mode 100644 modules/nixos/services/default.nix delete mode 100644 modules/nixos/services/development/default.nix delete mode 100644 modules/nixos/services/games/default.nix delete mode 100644 modules/nixos/services/networking/default.nix delete mode 100644 modules/nixos/services/observability/default.nix delete mode 100644 modules/nixos/services/persistance/default.nix delete mode 100644 modules/nixos/services/security/default.nix delete mode 100644 modules/nixos/services/virtualisation/default.nix diff --git a/clan.nix b/clan.nix index 1140fa9..b4429a9 100644 --- a/clan.nix +++ b/clan.nix @@ -8,60 +8,60 @@ directory = ./.; inventory.machines = { - # aule = { - # name = "aule"; - # description = "Planned build server."; - # machineClass = "nixos"; - # tags = ["planned" "build"]; - # }; - # mandos = { - # name = "mandos"; - # description = "Living room Steam box."; - # machineClass = "nixos"; - # tags = ["gaming" "living-room"]; - # }; - # manwe = { - # name = "manwe"; - # description = "Main desktop."; - # machineClass = "nixos"; - # tags = ["desktop"]; - # }; - # melkor = { - # name = "melkor"; - # description = "Planned machine with no defined role yet."; - # machineClass = "nixos"; - # tags = []; - # }; - # orome = { - # name = "orome"; - # description = "Work laptop."; - # machineClass = "nixos"; - # tags = ["laptop" "work"]; - # }; - # tulkas = { - # name = "tulkas"; - # description = "Steam Deck."; - # machineClass = "nixos"; - # tags = ["gaming" "handheld"]; - # }; + aule = { + name = "aule"; + description = "Planned build server."; + machineClass = "nixos"; + tags = ["planned" "build"]; + }; + mandos = { + name = "mandos"; + description = "Living room Steam box."; + machineClass = "nixos"; + tags = ["gaming" "living-room"]; + }; + manwe = { + name = "manwe"; + description = "Main desktop."; + machineClass = "nixos"; + tags = ["desktop"]; + }; + melkor = { + name = "melkor"; + description = "Planned machine with no defined role yet."; + machineClass = "nixos"; + tags = []; + }; + orome = { + name = "orome"; + description = "Work laptop."; + machineClass = "nixos"; + tags = ["laptop" "work"]; + }; + tulkas = { + name = "tulkas"; + description = "Steam Deck."; + machineClass = "nixos"; + tags = ["gaming" "handheld"]; + }; ulmo = { name = "ulmo"; description = "Primary self-hosted services machine."; machineClass = "nixos"; tags = ["server" "services"]; }; - # varda = { - # name = "varda"; - # description = "Planned machine with no defined role yet."; - # machineClass = "nixos"; - # tags = []; - # }; - # yavanna = { - # name = "yavanna"; - # description = "Planned machine with no defined role yet."; - # machineClass = "nixos"; - # tags = []; - # }; + varda = { + name = "varda"; + description = "Planned machine with no defined role yet."; + machineClass = "nixos"; + tags = []; + }; + yavanna = { + name = "yavanna"; + description = "Planned machine with no defined role yet."; + machineClass = "nixos"; + tags = []; + }; }; inventory.instances = { @@ -83,11 +83,11 @@ }; }; - machines = { - # mandos = {}; - # manwe = {}; - # orome = {}; - # tulkas = {}; - ulmo = {}; - }; + # machines = { + # mandos = {}; + # manwe = {}; + # orome = {}; + # tulkas = {}; + # ulmo = {}; + # }; } diff --git a/machines/ulmo/configuration.nix b/machines/ulmo/configuration.nix index 41ab38c..49c2896 100644 --- a/machines/ulmo/configuration.nix +++ b/machines/ulmo/configuration.nix @@ -31,7 +31,6 @@ imports = [ ./disks.nix ./hardware.nix - ../../modules/nixos self.inputs.home-manager.nixosModules.home-manager self.inputs.himmelblau.nixosModules.himmelblau self.inputs.jovian.nixosModules.default @@ -39,6 +38,7 @@ self.inputs.nix-minecraft.nixosModules.minecraft-servers self.inputs.nvf.nixosModules.default self.inputs.sops-nix.nixosModules.sops + (self.inputs.import-tree ../../modules/nixos) ]; system.stateVersion = "23.11"; diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix deleted file mode 100644 index d5f4e41..0000000 --- a/modules/nixos/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ - imports = [ - ./application/steam.nix - ./boot/default.nix - ./editor/nano/default.nix - ./editor/nvim/default.nix - ./hardware/audio/default.nix - ./home-manager - ./services - ./system/networking - ./system/security/boot - ./system/security/sops - ./system/security/sudo - ]; -} diff --git a/modules/nixos/desktop/default.nix b/modules/nixos/desktop/default.nix index 4ab3530..7aa6b57 100644 --- a/modules/nixos/desktop/default.nix +++ b/modules/nixos/desktop/default.nix @@ -8,13 +8,6 @@ cfg = config.sneeuwvlok.desktop; in { - imports = [ - ./cosmic - ./gamescope - ./gnome - ./plasma - ]; - options.sneeuwvlok.desktop = { use = mkOption { type = nullOr (enum ["plasma" "gamescope" "gnome" "cosmic"]); diff --git a/modules/nixos/editor/default.nix b/modules/nixos/editor/default.nix deleted file mode 100644 index 1bfac7a..0000000 --- a/modules/nixos/editor/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - imports = [ - ./nano - ./nvim - ]; -} diff --git a/modules/nixos/hardware/default.nix b/modules/nixos/hardware/default.nix deleted file mode 100644 index 48dac93..0000000 --- a/modules/nixos/hardware/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ - imports = [ - ./audio - ./bluetooth - ./gpu - ]; -} diff --git a/modules/nixos/hardware/gpu/amd/default.nix b/modules/nixos/hardware/gpu/amd.nix similarity index 100% rename from modules/nixos/hardware/gpu/amd/default.nix rename to modules/nixos/hardware/gpu/amd.nix diff --git a/modules/nixos/hardware/gpu/default.nix b/modules/nixos/hardware/gpu/default.nix deleted file mode 100644 index 7274f8a..0000000 --- a/modules/nixos/hardware/gpu/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - imports = [ - ./amd - ./nvidia - ]; -} diff --git a/modules/nixos/hardware/gpu/nvidia.nix b/modules/nixos/hardware/gpu/nvidia.nix index 2d04757..ec875be 100644 --- a/modules/nixos/hardware/gpu/nvidia.nix +++ b/modules/nixos/hardware/gpu/nvidia.nix @@ -6,11 +6,11 @@ }: let inherit (lib) mkIf mkEnableOption; - cfg = config.sneeuwvlok.hardware.has.gpu.nvidia; + cfg = config.sneeuwvlok.hardware.has.gpu; in { options.sneeuwvlok.hardware.has.gpu.nvidia = mkEnableOption "Enable NVidia gpu configuration"; - config = mkIf cfg { + config = mkIf cfg.nvidia { services.xserver.videoDrivers = ["nvidia"]; hardware = { diff --git a/modules/nixos/hardware/gpu/nvidia/default.nix b/modules/nixos/hardware/gpu/nvidia/default.nix deleted file mode 100644 index c12a650..0000000 --- a/modules/nixos/hardware/gpu/nvidia/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ - pkgs, - lib, - config, - ... -}: let - inherit (lib) mkIf mkEnableOption; - - cfg = config.sneeuwvlok.hardware.has.gpu; -in { - options.sneeuwvlok.hardware.has.gpu.nvidia = mkEnableOption "Enable NVidia gpu configuration"; - - config = mkIf cfg.nvidia { - services.xserver.videoDrivers = ["nvidia"]; - - hardware = { - graphics = { - enable = true; - enable32Bit = true; - }; - - nvidia = { - modesetting.enable = true; - open = false; - nvidiaSettings = true; - - powerManagement = { - enable = true; - finegrained = false; - }; - - # package = config.boot.kernelPackages.nvidiaPackages.vulkan_beta; - - # package = let - # rcu_patch = pkgs.fetchpatch { - # url = "https://github.com/gentoo/gentoo/raw/c64caf53/x11-drivers/nvidia-drivers/files/nvidia-drivers-470.223.02-gpl-pfn_valid.patch"; - # hash = "sha256-eZiQQp2S/asE7MfGvfe6dA/kdCvek9SYa/FFGp24dVg="; - # }; - # in config.boot.kernelPackages.nvidiaPackages.mkDriver { - # version = "550.40.07"; - # sha256_64bit = "sha256-KYk2xye37v7ZW7h+uNJM/u8fNf7KyGTZjiaU03dJpK0="; - # sha256_aarch64 = "sha256-AV7KgRXYaQGBFl7zuRcfnTGr8rS5n13nGUIe3mJTXb4="; - # openSha256 = "sha256-mRUTEWVsbjq+psVe+kAT6MjyZuLkG2yRDxCMvDJRL1I="; - # settingsSha256 = "sha256-c30AQa4g4a1EHmaEu1yc05oqY01y+IusbBuq+P6rMCs="; - # persistencedSha256 = "sha256-11tLSY8uUIl4X/roNnxf5yS2PQvHvoNjnd2CB67e870="; - - # patches = [ rcu_patch ]; - # }; - }; - }; - }; -} diff --git a/modules/nixos/hardware/keyboard/voyager.nix b/modules/nixos/hardware/keyboard/voyager.nix index 63ddac9..a7823f9 100644 --- a/modules/nixos/hardware/keyboard/voyager.nix +++ b/modules/nixos/hardware/keyboard/voyager.nix @@ -9,7 +9,7 @@ cfg = config.sneeuwvlok.hardware.keyboard.voyager; in { options.sneeuwvlok.hardware.keyboard.voyager = { - enble = mkEnableOption "Enable tools for ZSA Voyager"; + enable = mkEnableOption "Enable tools for ZSA Voyager"; }; config = mkIf cfg.enable { diff --git a/modules/nixos/services/authentication/default.nix b/modules/nixos/services/authentication/default.nix deleted file mode 100644 index b3af1d2..0000000 --- a/modules/nixos/services/authentication/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ - imports = [ - ./authelia - ./himmelblau - ./zitadel - ]; -} diff --git a/modules/nixos/services/backup/default.nix b/modules/nixos/services/backup/default.nix deleted file mode 100644 index be807e9..0000000 --- a/modules/nixos/services/backup/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - imports = [ - ./borg - ]; -} diff --git a/modules/nixos/services/communication/default.nix b/modules/nixos/services/communication/default.nix deleted file mode 100644 index 351ce1c..0000000 --- a/modules/nixos/services/communication/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - imports = [ - ./matrix - ]; -} diff --git a/modules/nixos/services/default.nix b/modules/nixos/services/default.nix deleted file mode 100644 index 50a6e7b..0000000 --- a/modules/nixos/services/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ - imports = [ - ./authentication - ./backup - ./communication - ./development - ./games - ./media - ./networking - ./observability - ./persistance - ./security - ./virtualisation - ]; -} diff --git a/modules/nixos/services/development/default.nix b/modules/nixos/services/development/default.nix deleted file mode 100644 index c7f3bff..0000000 --- a/modules/nixos/services/development/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - imports = [ - ./forgejo - ]; -} diff --git a/modules/nixos/services/games/default.nix b/modules/nixos/services/games/default.nix deleted file mode 100644 index 32191bd..0000000 --- a/modules/nixos/services/games/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ - imports = [ - ./minecraft - ./palworld - ./openrct.nix - ]; -} diff --git a/modules/nixos/services/media/default.nix b/modules/nixos/services/media/default.nix index 6916474..0db854f 100644 --- a/modules/nixos/services/media/default.nix +++ b/modules/nixos/services/media/default.nix @@ -9,15 +9,6 @@ cfg = config.sneeuwvlok.services.media; in { - imports = [ - ./glance - ./jellyfin - ./mydia - ./nextcloud - ./nfs - ./servarr - ]; - options.sneeuwvlok.services.media = { enable = mkEnableOption "Enable media services"; diff --git a/modules/nixos/services/networking/default.nix b/modules/nixos/services/networking/default.nix deleted file mode 100644 index 8f4b393..0000000 --- a/modules/nixos/services/networking/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ - imports = [ - ./caddy - ./ssh - ./wireguard - ]; -} diff --git a/modules/nixos/services/observability/default.nix b/modules/nixos/services/observability/default.nix deleted file mode 100644 index 1cf015c..0000000 --- a/modules/nixos/services/observability/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ - imports = [ - ./grafana - ./loki - ./prometheus - ./promtail - ./uptime-kuma - ]; -} diff --git a/modules/nixos/services/persistance/default.nix b/modules/nixos/services/persistance/default.nix deleted file mode 100644 index 31f6413..0000000 --- a/modules/nixos/services/persistance/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - imports = [ - ./postgesql - ]; -} diff --git a/modules/nixos/services/security/default.nix b/modules/nixos/services/security/default.nix deleted file mode 100644 index 751ae0c..0000000 --- a/modules/nixos/services/security/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - imports = [ - ./vaultwarden - ]; -} diff --git a/modules/nixos/services/virtualisation/default.nix b/modules/nixos/services/virtualisation/default.nix deleted file mode 100644 index 253a507..0000000 --- a/modules/nixos/services/virtualisation/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - imports = [ - ./podman - ]; -} diff --git a/modules/nixos/system/security/default.nix b/modules/nixos/system/security/default.nix index e6314d1..fdd3416 100644 --- a/modules/nixos/system/security/default.nix +++ b/modules/nixos/system/security/default.nix @@ -1,27 +1,25 @@ -{...}: { - flake.modules.nixos.sneeuwvlok.system.security = { - config, - inputs, - ... - }: let - cfg = config.sneeuwvlok.system.security; - in { - options.sneeuwvlok.system.security = {}; +{ + config, + inputs, + ... +}: let + cfg = config.sneeuwvlok.system.security; +in { + options.sneeuwvlok.system.security = {}; - config = { - security = { - acme.acceptTerms = true; - polkit.enable = true; + config = { + security = { + acme.acceptTerms = true; + polkit.enable = true; - pam = { - u2f = { - enable = true; - settings.cue = true; - }; + pam = { + u2f = { + enable = true; + settings.cue = true; }; }; - - programs.gnupg.agent.enable = true; }; + + programs.gnupg.agent.enable = true; }; }