b

common/base.nix

@@ -46,7 +46,7 @@
     })
     config.nix.registry;
 
-    nixpkgs = {
+  nixpkgs = {
     overlays = [
       outputs.overlays.additions
       outputs.overlays.modifications
@@ -60,7 +60,7 @@
   programs.gnupg.agent = {
     enable = true;
     enableSSHSupport = true;
-  };  
+  };
 
   services = {
     fwupd.enable = true;

common/components/de/plasma6.nix

@@ -3,6 +3,15 @@
     ./plasma-packages.nix
   ];
 
+  services.displayManager = {
+    sddm = {
+      enable = true;
+      wayland.enable = true;
+    };
+
+    defaultSession = "plasma";
+  };
+
   services.desktopManager.plasma6.enable = true;
 
   # Use ksshaskpass to access stored secrets

common/components/networking.nix

@@ -2,14 +2,7 @@
   networking = {
     networkmanager = {
       enable = true;
-      wifi = {
+
-        powersave = true;
-        scanRandMacAddress = true;
-        # XXX https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/1091
-        #backend = "iwd";
-        # Generate a random MAC for each WiFi and associate the two permanently.
-        macAddress = "stable";
-      };
       # Randomize MAC for every ethernet connetion
       ethernet.macAddress = "random";
       connectionConfig = {

common/components/packages.nix

@@ -1,4 +1,8 @@
-{pkgs, ...}: {
+{
+  pkgs,
+  lib,
+  ...
+}: {
   # Unfree packages that can be installes regardless of whether "allow-unfree.nix" is imported
   nixpkgs.config.allowUnfreePredicate = pkg:
     builtins.elem (lib.getName pkg) [
@@ -28,4 +32,4 @@
     ffmpeg
     usbutils
   ];
-}
+}

common/components/security.nix

@@ -2,4 +2,4 @@
   # sudo and nix can only be used by the wheel group
   nix.settings.allowed-users = ["@wheel"];
   security.sudo.execWheelOnly = true;
-}
+}

common/hardware/bluetooth.nix

@@ -0,0 +1,4 @@
+{
+  hardware.bluetooth.enable = true;
+  hardware.bluetooth.powerOnBoot = false;
+}

common/hardware/tpm2.nix

@@ -0,0 +1,5 @@
+{
+  security.tpm2.enable = true;
+  security.tpm2.pkcs11.enable = true; # expose /run/current-system/sw/lib/libtpm2_pkcs11.so
+  security.tpm2.tctiEnvironment.enable = true; # TPM2TOOLS_TCTI and TPM2_PKCS11_TCTI env variables
+}

common/hardware/wifi.nix

@@ -0,0 +1,10 @@
+{
+  networking.networkmanager.wifi = {
+    powersave = true;
+    scanRandMacAddress = true;
+    # https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/1091
+    # backend = "iwd";
+    # Generate a random MAC for each WiFi and associate the two permanently.
+    macAddress = "stable";
+  };
+}

common/hardware/wireless.nix

@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./wifi.nix
+    ./bluetooth.nix
+  ]
+}

hosts/new-new-phoenix/configuration.nix

@@ -15,15 +15,18 @@ in {
     ../../common/locales/fr-keymap.nix
 
     ../../common/hardware/intel-cpu.nix
+    ../../common/hardware/tpm2.nix
+    ../../common/hardware/wireless.nix
     ../../common/hardware/nvidia-gpu.nix
     ../../common/hardware/nvidia-gpu-offload.nix
     ../../common/hardware/ssd.nix
     ../../common/hardware/btrfs.nix
     ../../common/hardware/latest-kernel.nix
 
-    ../../common/de/greetd.nix
+    ../../common/components/de/sddm.nix
-    ../../common/de/plasma6.nix
+    # ../../common/components/de/greetd.nix
-    ../../common/de/hyprland.nix
+    ../../common/components/de/plasma6.nix
+    ../../common/components/de/hyprland.nix
 
     ../../common/programs/steam.nix
     ../../common/services/syncthing.nix
@@ -87,13 +90,6 @@ in {
     #
   ];
 
-  security.tpm2.enable = true;
-  security.tpm2.pkcs11.enable = true; # expose /run/current-system/sw/lib/libtpm2_pkcs11.so
-  security.tpm2.tctiEnvironment.enable = true; # TPM2TOOLS_TCTI and TPM2_PKCS11_TCTI env variables
-
-  hardware.bluetooth.enable = true;
-  hardware.bluetooth.powerOnBoot = false;
-
   services.blueman.enable = true;
 
   # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion