refactor: move stuff to hyprland config

devices/binto/default.nix

@@ -4,14 +4,12 @@
 
     ../../modules/ags
     ../../modules/audio.nix
-    ../../modules/greetd
     ../../modules/hyprland
     ../../modules/kmscon.nix
     ../../modules/printer.nix
     ../../modules/proton-bridge.nix
     ../../modules/tailscale.nix
 
-    ./modules/desktop.nix
     ./modules/gpu-replay.nix
     ./modules/nix-gaming.nix
     ./modules/nvidia.nix

devices/binto/hardware-configuration.nix

@@ -67,6 +67,9 @@
   virtualisation = {
     libvirtd.enable = true;
   };
+  environment.systemPackages = with pkgs; [
+    qemu
+  ];
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
 }

devices/binto/modules/desktop.nix

@@ -1,59 +0,0 @@
-{
-  pkgs,
-  config,
-  ...
-}: let
-  hyprland =
-    config
-    .home-manager
-    .users
-    .${config.vars.user}
-    .wayland
-    .windowManager
-    .hyprland
-    .finalPackage;
-in {
-  programs.dconf.enable = true;
-
-  services = {
-    xserver = {
-      displayManager = {
-        sessionPackages = [hyprland];
-      };
-
-      libinput.enable = true;
-    };
-
-    greetd = {
-      settings = {
-        initial_session = {
-          command = "${hyprland}/bin/Hyprland";
-          user = config.vars.user;
-        };
-      };
-    };
-
-    dbus.enable = true;
-    gvfs.enable = true;
-    flatpak.enable = true;
-  };
-
-  programs.kdeconnect.enable = true;
-
-  xdg.portal = {
-    enable = true;
-    wlr.enable = true;
-    extraPortals = [
-      pkgs.xdg-desktop-portal-gtk
-    ];
-  };
-
-  environment.systemPackages = with pkgs; [
-    qemu
-    alsa-utils
-    plasma5Packages.kio-admin
-    plasma5Packages.ksshaskpass
-    p7zip # for reshade
-    kio-admin
-  ];
-}

devices/wim/default.nix

@@ -4,7 +4,6 @@
 
     ../../modules/ags
     ../../modules/audio.nix
-    ../../modules/greetd
     ../../modules/hyprland
     ../../modules/kmscon.nix
     ../../modules/plymouth.nix
@@ -12,7 +11,6 @@
     ../../modules/proton-bridge.nix
     ../../modules/tailscale.nix
 
-    ./modules/desktop.nix
     ./modules/security.nix
   ];
 

devices/wim/hardware-configuration.nix

@@ -83,15 +83,22 @@
     libvirtd.enable = true;
     waydroid.enable = true;
   };
+  environment.systemPackages = with pkgs; [
+    qemu
+  ];
 
   # enable brightness control
   programs.light.enable = true;
 
-  services.udev.extraRules = ''
+  services = {
-    # give permanent path to keyboard XF86* binds
+    tlp.enable = true;
-    SUBSYSTEMS=="input", ATTRS{id/product}=="0006", ATTRS{id/vendor}=="0000", SYMLINK += "video-bus"
 
-    # give permanent path to touchpad
+    udev.extraRules = ''
-    SUBSYSTEMS=="input", ATTRS{id/product}=="01e0", ATTRS{id/vendor}=="27c6", ATTRS{name}=="*Touchpad", SYMLINK += "touchpad"
+      # give permanent path to keyboard XF86* binds
-  '';
+      SUBSYSTEMS=="input", ATTRS{id/product}=="0006", ATTRS{id/vendor}=="0000", SYMLINK += "video-bus"
+
+      # give permanent path to touchpad
+      SUBSYSTEMS=="input", ATTRS{id/product}=="01e0", ATTRS{id/vendor}=="27c6", ATTRS{name}=="*Touchpad", SYMLINK += "touchpad"
+    '';
+  };
 }

devices/wim/modules/desktop.nix

