unify desktop and laptop configs

etcnixos/common.nix

@@ -20,9 +20,32 @@
     inputs.lanzaboote.nixosModules.lanzaboote
   ];
 
+  nixpkgs.config.allowUnfree = true;
+
+  # allow overclocking (I actually underclock but lol)
+  hardware.amdgpu.overdrive.ppfeaturemask = "0xFFF7FFFF";
+
   hardware.enableRedistributableFirmware = true;
   hardware.cpu.amd.updateMicrocode = true;
 
+  services.greetd = {
+    enable = true;
+    settings = {
+      default_session = {
+        command = "${lib.getExe pkgs.greetd.tuigreet} --time --cmd niri-session";
+        user = username;
+      };
+    };
+  };
+
+  system.activationScripts = {
+    # FIX: https://github.com/NixOS/nix/issues/2982
+    "profile-channel-dummy".text = ''
+      #!/bin/sh
+      mkdir -p /nix/var/nix/profiles/per-user/root/channels
+    '';
+  };
+
   swapDevices = [ ];
 
   nix = {

etcnixos/system-yarn.nix

@@ -16,11 +16,6 @@
     inputs.nixos-hardware.nixosModules.common-cpu-amd-pstate
     inputs.nixos-hardware.nixosModules.common-cpu-amd-zenpower
   ];
-  nixpkgs.config.allowUnfree = true;
-
-  # allow overclocking (I actually underclock but lol)
-  hardware.amdgpu.overdrive.ppfeaturemask = "0xFFF7FFFF";
-
   networking.hostId = "abf570f9";
   boot = {
     kernelModules = [
@@ -29,20 +24,6 @@
     ];
   };
 
-  services.xserver.enable = false;
-  services.desktopManager.plasma6.enable = true;
-  services.displayManager = {
-    sddm = {
-      enable = true;
-      wayland.enable = true;
-    };
-
-    autoLogin = {
-      enable = true;
-      user = username;
-    };
-  };
-
   # services.openssh = {
   #   enable = true;
   #   ports = [ 22 ];