refactor(ags): make global module

.gitignore

@@ -3,3 +3,4 @@
 *node_modules/
 *package-lock.json
 **/ags/style.css
+result*

common/default.nix

@@ -56,11 +56,16 @@
   };
   environment.variables.FLAKE = "/home/matt/.nix";
 
-  services.xserver = {
+  services = {
+    fwupd.enable = true;
+
+    xserver = {
       layout = "ca";
       xkbVariant = "multix";
     };
 
+  };
+
   home-manager.users = let
     default = {
       imports = [

devices/binto/default.nix

@@ -2,6 +2,7 @@
   imports = [
     ./hardware-configuration.nix
 
+    ../../modules/ags
     ../../modules/audio.nix
     ../../modules/greetd
     ../../modules/kmscon.nix
@@ -30,7 +31,6 @@
       "input"
       "uinput"
       "adm"
-      "mlocate"
       "video"
       "libvirtd"
     ];
@@ -42,7 +42,6 @@
         ../../home/firefox
         ../../home/hyprland
 
-        ./home/ags.nix
         ./home/packages.nix
       ];
 

devices/binto/home/ags.nix

@@ -1,31 +0,0 @@
-{
-  pkgs,
-  config,
-  ags,
-  ...
-}: let
-  configDir = config.services.device-vars.configDir;
-  symlink = config.lib.file.mkOutOfStoreSymlink;
-in {
-  imports = [
-    ags.homeManagerModules.default
-  ];
-
-  programs.ags = {
-    enable = true;
-    configDir = symlink "${configDir}/ags";
-    package = ags.packages.x86_64-linux.default;
-    extraPackages = [pkgs.libgudev];
-  };
-
-  home.packages = with pkgs; [
-    # ags
-    sassc
-    coloryou
-    playerctl
-
-    ## gui
-    pavucontrol # TODO: replace with ags widget
-    networkmanagerapplet # TODO: replace with ags widget
-  ];
-}

devices/oksys/default.nix

@@ -16,7 +16,6 @@
     extraGroups = [
       "wheel"
       "adm"
-      "mlocate"
     ];
   };
   home-manager.users = {

devices/wim/default.nix

@@ -2,6 +2,7 @@
   imports = [
     ./hardware-configuration.nix
 
+    ../../modules/ags
     ../../modules/audio.nix
     ../../modules/greetd
     ../../modules/kmscon.nix
@@ -27,7 +28,6 @@
       "input"
       "uinput"
       "adm"
-      "mlocate"
       "video"
       "libvirtd"
     ];
@@ -41,7 +41,6 @@
 
         ./home/dotfiles.nix
         ./home/packages.nix
-        ./home/ags.nix
       ];
 
       # No touchy

devices/wim/home/ags.nix

@@ -1,47 +0,0 @@
-{
-  pkgs,
-  config,
-  ags,
-  ...
-}: let
-  configDir = config.services.device-vars.configDir;
-  symlink = config.lib.file.mkOutOfStoreSymlink;
-in {
-  imports = [
-    ags.homeManagerModules.default
-  ];
-
-  programs.ags = {
-    enable = true;
-    configDir = symlink "${configDir}/ags";
-    package = ags.packages.x86_64-linux.default;
-    extraPackages = [pkgs.libgudev];
-  };
-
-  wayland.windowManager.hyprland = {
-    settings = {
-      env = [
-        "AGS_PATH, ${configDir}/ags/bin"
-        "HYPR_PATH, ${configDir}/hypr/scripts"
-        "LOCK_PATH, ${configDir}/gtklock/scripts"
-      ];
-    };
-  };
-
-  home.packages = with pkgs; [
-    # ags
-    ydotool
-    sassc
-    coloryou
-    playerctl
-
-    ## gui
-    pavucontrol # TODO: replace with ags widget
-    networkmanagerapplet # TODO: replace with ags widget
-    blueberry # TODO: replace with ags widget
-
-    # touchscreen
-    lisgd
-    squeekboard
-  ];
-}

devices/wim/home/dotfiles.nix

@@ -6,6 +6,16 @@
   configDir = config.services.device-vars.configDir;
   symlink = config.lib.file.mkOutOfStoreSymlink;
 in {
+  wayland.windowManager.hyprland = {
+    settings = {
+      env = [
+        "AGS_PATH, ${configDir}/ags/bin"
+        "HYPR_PATH, ${configDir}/hypr/scripts"
+        "LOCK_PATH, ${configDir}/gtklock/scripts"
+      ];
+    };
+  };
+
   xdg.configFile = {
     "gtklock/config.ini".source = pkgs.writeText "config.ini" ''
       [main]

home/hyprland/default.nix

@@ -11,6 +11,7 @@
   symlink = config.lib.file.mkOutOfStoreSymlink;
   optionals = lib.lists.optionals;
   isNvidia = osConfig.hardware.nvidia.modesetting.enable;
+  isTouchscreen = osConfig.hardware.sensor.iio.enable;
 
   gset = pkgs.gsettings-desktop-schemas;
   polkit = pkgs.plasma5Packages.polkit-kde-agent;
@@ -31,7 +32,7 @@ in {
 
     plugins =
       []
-      ++ (optionals (osConfig.hardware.sensor.iio.enable) [
+      ++ (optionals (isTouchscreen) [
         hyprgrass.packages.${pkgs.system}.default
       ]);
 

modules/ags/default.nix

@@ -0,0 +1,49 @@
+{
+  ags,
+  config,
+  pkgs,
+  ...
+}: let
+  vars = config.services.device-vars;
+  isNvidia = config.hardware.nvidia.modesetting.enable;
+  isTouchscreen = config.hardware.sensor.iio.enable;
+in {
+  services.upower.enable = true;
+
+  home-manager.users.${vars.username}.imports = [
+    ags.homeManagerModules.default
+
+    ({
+      config,
+      lib,
+      ...
+    }: let
+      symlink = config.lib.file.mkOutOfStoreSymlink;
+      optionals = lib.lists.optionals;
+    in {
+      programs.ags = {
+        enable = true;
+        configDir = symlink "${vars.configDir}/ags";
+        package = ags.packages.x86_64-linux.default;
+        extraPackages = [pkgs.libgudev];
+      };
+
+      home.packages = with pkgs;
+        [
+          # ags
+          sassc
+          coloryou
+          playerctl
+
+          ## gui
+          pavucontrol # TODO: replace with ags widget
+          networkmanagerapplet # TODO: replace with ags widget
+        ]
+        ++ (optionals isTouchscreen [
+          # touchscreen
+          lisgd
+          squeekboard
+        ]);
+    })
+  ];
+}