.

modules/home/application/default.nix

@@ -0,0 +1,17 @@
+{
+  imports = [
+    ./bitwarden
+    ./chrome
+    ./discord
+    ./ladybird
+    ./matrix
+    ./obs
+    ./onlyoffice
+    ./signal
+    ./steam
+    ./studio
+    ./teamspeak
+    ./thunderbird
+    ./zen
+  ];
+}

modules/home/application/studio/default.nix

@@ -3,7 +3,7 @@ let
   inherit (lib) mkIf mkEnableOption;
 
   cfg = config.${namespace}.application.studio;
-  studioPackage = pkgs.callPackage (repoRoot + "/packages/studio/default.nix") {
+  studioPackage = pkgs.callPackage (repoRoot + "/packages/studio/package.nix") {
     inherit erosanixLib;
   };
 in

modules/home/default.nix

@@ -5,6 +5,18 @@ let
 
   cfg = config.${namespace}.defaults;
 in {
+  imports = [
+    ./application
+    ./desktop
+    ./development
+    ./editor
+    ./game
+    ./home-manager
+    ./shell
+    ./terminal
+    ./themes
+  ];
+
   options.${namespace}.defaults = {
     editor = mkOption {
       type = enum [ "nano" "nvim" "zed" ];

modules/home/desktop/default.nix

@@ -0,0 +1,5 @@
+{
+  imports = [
+    ./plasma
+  ];
+}

modules/home/development/default.nix

@@ -0,0 +1,7 @@
+{
+  imports = [
+    ./dotnet
+    ./javascript
+    ./rust
+  ];
+}

modules/home/editor/default.nix

@@ -0,0 +1,7 @@
+{
+  imports = [
+    ./nano
+    ./nvim
+    ./zed
+  ];
+}

modules/home/game/default.nix

@@ -0,0 +1,5 @@
+{
+  imports = [
+    ./minecraft
+  ];
+}

modules/home/shell/default.nix

@@ -5,6 +5,11 @@ let
   cfg = config.${namespace}.shell;
 in
 {
+  imports = [
+    ./toolset
+    ./zsh
+  ];
+
   options.${namespace}.shell = {
     corePkgs.enable = mkEnableOption "core shell packages";
   };

modules/home/shell/toolset/default.nix

@@ -0,0 +1,16 @@
+{
+  imports = [
+    ./bat
+    ./btop
+    ./eza
+    ./fzf
+    ./git
+    ./gnugpg
+    ./just
+    ./starship
+    ./tmux
+    ./yazi
+    ./zellij
+    ./zoxide
+  ];
+}

modules/home/terminal/default.nix

@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./alacritty
+    ./ghostty
+  ];
+}

modules/nixos/application/default.nix

@@ -0,0 +1,5 @@
+{
+  imports = [
+    ./steam
+  ];
+}

modules/nixos/default.nix

@@ -0,0 +1,14 @@
+{
+  imports = [
+    ./application
+    ./boot
+    ./desktop
+    ./editor
+    ./hardware
+    ./home-manager
+    ./nix
+    ./services
+    ./shells
+    ./system
+  ];
+}

modules/nixos/desktop/default.nix

@@ -9,6 +9,13 @@
 
   cfg = config.${namespace}.desktop;
 in {
+  imports = [
+    ./cosmic
+    ./gamescope
+    ./gnome
+    ./plasma
+  ];
+
   options.${namespace}.desktop = {
     use = mkOption {
       type = nullOr (enum ["plasma" "gamescope" "gnome" "cosmic"]);

modules/nixos/editor/default.nix

@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./nano
+    ./nvim
+  ];
+}

modules/nixos/hardware/default.nix

@@ -0,0 +1,7 @@
+{
+  imports = [
+    ./audio
+    ./bluetooth
+    ./gpu
+  ];
+}

modules/nixos/hardware/gpu/default.nix

@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./amd
+    ./nvidia
+  ];
+}

modules/nixos/services/authentication/default.nix

@@ -0,0 +1,7 @@
+{
+  imports = [
+    ./authelia
+    ./himmelblau
+    ./zitadel
+  ];
+}

modules/nixos/services/authentication/zitadel/default.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, namespace, system, terranixLib, sneeuwvlokLib, ... }:
+{ config, lib, pkgs, namespace, terranixLib, sneeuwvlokLib, ... }:
 let
   inherit (lib) mkIf mkEnableOption mkOption types toUpper toSentenceCase nameValuePair mapAttrs mapAttrs' concatMapAttrs concatMapStringsSep filterAttrsRecursive listToAttrs imap0 head drop length literalExpression attrNames;
   inherit (sneeuwvlokLib.strings) toSnakeCase;
@@ -340,7 +340,7 @@ in
 
     # this is a nix package, the generated json file to be exact
     terraformConfiguration = terranixLib.terranixConfiguration {
-      inherit system;
+      system = pkgs.stdenv.hostPlatform.system;
 
       modules = [
         ({ config, lib, ... }: {

modules/nixos/services/backup/default.nix

@@ -0,0 +1,5 @@
+{
+  imports = [
+    ./borg
+  ];
+}

modules/nixos/services/communication/default.nix

@@ -0,0 +1,5 @@
+{
+  imports = [
+    ./matrix
+  ];
+}

modules/nixos/services/default.nix

@@ -0,0 +1,15 @@
+{
+  imports = [
+    ./authentication
+    ./backup
+    ./communication
+    ./development
+    ./games
+    ./media
+    ./networking
+    ./observability
+    ./persistance
+    ./security
+    ./virtualisation
+  ];
+}

modules/nixos/services/development/default.nix

@@ -0,0 +1,5 @@
+{
+  imports = [
+    ./forgejo
+  ];
+}

modules/nixos/services/games/default.nix

@@ -0,0 +1,7 @@
+{
+  imports = [
+    ./minecraft
+    ./palworld
+    ./openrct.nix
+  ];
+}

modules/nixos/services/media/default.nix

@@ -10,6 +10,15 @@
 
   cfg = config.${namespace}.services.media;
 in {
+  imports = [
+    ./glance
+    ./jellyfin
+    ./mydia
+    ./nextcloud
+    ./nfs
+    ./servarr
+  ];
+
   options.${namespace}.services.media = {
     enable = mkEnableOption "Enable media services";
 

modules/nixos/services/media/jellyfin/default.nix

@@ -4,7 +4,6 @@
   lib,
   namespace,
   inputs,
-  system,
   ...
 }: let
   inherit (builtins) toString;

modules/nixos/services/media/mydia/default.nix

@@ -2,7 +2,6 @@
   config,
   lib,
   namespace,
-  system,
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;

modules/nixos/services/media/servarr/default.nix

@@ -3,7 +3,6 @@
   config,
   lib,
   namespace,
-  system,
   terranixLib,
   ...
 }: let
@@ -156,7 +155,7 @@ in {
           lib' = lib;
 
           terraformConfiguration = terranixLib.terranixConfiguration {
-            inherit system;
+            system = pkgs.stdenv.hostPlatform.system;
 
             modules = [
               ({

modules/nixos/services/networking/default.nix

@@ -0,0 +1,7 @@
+{
+  imports = [
+    ./caddy
+    ./ssh
+    ./wireguard
+  ];
+}

modules/nixos/services/observability/default.nix

@@ -0,0 +1,9 @@
+{
+  imports = [
+    ./grafana
+    ./loki
+    ./prometheus
+    ./promtail
+    ./uptime-kuma
+  ];
+}

modules/nixos/services/persistance/default.nix

@@ -0,0 +1,5 @@
+{
+  imports = [
+    ./postgesql
+  ];
+}

modules/nixos/services/security/default.nix

@@ -0,0 +1,5 @@
+{
+  imports = [
+    ./vaultwarden
+  ];
+}

modules/nixos/services/security/vaultwarden/default.nix

@@ -120,7 +120,7 @@ in {
         enable = true;
         dbBackend = "postgresql";
 
-        package = pkgs.callPackage (repoRoot + "/packages/vaultwarden/default.nix") {};
+        package = pkgs.callPackage (repoRoot + "/packages/vaultwarden/package.nix") {};
 
         config = {
           SIGNUPS_ALLOWED = false;

modules/nixos/services/virtualisation/default.nix

@@ -0,0 +1,5 @@
+{
+  imports = [
+    ./podman
+  ];
+}

modules/nixos/system/default.nix

@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./networking
+    ./security
+  ];
+}

modules/nixos/system/security/default.nix

@@ -3,6 +3,12 @@ let
   cfg = config.${namespace}.system.security;
 in
 {
+  imports = [
+    ./boot
+    ./sops
+    ./sudo
+  ];
+
   options.${namespace}.system.security = {};
 
   config = {
@@ -20,4 +26,4 @@ in
 
     programs.gnupg.agent.enable = true;
   };
-}
+}

modules/nixos/system/security/sops/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, config, namespace, repoRoot, system, ... }:
+{ pkgs, config, namespace, repoRoot, ... }:
 let
   cfg = config.${namespace}.system.security.sops;
 in
@@ -10,7 +10,7 @@ in
 
     sops = {
       defaultSopsFormat = "yaml";
-      defaultSopsFile = repoRoot + "/systems/${system}/${config.networking.hostName}/secrets.yml";
+      defaultSopsFile = repoRoot + "/systems/${pkgs.stdenv.hostPlatform.system}/${config.networking.hostName}/secrets.yml";
 
       age = {
         # keyFile = "~/.config/sops/age/keys.txt";