From bcfb5772e42ba916da9714bcaa2672b85c89ef53 Mon Sep 17 00:00:00 2001
From: Simon Gardling <titaniumtown@proton.me>
Date: Thu, 7 Aug 2025 17:41:18 -0700
Subject: [PATCH] unify desktop and laptop configs

---
 etcnixos/common.nix         | 23 +++++++++++++++++++++++
 etcnixos/system-yarn.nix    | 19 -------------------
 home-manager/desktop.nix    | 30 ++++++++++++++++++++++++++++++
 home-manager/home-mreow.nix | 22 +---------------------
 home-manager/home-yarn.nix  |  1 +
 5 files changed, 55 insertions(+), 40 deletions(-)
 create mode 100644 home-manager/desktop.nix

diff --git a/etcnixos/common.nix b/etcnixos/common.nix
index 3ae8801..d4d9cc7 100644
--- a/etcnixos/common.nix
+++ b/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 = {
diff --git a/etcnixos/system-yarn.nix b/etcnixos/system-yarn.nix
index 331ca55..d15f976 100644
--- a/etcnixos/system-yarn.nix
+++ b/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 ];
diff --git a/home-manager/desktop.nix b/home-manager/desktop.nix
new file mode 100644
index 0000000..8ac8cc9
--- /dev/null
+++ b/home-manager/desktop.nix
@@ -0,0 +1,30 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+{
+  imports = [
+    # niri wayland compositor
+    ./progs/niri.nix
+
+    # statusbar
+    ./progs/eww/eww.nix
+
+    # lockscreen
+    ./progs/swaylock.nix
+
+    # notification daemon
+    ./progs/dunst.nix
+  ];
+
+  home.packages = with pkgs; [
+    wdisplays
+    blueman
+
+    # used by /etc/nixos logic to launch niri
+    config.programs.niri.package
+  ];
+
+}
diff --git a/home-manager/home-mreow.nix b/home-manager/home-mreow.nix
index a2068cb..d162804 100644
--- a/home-manager/home-mreow.nix
+++ b/home-manager/home-mreow.nix
@@ -7,32 +7,12 @@
 {
   imports = [
     ./gui.nix
-
-    # niri wayland compositor
-    ./progs/niri.nix
-
-    # statusbar
-    ./progs/eww/eww.nix
-
-    # lockscreen
-    ./progs/swaylock.nix
-
-    # notification daemon
-    ./progs/dunst.nix
-
+    ./desktop.nix
     ./progs/borg.nix
 
     ./progs/framework-13-easyeffects.nix
   ];
 
-  home.packages = with pkgs; [
-    wdisplays
-    blueman
-
-    # used by /etc/nixos logic to launch niri
-    config.programs.niri.package
-  ];
-
   # media controls
   systemd.user.services.mpris-proxy = {
     Unit.Description = "Mpris proxy";
diff --git a/home-manager/home-yarn.nix b/home-manager/home-yarn.nix
index 67b1b26..d6f4614 100644
--- a/home-manager/home-yarn.nix
+++ b/home-manager/home-yarn.nix
@@ -8,6 +8,7 @@
 {
   imports = [
     ./gui.nix
+    ./desktop.nix
   ];
 
   home.packages = with pkgs; [