feat: reorganize files

README.md

···
 
 ## Folder structure
 
-> TODO: write the new documentation with the dentritic pattern usage
+This repository use a `dentritic pattern` to make everything work with ease. With this pattern, every file is a modules (modules, configurations, ...), so everything needs to be inside the modules folders and imported as it.
+
+The only things not treated as it are the custom packages inside the packages folder.
+
+> [!NOTE]
+> This is my current idea of what will look the folders, it can change in the future.
+
+```
+.
+├── modules/
+│  ├── features/        # Feature definitions
+│  ├── hjem/            # Hjem modules (not using flake-parts modules)
+│  ├── hosts/           # machines configurations
+│  ├── lib/             # Custom library (mostly factories)
+│  ├── packages/        # Custom packages derivations (per-system)
+│  ├── tools/           # Basic tools configurations (flake-parts, hjem, impermanence, ...)
+│  ├── users/           # Users configurations
+│  └── default.nix      # Modules entrypoint with auto-import
+├── secrets/            # Secrets files used by agenix
+│  └── secrets.nix      # Secrets entrypoint
+├── flake.nix           # Configuration entrypoint
+└── justfile            # Command helper
+```
 
 ## Commands
 

modules/factories/auto-login.nix modules/features/auto-login.nix

···
 {
-  config.flake.factories.autoLogin = username: { ... }: {
+  config.flake.factory.autoLogin = username: { ... }: {
     services.displayManager.autoLogin.enable = true;
     services.displayManager.autoLogin.user = username;
   };

modules/factories/host.nix modules/lib/host.nix

···
       modules =
         modules ++ [
         hardwareConfig
-        inputs.self.nixosModules.unfree-packages
+        inputs.self.modules.nixos.unfree-packages
+        inputs.self.modules.nixos.garbageCollector
         ({ ... }: {
         networking.hostName = hostname;
         nix.settings.experimental-features = [ "nix-command" "flakes" ];
···
     inputs.darwin.lib.darwinSystem {
       inherit system;
       modules = [
-        inputs.self.darwinModules.unfree-packages
+        inputs.self.modules.darwin.unfree-packages
+        inputs.self.modules.darwin.garbageCollector
         ({ ... }: {
         nix.enable = true;
         networking.hostName = hostname;

modules/features/gnome-desktop.nix

···
+{
+  # Minimal gnome desktop
+  flake.modules.nixos.gnome-desktop = { inputs, pkgs, ... }: {
+    imports = with inputs.self.modules.nixos; [
+      audio
+    ];
+
+    services.displayManager.gdm.enable = true;
+    services.displayManager.autoLogin.enable = true;
+    services.displayManager.autoLogin.user = "cosmeak";
+    services.desktopManager.gnome.enable = true;
+    services.gnome.games.enable = false;
+    services.gnome.core-developer-tools.enable = false;
+    services.gnome.core-apps.enable = false;
+    environment.gnome.excludePackages = with pkgs; [ gnome-tour gnome-user-docs ];
+    environment.systemPackages = with pkgs; [ nautilus ];
+  };
+}

modules/features/kde-desktop.nix

···
+{
+  flake.modules.nixos.kde-desktop = { inputs, ... }: {
+    imports = with inputs.self.modules.nixos; [
+      audio
+    ];
+
+    services.displayManager.sddm.enable = true;
+    services.displayManager.sddm.wayland.enable = true;
+    services.desktopManager.plasma6.enable = true;
+  };
+}

modules/hosts/andhrimnir/configuration.nix

···
   configuration = { pkgs, ... }: {
     imports =
       with inputs.self.modules.nixos;
-      with inputs.self.factories;
+      with inputs.self.factory;
       [
-      system-boot-grub
-      system-garbageCollector
-      system-audio
-      system-graphics-nvidia
-      services-desktops-kdePlasma
-      neoxa
-      (autoLogin "neoxa")
-    ];
+        grub
+        nvidia-gpu
+        kde-desktop
+        neoxa
+        (autoLogin "neoxa")
+      ];
 
     networking.networkmanager.enable = true;
 

modules/hosts/loki/configuration.nix

···
   configuration = { pkgs, ... }: {
     imports =
       with inputs.self.modules.nixos;
-      with inputs.self.factories;
+      with inputs.self.factory;
       [
-        system-boot-systemd
-        system-garbageCollector
-        system-audio
-        system-graphics-nvidia
-        services-desktops-gnome
+        systemd-boot
+        audio
+        nvidia-gpu
+        gnome-desktop
         cosmeak
         (autoLogin "cosmeak")
       ];
···
     programs.steam = {
       enable = true;
       gamescopeSession.enable = true;
+    };
+
+    networking.firewall = {
+      enable = true;
+      # Open ports for minecraft LAN
+      allowedUDPPorts = [ 25565 ];
+      allowedTCPPorts = [ 25565 ];
     };
   };
 in

modules/hosts/njord/configuration.nix

···
 { inputs, ... }:
 let
-  configuration = { pkgs, ... }: {
+  configuration = { ... }: {
     imports = with inputs.self.modules.darwin; [
-      system-garbageCollector
       cosmeak
     ];
 
···
       "figma"               # Collaborative design application
       "gpg-suite-no-mail"   # Signing tool for commits
       "logi-options+"       #
-      "modrinth"            # Minecraft launcher
       "zed"                 # Code editor
     ];
   };

modules/hosts/sunna/configuration.nix

···
 let
   configuration = { ... }: {
     imports = with inputs.self.modules.nixos; [
-      system-boot-systemd
-      system-garbageCollector
-      system-audio
-      system-graphics-nvidia
-      services-desktops-kdePlasma
+      systemd-boot
+      nvidia-gpu
+      kde-desktop
     ];
 
     networking.networkmanager.enable = true;

modules/lib/user.nix

···
+{ self, ... }: {
+  config.flake.factory.user = { username, isAdmin }: {
+    nixos.${username} =  { lib, pkgs, ... }:
+    let home = "/home/${username}"; in {
+      # imports = [ self.modules.nixos.hjem ];
+
+      users.users.${username} = {
+        isNormalUser = true;
+        home = home;
+        extraGroups = lib.optionals isAdmin [ "wheel" ];
+      };
+
+      # hjem.users.${username} = {
+      #   enable = true;
+      #   directory = home;
+      #   user = username;
+      # };
+    };
+
+    darwin.${username} =  { lib, pkgs, ... }:
+    let home = "/Users/${username}"; in {
+      # imports = [ self.modules.darwin.hjem ];
+
+      users.users.${username} = {
+        home = home;
+      };
+
+      system.primaryUser = lib.mkIf isAdmin "${username}";
+
+      # hjem.users.${username} = {
+      #   enable = true;
+      #   directory = home;
+      #   user = username;
+      # };
+    };
+  };
+}

modules/nix/unfree.nix modules/features/unfree.nix

···
   };
 
   config = let packages = config.allowedUnfreePackages; in {
-    flake.nixosModules.unfree-packages = { lib, ... }: {
+    flake.modules.nixos.unfree-packages = { lib, ... }: {
       nixpkgs.config.allowUnfreePredicate = pkg:
         builtins.elem (lib.getName pkg) packages;
     };
 
-    flake.darwinModules.unfree-packages = { lib, ... }: {
+    flake.modules.darwin.unfree-packages = { lib, ... }: {
       nixpkgs.config.allowUnfreePredicate = pkg:
         builtins.elem (lib.getName pkg) packages;
     };

modules/services/desktops/gnome.nix

···
-{
-  flake.modules.nixos.services-desktops-gnome = { pkgs, ... }: {
-    services.displayManager.gdm.enable = true;
-    services.displayManager.autoLogin.enable = true;
-    services.displayManager.autoLogin.user = "cosmeak";
-    services.desktopManager.gnome.enable = true;
-    services.gnome.games.enable = false;
-    services.gnome.core-developer-tools.enable = false;
-    environment.gnome.excludePackages = with pkgs; [
-      gnome-tour
-      gnome-user-docs
-      gnome-text-editor
-      gnome-console
-    ];
-  };
-}

modules/services/desktops/kdePlasma.nix

···
-{
-  flake.modules.nixos.services-desktops-kdePlasma = { ... }: {
-    services.displayManager.sddm.enable = true;
-    services.displayManager.sddm.wayland.enable = true;
-    services.desktopManager.plasma6.enable = true;
-  };
-}

modules/system/audio.nix modules/features/audio.nix

···
 { lib, ... }:
 {
-  flake.modules.nixos.system-audio = { ... }: {
+  flake.modules.nixos.audio = { ... }: {
     services.pulseaudio.enable = lib.mkForce false;
     security.rtkit.enable = true;
     services.pipewire = {

modules/system/boot/grub.nix modules/features/grub.nix

···
 {
-  flake.modules.nixos.system-boot-grub = { ... }: {
+  flake.modules.nixos.grub = { ... }: {
     boot.loader.grub.enable = true;
     boot.loader.grub.device = "nodev";
     boot.loader.grub.useOSProber = true;

modules/system/boot/systemd-boot.nix modules/features/systemd-boot.nix

···
 {
   # EFI Bootloader
-  flake.modules.nixos.system-boot-systemd = { ... }: {
+  flake.modules.nixos.systemd-boot = { ... }: {
     boot.loader.systemd-boot.enable = true;
     boot.loader.efi.canTouchEfiVariables = true;
     boot.loader.systemd-boot.configurationLimit = 10;

modules/system/garbage-collector.nix modules/features/garbage-collector.nix

···
 {
-  flake.modules.nixos.system-garbageCollector = { ... }: {
+  flake.modules.nixos.garbageCollector = { ... }: {
     nix.settings.auto-optimise-store = true;
     nix.gc = {
       automatic = true;
···
     };
   };
 
-  flake.modules.darwin.system-garbageCollector = { ... }: {
+  flake.modules.darwin.garbageCollector = { ... }: {
     nix.gc = {
       automatic = true;
       interval = [{ Weekday = 7; }];

modules/system/graphics/nvidia.nix modules/features/nvidia-gpu.nix

···
 {
   allowedUnfreePackages = [ "nvidia-x11" "nvidia-settings" ];
 
-  flake.modules.nixos.system-graphics-nvidia = { config, ... }: {
+  flake.modules.nixos.nvidia-gpu = { config, ... }: {
     hardware.nvidia = {
       package = config.boot.kernelPackages.nvidiaPackages.latest;
       modesetting.enable = true;

modules/tools/_hjem.nix

···
+{ inputs, lib, ... }:
+let
+  configuration = {
+    # hjem.extraModules = [ inputs.self.modules.hjem ];
+    hjem.clobberByDefault = true;
+  };
+in
+{
+  flake.modules.nixos.hjem = {
+    imports = [ inputs.hjem.nixosModules.default configuration ];
+  };
+
+  flake.modules.darwin.hjem = {
+    imports = [ inputs.hjem.darwinModules.default configuration ];
+  };
+
+  options.flake.hjemModules = lib.mkOption {
+    type = lib.types.lazyAttrsOf lib.types.module;
+    default = { };
+    description = ''
+      Collection of modules defined in classic nix to extend hjem in the end.
+    '';
+  };
+}

modules/tools/flake-parts.nix

···
+{ lib, ... }: {
+  # currently, there's no nix-darwin module for flake-parts,
+  # so we have to manually add flake.darwinConfigurations
+  options.flake.darwinConfigurations = lib.mkOption {
+    type = lib.types.lazyAttrsOf lib.types.raw;
+    default = { };
+    description = ''
+      Instantiated Darwin configurations. Used by `darwin-rebuild`.
+    '';
+  };
+
+  # factory: storage for factory aspect functions
+  options.flake.factory = lib.mkOption {
+    type = lib.types.attrsOf lib.types.unspecified;
+    default = { };
+  };
+}

modules/users/cosmeak.nix

···
-{ ... }:
+{ lib, self, ... }:
 let
   username = "cosmeak";
 
···
   ];
 in
 {
-  allowedUnfreePackages = [ "1password" "cursor" "modrinth-app" "modrinth-app-unwrapped" "obsidian" "raycast" "spotify" ];
-
-  flake.modules.nixos.${username} = { pkgs, ... }: {
-    users.users.${username} = {
-      isNormalUser = true;
-      extraGroups = [ "networkmanager" "wheel" ];
-      packages = with pkgs; [
-        ghostty                                       # Terminal emulator
-        heroic                                        # Game Launcher (Epic Games, GOG)
-        (modrinth-app.overrideAttrs (oldAttrs: {
-     			buildCommand =
-      				''
-     					gappsWrapperArgs+=(
-      						--set GDK_BACKEND x11
-      						--set WEBKIT_DISABLE_DMABUF_RENDERER 1
-     					)
-      				''
-      				+ oldAttrs.buildCommand;
-    		}))
-        obs-studio                                    # Recording App
-        prismlauncher                                 # Minecraft launcher
-        vesktop                                       # Discord client
-        (zed-editor.fhsWithPackages (pkg: [ zlib ]))  # Code editor
-      ] ++ (sharedPackages pkgs);
-    };
-  };
+  allowedUnfreePackages = [ "1password" "cursor" "obsidian" "raycast" "spotify" ];
 
-  flake.modules.darwin.${username} = { pkgs, ... }: {
-    users.users.${username} = {
-      home = "Users/${username}/";
-    };
+  flake.modules = lib.mkMerge [
+    (self.factory.user {
+      username = username;
+      isAdmin = true;
+    })
+    {
+      nixos.${username} = { pkgs, ... }: {
+        users.users.${username} = {
+          packages = with pkgs; [
+            ghostty                                       # Terminal emulator
+            heroic                                        # Game Launcher (Epic Games, GOG)
+            obs-studio                                    # Recording App
+            prismlauncher                                 # Minecraft launcher
+            vesktop                                       # Discord client
+            (zed-editor.fhsWithPackages (pkg: [ zlib ]))  # Code editor
+          ] ++ (sharedPackages pkgs);
+        };
+      };
 
-    environment.systemPackages = with pkgs; [
-      alt-tab-macos    # alt tab like windows on macos
-      bruno            # IDE for testing apis
-      chirp            # Radio programming tool
-      dbeaver-bin      # Database client
-      ghostty-bin      # Terminal emulator
-      jujutsu          # VCS
-      stats            # System monitoring displayed in macos top bar
-      podman           # container tool -> replacement of docker
-      podman-compose   # compose provider for podman
-      raycast          # replacement for spotlight
-    ]++ (sharedPackages pkgs);
-  };
+      darwin.${username} = { pkgs, ... }: {
+        environment.systemPackages = with pkgs; [
+          alt-tab-macos    # alt tab like windows on macos
+          bruno            # IDE for testing apis
+          chirp            # Radio programming tool
+          dbeaver-bin      # Database client
+          ghostty-bin      # Terminal emulator
+          jujutsu          # VCS
+          stats            # System monitoring displayed in macos top bar
+          podman           # container tool -> replacement of docker
+          podman-compose   # compose provider for podman
+          raycast          # replacement for spotlight
+        ]++ (sharedPackages pkgs);
+      };
+    }
+  ];
 }