From 6c24f94a75376b1bb678aaf5bca5eb058ec73029 Mon Sep 17 00:00:00 2001 From: Alexandre Date: Sat, 7 Feb 2026 20:42:43 +0100 Subject: [PATCH] Finished the registry of modules --- hosts/common/modules.nix | 17 ++++++++------- hosts/framework/hardware-configuration.nix | 4 ++-- hosts/framework/home.nix | 2 +- hosts/framework/modules.nix | 14 +++++++------ hosts/laptop/modules.nix | 9 +++++--- hosts/light/configuration.nix | 24 ++++++++++++++-------- hosts/light/modules.nix | 2 +- hosts/macos/home.nix | 6 ++++-- hosts/macos/modules.nix | 8 +++++--- hosts/nixos/configuration.nix | 1 - hosts/nixos/modules.nix | 11 +++++----- modules/default.nix | 8 +++++--- 12 files changed, 63 insertions(+), 43 deletions(-) diff --git a/hosts/common/modules.nix b/hosts/common/modules.nix index 160a2f9..81d5eec 100644 --- a/hosts/common/modules.nix +++ b/hosts/common/modules.nix @@ -1,12 +1,15 @@ +let + modules = import ../../modules; +in { # Common nixos systems modules (not nix-darwin) imports = [ - ../../modules/common/nix.nix - ../../modules/common/direnv.nix - ../../modules/nixos/swap.nix - ../../modules/nixos/locale.nix # For localisation options - ../../modules/common/ssh.nix - ../../modules/nixos/bootloader.nix - ../../modules/common/environment.nix + modules.common.nix + modules.common.direnv + modules.nixos.swap + modules.nixos.locale # For localisation options + modules.common.ssh + modules.nixos.bootloader + modules.common.environment ]; } diff --git a/hosts/framework/hardware-configuration.nix b/hosts/framework/hardware-configuration.nix index b9e5267..6ceb93f 100755 --- a/hosts/framework/hardware-configuration.nix +++ b/hosts/framework/hardware-configuration.nix @@ -14,12 +14,12 @@ boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/da617628-d792-4010-af1d-20a25eda3d5b"; + { device = "/dev/disk/by-label/NIXROOT"; fsType = "ext4"; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/C246-555A"; + { device = "/dev/disk/by-label/NIXBOOT"; fsType = "vfat"; options = [ "fmask=0022" "dmask=0022" ]; }; diff --git a/hosts/framework/home.nix b/hosts/framework/home.nix index 746df57..1b9e3dd 100644 --- a/hosts/framework/home.nix +++ b/hosts/framework/home.nix @@ -5,7 +5,7 @@ let in { imports = [ - ../common/home.nix + modules.common.home modules.hm.hyprland ]; diff --git a/hosts/framework/modules.nix b/hosts/framework/modules.nix index 36f3668..7588bae 100644 --- a/hosts/framework/modules.nix +++ b/hosts/framework/modules.nix @@ -1,13 +1,15 @@ { inputs, ...}: - +let + modules = import ../../modules; +in { imports = [ ./hardware-configuration.nix inputs.sops-nix.nixosModules.sops - ../common/modules.nix - ../../modules/nixos/secrets.nix - ../../modules/nixos/gaming/starCitizen.nix - ../../modules/nixos/gaming/steam.nix - ../../modules/common/spotify.nix + modules.common.module + modules.nixos.secrets + modules.nixos.gaming.starCitizen + modules.nixos.gaming.steam + modules.common.spotify ]; } diff --git a/hosts/laptop/modules.nix b/hosts/laptop/modules.nix index e18752b..7ef0edb 100644 --- a/hosts/laptop/modules.nix +++ b/hosts/laptop/modules.nix @@ -1,9 +1,12 @@ +let + modules = import ../../modules; +in { imports = [ - ../common/modules.nix + modules.common.module ./hardware-configuration.nix - ../../modules/nixos/gaming/steam.nix - ../../modules/nixos/gaming/nvidia.nix + modules.nixos.gaming.steam + modules.nixos.gaming.nvidia ]; } diff --git a/hosts/light/configuration.nix b/hosts/light/configuration.nix index aaa8227..66b056e 100644 --- a/hosts/light/configuration.nix +++ b/hosts/light/configuration.nix @@ -20,18 +20,24 @@ }; }; - # Home-Manager config - home-manager = { - extraSpecialArgs = { inherit inputs; }; - useGlobalPkgs = true; - useUserPackages = true; - backupFileExtension = "HM-backup"; - users = { - # Change this to your username - "light" = import ./home.nix; + programs = { + zsh = { + enable = true; }; }; + # Home-Manager config + #home-manager = { + # extraSpecialArgs = { inherit inputs; }; + # useGlobalPkgs = true; + # useUserPackages = true; + # backupFileExtension = "HM-backup"; + # users = { + # # Change this to your username + # "light" = import ./home.nix; + # }; + #}; + environment = { systemPackages = with pkgs; [ wget diff --git a/hosts/light/modules.nix b/hosts/light/modules.nix index f2c7549..f9de906 100644 --- a/hosts/light/modules.nix +++ b/hosts/light/modules.nix @@ -5,7 +5,7 @@ let in { imports = [ - #./hardware-configuration.nix + ./hardware-configuration.nix modules.common.module modules.nixos.xfce # Desktop Enviroment ]; diff --git a/hosts/macos/home.nix b/hosts/macos/home.nix index dc00ca8..5946e3e 100644 --- a/hosts/macos/home.nix +++ b/hosts/macos/home.nix @@ -1,9 +1,11 @@ { config, pkgs, inputs, ... }: - +let + modules = import ../../modules; +in { # Refer to the nixOS host for info about home-manager imports = [ - ../common/home.nix + modules.common.home ]; diff --git a/hosts/macos/modules.nix b/hosts/macos/modules.nix index 1ff05a5..98e62b7 100644 --- a/hosts/macos/modules.nix +++ b/hosts/macos/modules.nix @@ -1,11 +1,13 @@ { pkgs, ... }: - +let + modules = import ../../modules; +in { # Enpty file for future imports imports = [ - ../../modules/common/nix.nix + modules.common.nix #../../modules/macos/vesktop.nix #../../modules/macos/ollama.nix - ../../modules/common/direnv.nix + modules.common.direnv ]; } diff --git a/hosts/nixos/configuration.nix b/hosts/nixos/configuration.nix index b4221e8..2ad8c8a 100644 --- a/hosts/nixos/configuration.nix +++ b/hosts/nixos/configuration.nix @@ -7,7 +7,6 @@ { imports = [ # Include the results of the hardware scan. - ./hardware-configuration.nix ./modules.nix ]; diff --git a/hosts/nixos/modules.nix b/hosts/nixos/modules.nix index 370079e..133f9b2 100644 --- a/hosts/nixos/modules.nix +++ b/hosts/nixos/modules.nix @@ -6,14 +6,15 @@ in # This file is used to import all modules required by this setup. imports = [ + ./hardware-configuration.nix inputs.sops-nix.nixosModules.sops modules.common.module modules.nixos.secrets # Sops # ../../modules/nixos/wireless.nix # For the wifi - ../../modules/nixos/gaming/nvidia.nix # Nvidia (Drivers and Settings) - ../../modules/nixos/gaming/starCitizen.nix - ../../modules/nixos/gaming/steam.nix # For Steam/Proton/Lutris/MangoHUD/Heroic/Bottles - ../../modules/common/spotify.nix # Spotify - ../../modules/common/ai.nix + modules.nixos.gaming.nvidia # Nvidia (Drivers and Settings) + modules.nixos.gaming.starCitizen + modules.nixos.gaming.steam # For Steam/Proton/Lutris/MangoHUD/Heroic/Bottles + modules.common.spotify # Spotify + modules.common.ai ]; } diff --git a/modules/default.nix b/modules/default.nix index d65d5bd..4705143 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -21,10 +21,12 @@ }; nixos = { + gaming = { + nvidia = ./nixos/gaming/nvidia.nix; + starCitizen = ./nixos/gaming/starCitizen.nix; + steam = ./nixos/gaming/steam.nix; + }; bootloader = ./nixos/bootloader.nix; - nvidia = ./nixos/gaming/nvidia.nix; - starCitizen = ./nixos/gaming/starCitizen.nix; - steam = ./nixos/gaming/steam.nix; locale = ./nixos/locale.nix; secrets = ./nixos/secrets.nix; swap = ./nixos/swap.nix;