From aa6edaa1feb7b255e4ff2c906ca9b7ce090ed6fe Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Wed, 30 Aug 2023 23:07:30 +0200 Subject: [PATCH] move system packages declaration to modules dir --- nixos/configuration.nix | 21 ++++++++++----------- nixos/{ => modules}/packages.nix | 0 2 files changed, 10 insertions(+), 11 deletions(-) rename nixos/{ => modules}/packages.nix (100%) diff --git a/nixos/configuration.nix b/nixos/configuration.nix index f6c8c3b..5097218 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -15,6 +15,7 @@ in # Include the results of the hardware scan. ./hardware-configuration.nix ./packages.nix + ./modules/nitrokey.nix ]; services.davfs2.enable = true; @@ -45,16 +46,16 @@ in environment.systemPackages = [ pkgs.sbctl ]; - # Lanzaboote currently replaces the systemd-boot module. - # This setting is usually set to true in configuration.nix - # generated at installation time. So we force it to false - # for now. - boot.loader.systemd-boot.enable = lib.mkForce false; + # Lanzaboote currently replaces the systemd-boot module. + # This setting is usually set to true in configuration.nix + # generated at installation time. So we force it to false + # for now. + boot.loader.systemd-boot.enable = lib.mkForce false; - boot.lanzaboote = { - enable = true; - pkiBundle = "/etc/secureboot"; - }; + boot.lanzaboote = { + enable = true; + pkiBundle = "/etc/secureboot"; + }; # make the boot look good boot.plymouth.enable = true; @@ -143,8 +144,6 @@ in package = pkgs.pulseaudioFull; }; - # Nitrokey support - services.udev.packages = [ pkgs.nitrokey-udev-rules ]; # Enable the X11 windowing system. services.xserver.enable = true; diff --git a/nixos/packages.nix b/nixos/modules/packages.nix similarity index 100% rename from nixos/packages.nix rename to nixos/modules/packages.nix