unify desktop and laptop configs

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
+  ];
+
+}

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";

home-manager/home-yarn.nix

@@ -8,6 +8,7 @@
 {
   imports = [
     ./gui.nix
+    ./desktop.nix
   ];
 
   home.packages = with pkgs; [