laptop config confirmed building and seems working

hosts/default.nix

@@ -7,12 +7,11 @@
       inputs.home-manager.nixosModules.home-manager
     ];
   };
-  # "laptop" = inputs.nixpkgs.lib.nixosSystem {
-  #   modules = [
-  #     ./laptop
-  #     ../modules
-  #     # { nixpkgs.overlays = [ nur.overlay ]; }
-  #     # nur.nixosModules.nur
-  #   ];
-  # };
+  "laptop" = inputs.nixpkgs.lib.nixosSystem {
+    modules = [
+      ./laptop
+      ../modules
+      inputs.home-manager.nixosModules.home-manager
+    ];
+  };
 }

hosts/desktop/default.nix

@@ -104,6 +104,10 @@
             "1" = monitors.primary;
             "2" = monitors.secondary;
           };
+          communicators = {
+            autostart = true;
+            workspace = "2";
+          };
         };
 
         ssh = {

hosts/laptop/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ config, pkgs, ... }:
 {
   imports = [
     ./hardware-configuration.nix
@@ -13,7 +13,8 @@
       efi.canTouchEfiVariables = true;
     };
 
-    home-manager.users.${user}.home.packages = with pkgs; [
+    home-manager.users.${user}.home = {
+      packages = with pkgs; [
         pamixer
         yt-dlp
         aseprite
@@ -21,6 +22,13 @@
         viu
       ];
 
+      file = {
+        # for some reason no background is set at all by default
+        # which means i get the last "frame" of the login screen as my bg
+        ".background-image".source = ../../files/black.png;
+      };
+    };
+
     chuj = {
       system = {
         user = "krizej";
@@ -31,7 +39,6 @@
       home-manager.enable = true;
 
       stuff = {
-        xserver.enable = true;
         sddm.enable = true;
         alacritty.enable = true;
         vim.enable = true;
@@ -44,6 +51,12 @@
         documentation.enable = true;
         theme.enable = true;
         printing.enable = true;
+        i3.enable = true;
+
+        xserver = {
+          enable = true;
+          libinput = true;
+        };
 
         gaming = {
           enable = true;
@@ -57,14 +70,6 @@
           };
         };
 
-        i3 = {
-          enable = true;
-          communicators = {
-            autostart = false;
-            workspace = null;
-          };
-        };
-
         ssh = {
           enable = true;
           keys = {

modules/stuff/i3.nix

@@ -14,11 +14,11 @@ in {
         options = {
           autostart = mkOption {
             type = types.bool;
-            default = true;
+            default = false;
           };
           workspace = mkOption {
             type = types.str;
-            default = "2";
+            default = "";
           };
         };
       };
@@ -34,7 +34,7 @@ in {
       xsession.windowManager.i3 = {
         enable = true;
         config = rec {
-          assigns = mkIf (cfg.communicators.workspace != null) {
+          assigns = mkIf (cfg.communicators.workspace != "") {
             ${cfg.communicators.workspace} = [
               { class = "discord"; }
               { class = "SchildiChat"; }

modules/stuff/xserver.nix

@@ -4,6 +4,7 @@
 in {
   options.chuj.stuff.xserver = {
     enable = mkEnableOption "xserver";
+    libinput = mkEnableOption "libinput";
   };
   
   config = mkIf cfg.enable {
@@ -27,17 +28,14 @@ in {
       xdotool
     ];
 
-    # https://www.reddit.com/r/linux_gaming/comments/1dkbh5t/games_behaving_differently_on_xorg_than_on/
-    # FUCK YOU LIBINPUT
-    services.libinput.enable = lib.mkForce false;
-    # services.libinput = {
-    #     enable = true;
-    #     touchpad = {
-    #         naturalScrolling = false; # it's reversed on my laptop for some reason
-    #         tapping = true;
-    #         tappingButtonMap = "lmr";
-    #         scrollMethod = "edge";
-    #     };
-    # };
+    services.libinput = if cfg.libinput then {
+      enable = true;
+      touchpad = {
+        naturalScrolling = false; # it's reversed on my laptop for some reason
+        tapping = true;
+        tappingButtonMap = "lmr";
+        scrollMethod = "edge";
+      };
+    } else { enable = lib.mkForce false; }; # fuck you
   };
 }