feat: additional Laptop config

hosts/desktopnix/default.nix

@@ -9,6 +9,8 @@
     ../../modules/dev
     ../../modules/graphical
 
+    ../../modules/optional/xserver.nix
+
     ../../modules/hardware/bluetooth.nix
     ../../modules/hardware/intel.nix
     ../../modules/hardware/nintendo.nix

hosts/patricknix/default.nix

@@ -7,6 +7,10 @@
 
     ../../modules/config
     ../../modules/dev
+    ../../modules/graphical
+
+    ../../modules/optional/xserver.nix
+    ../../modules/optional/wayland.nix
 
     ../../modules/hardware/bluetooth.nix
     ../../modules/hardware/laptop.nix
@@ -25,4 +29,9 @@
 
     ../../users/patrick
   ];
+  stylix.fonts.sizes = {
+    terminal = 9;
+    applications = 9;
+    desktop = 8;
+  };
 }

users/common/graphical/Xorg/default.nix

@@ -1,11 +1,11 @@
 {pkgs, ...}: {
   home.packages = [pkgs.xclip];
   imports = [
-    ./herbstluft.nix
+    ../.
     ./rofi.nix
-    ./polybar.nix
     ./autorandr.nix
     ./i3.nix
     ./wallpapers.nix
   ];
+  home.file.".xinitrc".source = ./xinitrc;
 }

users/common/graphical/Xorg/herbstluft.nix

@@ -8,7 +8,6 @@
   #set the default resize step for herbstluft
   TAGS = map toString (lib.lists.range 1 9);
 in {
-  home.file.".xinitrc".source = ./xinitrc;
   xsession.windowManager.herbstluftwm = {
     enable = true;
     package = pkgs.herbstluftwm.overrideAttrs (_finalAttrs: _previousAttrs: {

users/common/graphical/default.nix

@@ -1,6 +1,5 @@
 {pkgs, ...}: {
   imports = [
-    ./Xorg
     ./themes.nix
   ];
   home = {

users/common/graphical/wayland/default.nix

@@ -1,5 +1,6 @@
 {
   imports = [
+    ../.
     ./fuzzel.nix
     ./sway.nix
   ];

users/patrick/default.nix

@@ -3,9 +3,7 @@
   config,
   ...
 }: {
-  # enable nixos wide graphical config
   imports = [
-    ../../modules/optional/xserver.nix
     ../../modules/optional/steam.nix
     ./impermanence.nix
   ];
@@ -36,25 +34,33 @@
   programs.dconf.enable = true;
 
   home-manager.users.patrick = {
-    imports = [
-      ./patrick.nix
-      ./ssh.nix
-      ./smb.nix
+    imports =
+      [
+        ./patrick.nix
+        ./ssh.nix
 
-      ../common
-      ../common/impermanence.nix
-      ../common/graphical
+        ../common
+        ../common/impermanence.nix
+        ../common/graphical/Xorg
+        #../common/graphical/wayland
 
-      ../common/programs/direnv.nix
-      ../common/programs/htop.nix
-      ../common/programs/nvim
-      ../common/programs/git.nix
-      ../common/programs/bottles.nix
-      ../common/programs/gdb.nix
-      ../common/programs/streamdeck.nix
-      ../common/programs/firefox.nix
-      ../common/programs/kitty.nix
-      ../common/programs/thunderbird.nix
-    ];
+        ../common/programs/direnv.nix
+        ../common/programs/htop.nix
+        ../common/programs/nvim
+        ../common/programs/git.nix
+        ../common/programs/bottles.nix
+        ../common/programs/gdb.nix
+        ../common/programs/firefox.nix
+        ../common/programs/kitty.nix
+        ../common/programs/thunderbird.nix
+      ]
+      ++ {
+        "desktopnix" = [
+          ../common/programs/streamdeck.nix
+          ./smb.nix
+        ];
+      }
+      .${config.node.name}
+      or [];
   };
 }