flake: add astal-battery

flake.lock

@@ -23,6 +23,48 @@
         "type": "github"
       }
     },
+    "ags": {
+      "inputs": {
+        "astal": "astal",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1732307740,
+        "narHash": "sha256-ZDsYdZOtg5qkK/wfLLB83B3SI+fE32S+/6Ey0ggHODM=",
+        "owner": "aylur",
+        "repo": "ags",
+        "rev": "81159966eb8b39b66c3efc133982fd76920c9605",
+        "type": "github"
+      },
+      "original": {
+        "owner": "aylur",
+        "repo": "ags",
+        "type": "github"
+      }
+    },
+    "astal": {
+      "inputs": {
+        "nixpkgs": [
+          "ags",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1731952585,
+        "narHash": "sha256-Sh1E7sJd8JJM3PCU1ZOei/QWz97OLCENIi2rTRoaniw=",
+        "owner": "aylur",
+        "repo": "astal",
+        "rev": "664c7a4ddfcf48c6e8accd3c33bb94424b0e8609",
+        "type": "github"
+      },
+      "original": {
+        "owner": "aylur",
+        "repo": "astal",
+        "type": "github"
+      }
+    },
     "basix": {
       "inputs": {
         "flake-compat": "flake-compat",
@@ -2604,6 +2646,7 @@
     "root": {
       "inputs": {
         "agenix": "agenix",
+        "ags": "ags",
         "basix": "basix",
         "deploy-rs": "deploy-rs",
         "firefox-addons": "firefox-addons",

flake.nix

@@ -6,6 +6,7 @@
     nixpkgs,
     systems,
     agenix,
+    ags,
     deploy-rs,
     treefmt-nix,
     ...
@@ -20,6 +21,12 @@
           pkgs.git
           deploy-rs.packages.${pkgs.system}.default
           agenix.packages.${pkgs.system}.default
+          (ags.packages.${pkgs.system}.default.override {
+            extraPackages = [
+              ags.packages.${pkgs.system}.astal3
+              ags.packages.${pkgs.system}.battery
+            ];
+          })
         ];
       };
     });
@@ -52,6 +59,10 @@
       url = "github:ryantm/agenix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    ags = {
+      url = "github:aylur/ags";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     basix.url = "github:notashelf/basix";
     deploy-rs.url = "github:serokell/deploy-rs";
     firefox-addons = {

modules/theme/default.nix

@@ -65,23 +65,8 @@ in {
       home-manager.users.nezia = {
         home.pointerCursor = {
           inherit (config.theme.cursorTheme) name package size;
-        };
-
-        gtk = {
-          iconTheme = {
-            inherit (config.theme.gtk.iconTheme) name package;
-          };
-
-          theme = lib.mkIf (!config.services.xserver.desktopManager.gnome.enable) {
-            inherit (config.theme.gtk.theme) name package;
-          };
-
-          gtk3.extraConfig = {
-            gtk-application-prefer-dark-theme =
-              if scheme.variant == "dark"
-              then "1"
-              else "0";
-          };
+          gtk.enable = true;
+          x11.enable = true;
         };
 
         services.swaync.style =

modules/theme/gtk.nix

@@ -6,13 +6,17 @@
   ...
 }: let
   inherit (builtins) pathExists;
-  inherit (lib) mkIf mkOption mkEnableOption;
-  inherit (lib.types) package str;
+  inherit (lib) mkIf mkOption;
+  inherit (lib.types) bool package str;
 
   cfg = config.theme.gtk;
 in {
   options.theme.gtk = {
-    enable = mkEnableOption "enable GTK theming options";
+    enable = mkOption {
+      type = bool;
+      description = "enable GTK theming options";
+      default = config.theme.enable;
+    };
     theme = {
       name = mkOption {
         type = str;
@@ -31,24 +35,22 @@ in {
         };
       };
     };
+
     iconTheme = {
       name = mkOption {
         type = str;
         description = "The name for the icon theme that will be used for GTK programs";
-        default = "Papirus-Dark";
+        default = "kora";
       };
-
       package = mkOption {
         type = package;
         description = "The GTK icon theme to be used";
-        default = pkgs.catppuccin-papirus-folders.override {
-          accent = "lavender";
-          flavor = "macchiato";
-        };
+        default = pkgs.kora-icon-theme;
       };
     };
   };
-  config = {
+
+  config = mkIf cfg.enable {
     assertions = [
       (let
         themePath = cfg.theme.package + /share/themes + "/${cfg.theme.name}";