Move ags to common

flake.nix

@@ -101,7 +101,7 @@
       };
   in {
     nixosConfigurations = {
-      fuhen = mkSystem "fuhen" "dwl" [
+      fuhen = mkSystem "fuhen" "river" [
         nixos-hardware.nixosModules.tuxedo-infinitybook-pro14-gen7
         ({
           lib,

modules/common/ags/default.nix

@@ -12,13 +12,19 @@
     installPhase = "install -Dm755 ${./covercolors.py} $out/bin/covercolors";
   };
 in {
+  home.packages = with pkgs; [
+	# TODO: Remove this
+    covercolors
+    alsa-utils
+    sassc
+    brightnessctl
+    pavucontrol
+    glib
+  ];
+
   xdg.configFile."ags" = {
-    source = ./ags;
+    source = ./.;
     recursive = true;
   };
-  home.packages = with pkgs; [
-    ags
-    # TOOD: Remove this
-    covercolors
-  ];
+
 }

modules/common/kitty.nix

@@ -37,7 +37,7 @@
       map kitty_mod+i scroll_to_prompt 1
       map kitty_mod+space show_last_command_output
 
-      include light.conf
+      include dark.conf
       include theme.conf
     '';
   };

modules/common/tsconfig.json

@@ -0,0 +1,18 @@
+{
+  "compilerOptions": {
+    "target": "ES2022",
+    "module": "ES2022",
+    "lib": [
+      "ES2022"
+    ],
+    "allowJs": true,
+    "checkJs": true,
+    "strict": true,
+    "noImplicitAny": false,
+    "baseUrl": ".",
+    "typeRoots": [
+      "ags/types"
+    ],
+    "skipLibCheck": true
+  }
+}

modules/dwl/home.nix

@@ -1,18 +1,6 @@
 {pkgs, ...}: let
   wallpaper = pkgs.writeShellScriptBin "wallpaper" (builtins.readFile ./wallpaper.sh);
   dwlstartup = pkgs.writeShellScriptBin "dwlstartup" (builtins.readFile ./dwlstartup.sh);
-  covercolors = pkgs.stdenv.mkDerivation {
-    name = "covercolors";
-    dontUnpack = true;
-    propagatedBuildInputs = [
-      (pkgs.python3.withPackages (pyPkgs:
-        with pyPkgs; [
-          material-color-utilities
-          pillow
-        ]))
-    ];
-    installPhase = "install -Dm755 ${./ags/covercolors.py} $out/bin/covercolors";
-  };
 in {
   imports = [
     ../common/apps.nix
@@ -37,7 +25,6 @@ in {
     grim
     slurp
     cliphist
-    covercolors
     ydotool
     fusuma
     gnome-control-center
@@ -45,11 +32,6 @@ in {
     shikane
   ];
 
-  xdg.configFile."ags" = {
-    source = ./ags;
-    recursive = true;
-  };
-
   # Keycodes here: https://github.com/torvalds/linux/blob/master/include/uapi/linux/input-event-codes.h#L202
   # :1 is for keydown, :0 for keyup
   xdg.configFile."fusuma/config.yaml".text = ''

modules/river/default.nix

@@ -1,4 +1,4 @@
-{pkgs, ...}: {
+{pkgs, inputs, ...}: {
   services.greetd = {
     enable = true;
     settings = {
@@ -50,6 +50,8 @@
   };
 
   environment.systemPackages = with pkgs; [
+    # TODO: Remove this
+    inputs.ags.packages.x86_64-linux.default
     gnome.gnome-bluetooth
     polkit_gnome
     wineWowPackages.stable

modules/river/home.nix

@@ -63,7 +63,7 @@ in {
       rule-add = {
         "-app-id" = {
           "discord" = "tags '3'";
-          "YouTube Music" = "tags '2'";
+          "'YouTube Music'" = "tags '2'";
           # disable all client side decorations
           "'*'" = "ssd";
         };