diff --git a/system/fonts.nix b/modules/config/fonts.nix similarity index 100% rename from system/fonts.nix rename to modules/config/fonts.nix diff --git a/installer/grub-menu-builder.sh b/modules/installer/grub/grub-menu-builder.sh similarity index 100% rename from installer/grub-menu-builder.sh rename to modules/installer/grub/grub-menu-builder.sh diff --git a/installer/grub.nix b/modules/installer/grub/grub.nix similarity index 97% rename from installer/grub.nix rename to modules/installer/grub/grub.nix index dc0abbaceaa..45c8a1fb29b 100644 --- a/installer/grub.nix +++ b/modules/installer/grub/grub.nix @@ -86,7 +86,7 @@ in let grubMenuBuilder = pkgs.substituteAll { - src = ../installer/grub-menu-builder.sh; + src = ./grub-menu-builder.sh; isExecutable = true; inherit (pkgs) bash; path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep]; @@ -100,7 +100,7 @@ in options # config.system.build - ../system/system-options.nix + # ../system/system-options.nix ]; system = { diff --git a/system/nixos-security.nix b/modules/security/setuid-wrappers.nix similarity index 100% rename from system/nixos-security.nix rename to modules/security/setuid-wrappers.nix diff --git a/system/sudo.nix b/modules/security/sudo.nix similarity index 96% rename from system/sudo.nix rename to modules/security/sudo.nix index 3c2d2eff14d..9c2eb5f5c24 100644 --- a/system/sudo.nix +++ b/modules/security/sudo.nix @@ -52,7 +52,7 @@ mkIf cfg.enable { options # config.environment.etc - ../etc/default.nix + # ../etc/default.nix # ? # config.environment.extraPackages # ? # config.security.extraSetuidPrograms @@ -69,7 +69,7 @@ mkIf cfg.enable { etc = [ { - source = ../etc/pam.d/sudo; + source = ./sudo.pam; target = "pam.d/sudo"; } { diff --git a/etc/pam.d/sudo b/modules/security/sudo.pam similarity index 100% rename from etc/pam.d/sudo rename to modules/security/sudo.pam diff --git a/system/options.nix b/system/options.nix index 5932bc997be..cf9af7a2878 100644 --- a/system/options.nix +++ b/system/options.nix @@ -382,7 +382,7 @@ in #../modules/hardware/network/intel-3945abg.nix ../boot/boot-stage-2.nix ../etc/default.nix - ../installer/grub.nix + ../modules/installer/grub/grub.nix ../modules/services/audio/alsa.nix ../modules/services/audio/pulseaudio.nix ../modules/services/databases/mysql.nix @@ -438,13 +438,13 @@ in ../modules/services/x11/xserver/default.nix ../system/activate-configuration.nix ../system/assertion.nix - ../system/fonts.nix + ../modules/config/fonts.nix ../system/i18n.nix ../system/kernel.nix ../system/nixos-environment.nix ../system/nixos-installer.nix - ../system/nixos-security.nix - ../system/sudo.nix + ../modules/security/setuid-wrappers.nix + ../modules/security/sudo.nix ../system/system-options.nix ../system/unix-odbc-drivers.nix ../system/users-groups.nix