@@ -1,61 +0,0 @@
-{
-  pkgs,
-  config,
-  ...
-}: let
-  hyprland =
-    config
-    .home-manager
-    .users
-    .${config.vars.user}
-    .wayland
-    .windowManager
-    .hyprland
-    .finalPackage;
-in {
-  programs.dconf.enable = true;
-
-  services = {
-    xserver = {
-      displayManager = {
-        sessionPackages = [hyprland];
-      };
-
-      libinput.enable = true;
-      wacom.enable = true;
-    };
-
-    greetd = {
-      settings = {
-        initial_session = {
-          command = "${hyprland}/bin/Hyprland";
-          user = "matt";
-        };
-      };
-    };
-
-    dbus.enable = true;
-    gvfs.enable = true;
-    flatpak.enable = true;
-    tlp.enable = true;
-  };
-
-  programs.kdeconnect.enable = true;
-
-  xdg.portal = {
-    enable = true;
-    wlr.enable = true;
-    extraPortals = [
-      pkgs.xdg-desktop-portal-gtk
-    ];
-  };
-
-  environment.systemPackages = with pkgs; [
-    qemu
-    alsa-utils
-    plasma5Packages.kio-admin
-    plasma5Packages.ksshaskpass
-    p7zip # for reshade
-    kio-admin
-  ];
-}

modules/greetd/default.nix

@@ -7,17 +7,19 @@
   # Nix stuff
   optionals = lib.lists.optionals;
   isNvidia = config.hardware.nvidia.modesetting.enable;
+  isTouchscreen = config.hardware.sensor.iio.enable;
 
-  # Executables' paths
+  hyprland = config
-  regreetBin = "${lib.getExe config.programs.regreet.package}";
-  hyprBin = "${config
     .home-manager
     .users
     .${config.vars.user}
     .wayland
     .windowManager
     .hyprland
-    .finalPackage}/bin";
+    .finalPackage;
+  # Executables' paths
+  hyprBin = "${hyprland}/bin";
+  regreetBin = "${lib.getExe config.programs.regreet.package}";
 
   # Show Regreet on all monitors
   dupeMonitors = pkgs.writeShellScriptBin "dupeMonitors" ''
@@ -88,12 +90,28 @@ in {
     };
   };
 
-  services.greetd = {
+  services = {
-    enable = true;
+    xserver = {
-    settings = {
+      displayManager = {
-      default_session = {
+        sessionPackages = [hyprland];
-        command = "${hyprBin}/Hyprland --config ${hyprConf}";
+      };
-        user = "greeter";
+
+      libinput.enable = true;
+      wacom.enable = isTouchscreen;
+    };
+
+    greetd = {
+      enable = true;
+      settings = {
+        default_session = {
+          command = "${hyprBin}/Hyprland --config ${hyprConf}";
+          user = "greeter";
+        };
+
+        initial_session = {
+          command = "${hyprBin}/Hyprland";
+          user = config.vars.user;
+        };
       };
     };
   };

modules/hyprland/default.nix

@@ -20,6 +20,32 @@
   gset = pkgs.gsettings-desktop-schemas;
   polkit = pkgs.plasma5Packages.polkit-kde-agent;
 in {
+  # SYSTEM CONFIG
+  imports = [../greetd];
+
+  programs = {
+    kdeconnect.enable = true;
+    dconf.enable = true;
+  };
+
+  services = {
+    dbus.enable = true;
+    gvfs.enable = true;
+  };
+
+  xdg.portal = {
+    enable = true;
+    wlr.enable = true;
+    extraPortals = [
+      pkgs.xdg-desktop-portal-gtk
+    ];
+  };
+
+  environment.systemPackages = with pkgs; [
+    plasma5Packages.kio-admin
+  ];
+
+  # HOME-MANAGER CONFIG
   home-manager.users.${config.vars.user} = {
     imports = [
       ../../home/theme.nix
@@ -197,9 +223,11 @@ in {
       bluez-tools
       brightnessctl
       pulseaudio
+      alsa-utils
       gnome.seahorse
+      p7zip # for reshade
 
-      gtklock
+      gtklock # FIXME: find replacement
       swww
 
       ## libs