Switch away from ags flake.nix

flake.lock

@@ -2,34 +2,15 @@
   "nodes": {
     "ags": {
       "inputs": {
-        "ags": "ags_2",
+        "astal": "astal",
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1,
+        "lastModified": 1738087375,
-        "narHash": "sha256-DuhR3y0gPZG0AJ2FDd+nUKzQMwT+c/DFIUWNDQ5Uyx4=",
+        "narHash": "sha256-GLyNtU9A2VN22jNRHZ2OXuFfTJLh8uEVVt+ftsKUX0c=",
-        "path": "/nix/store/07g1q3w29pwq8q8rmdp4b3jvk2d22rb4-source/home/ags",
-        "type": "path"
-      },
-      "original": {
-        "path": "/nix/store/07g1q3w29pwq8q8rmdp4b3jvk2d22rb4-source/home/ags",
-        "type": "path"
-      }
-    },
-    "ags_2": {
-      "inputs": {
-        "astal": "astal",
-        "nixpkgs": [
-          "ags",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1732307740,
-        "narHash": "sha256-ZDsYdZOtg5qkK/wfLLB83B3SI+fE32S+/6Ey0ggHODM=",
         "owner": "aylur",
         "repo": "ags",
-        "rev": "81159966eb8b39b66c3efc133982fd76920c9605",
+        "rev": "a6a7a0adb17740f4c34a59902701870d46fbb6a4",
         "type": "github"
       },
       "original": {
@@ -41,17 +22,16 @@
     "astal": {
       "inputs": {
         "nixpkgs": [
-          "ags",
           "ags",
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1731952585,
+        "lastModified": 1739787548,
-        "narHash": "sha256-Sh1E7sJd8JJM3PCU1ZOei/QWz97OLCENIi2rTRoaniw=",
+        "narHash": "sha256-Gt4yc0nM4l63NIBgSznxriZQtrE1Xk6NlZauGiMmJ/4=",
         "owner": "aylur",
         "repo": "astal",
-        "rev": "664c7a4ddfcf48c6e8accd3c33bb94424b0e8609",
+        "rev": "cbfe69a9c22f3b0e59c6e09fffbe0b7af4f543d1",
         "type": "github"
       },
       "original": {
@@ -149,11 +129,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1739756364,
+        "lastModified": 1739907986,
-        "narHash": "sha256-r8RxE0W3uhJ6unzbIddWTAzrpP9tMnmbj0F+DF+CTSM=",
+        "narHash": "sha256-Vo7LHigoL4VdIJt+rVaQEctBzWN5di1FUvygeLg141E=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "662fa98bf488daa82ce8dc2bc443872952065ab9",
+        "rev": "a135aae1be749a10227413f9eb944a6f887dab86",
         "type": "github"
       },
       "original": {
@@ -185,11 +165,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1732014248,
+        "lastModified": 1739736696,
-        "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=",
+        "narHash": "sha256-zON2GNBkzsIyALlOCFiEBcIjI4w38GYOb+P+R4S8Jsw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367",
+        "rev": "d74a2335ac9c133d6bbec9fc98d91a77f1604c1f",
         "type": "github"
       },
       "original": {
@@ -217,11 +197,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1739580444,
+        "lastModified": 1739736696,
-        "narHash": "sha256-+/bSz4EAVbqz8/HsIGLroF8aNaO8bLRL7WfACN+24g4=",
+        "narHash": "sha256-zON2GNBkzsIyALlOCFiEBcIjI4w38GYOb+P+R4S8Jsw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "8bb37161a0488b89830168b81c48aed11569cb93",
+        "rev": "d74a2335ac9c133d6bbec9fc98d91a77f1604c1f",
         "type": "github"
       },
       "original": {
@@ -233,11 +213,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1739580444,
+        "lastModified": 1739736696,
-        "narHash": "sha256-+/bSz4EAVbqz8/HsIGLroF8aNaO8bLRL7WfACN+24g4=",
+        "narHash": "sha256-zON2GNBkzsIyALlOCFiEBcIjI4w38GYOb+P+R4S8Jsw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "8bb37161a0488b89830168b81c48aed11569cb93",
+        "rev": "d74a2335ac9c133d6bbec9fc98d91a77f1604c1f",
         "type": "github"
       },
       "original": {
@@ -270,11 +250,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1739782361,
+        "lastModified": 1739903703,
-        "narHash": "sha256-xd5HJX9ZW2MkKpCrnBVl/9EtwhnEQLDQaVYSjzCbtKE=",
+        "narHash": "sha256-w2tTcjx39lJoPDaFbIxi+INIjAKE0jbIx9TNjj9ghmg=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "5dfbce41e737044067e52cdf44dd2c42fbbcf64e",
+        "rev": "2215ad5c4347f522523715e809f5f2022509f504",
         "type": "github"
       },
       "original": {

flake.nix

@@ -6,8 +6,8 @@
             inputs.nixpkgs.follows = "nixpkgs";
         };
         nur.url = "github:nix-community/NUR";
-        ags.url = "./home/ags";
         fzgo.url = "git+https://git.thomasave.be/thomasave/fzgo.git";
+        ags.url = "github:aylur/ags";
         worktimer = {
             type = "git";
             url = "https://git.thomasave.be/thomasave/WorkTimer";

home/ags/default.nix

@@ -0,0 +1,27 @@
+{ inputs, pkgs, ... }:
+{
+    # add the home manager module
+    imports = [ inputs.ags.homeManagerModules.default ];
+
+    programs.ags = {
+        enable = true;
+
+        configDir = ./files;
+
+        extraPackages = with inputs.ags.packages.${pkgs.system}; [
+            pkgs.gtksourceview
+            pkgs.webkitgtk
+            pkgs.accountsservice
+
+            battery
+            hyprland
+            tray
+            powerprofiles
+            wireplumber
+            mpris
+            network
+            apps
+            notifd
+        ];
+    };
+}

home/ags/flake.lock

@@ -8,11 +8,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1732307740,
+        "lastModified": 1738087375,
-        "narHash": "sha256-ZDsYdZOtg5qkK/wfLLB83B3SI+fE32S+/6Ey0ggHODM=",
+        "narHash": "sha256-GLyNtU9A2VN22jNRHZ2OXuFfTJLh8uEVVt+ftsKUX0c=",
         "owner": "aylur",
         "repo": "ags",
-        "rev": "81159966eb8b39b66c3efc133982fd76920c9605",
+        "rev": "a6a7a0adb17740f4c34a59902701870d46fbb6a4",
         "type": "github"
       },
       "original": {
@@ -29,11 +29,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1731952585,
+        "lastModified": 1737670815,
-        "narHash": "sha256-Sh1E7sJd8JJM3PCU1ZOei/QWz97OLCENIi2rTRoaniw=",
+        "narHash": "sha256-ZCxxshGN7XooabArcoGkYSNx5yVunqjKJi2aTv6cznI=",
         "owner": "aylur",
         "repo": "astal",
-        "rev": "664c7a4ddfcf48c6e8accd3c33bb94424b0e8609",
+        "rev": "127e9cdcbf173846a3c40ddc0abfbb038df48042",
         "type": "github"
       },
       "original": {
@@ -44,11 +44,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1732014248,
+        "lastModified": 1739736696,
-        "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=",
+        "narHash": "sha256-zON2GNBkzsIyALlOCFiEBcIjI4w38GYOb+P+R4S8Jsw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367",
+        "rev": "d74a2335ac9c133d6bbec9fc98d91a77f1604c1f",
         "type": "github"
       },
       "original": {

home/firefox/default.nix

@@ -20,11 +20,6 @@ in
                     Fingerprinting = true;
                 };
                 ExtensionSettings = {
-                    "@contain-google" = {
-                        install_url =
-                            "https://addons.mozilla.org/firefox/downloads/latest/google-container/latest.xpi";
-                        installation_mode = "force_installed";
-                    };
                     "{ea4204c0-3209-4116-afd2-2a208e21a779}" = {
                         install_url =
                             "https://addons.mozilla.org/firefox/downloads/latest/enable-bing-chat/latest.xpi";
@@ -72,7 +67,7 @@ in
                     default = "DuckDuckGo";
                     order = [ "DuckDuckGo" "Google" ];
                 };
-                extensions = with pkgs.nur.repos.rycee.firefox-addons; [
+                extensions.packages = with pkgs.nur.repos.rycee.firefox-addons; [
                     ublock-origin
                     bitwarden
                     privacy-badger
@@ -85,6 +80,7 @@ in
                     sponsorblock
                     unpaywall
                     vimium
+                    google-container
                 ];
             };
         };

home/hyprland/default.nix

@@ -132,7 +132,7 @@ in {
             "$altMod" = pkgs.lib.mkDefault "ALT_L";
             exec-once = [
                 "hyprpaper"
-                "hyprctl dispatch exec ${inputs.ags.packages.${pkgs.system}.default}/bin/ags-bar"
+                "hyprctl dispatch exec ags run"
                 "${wl-paste} --type text --watch cliphist store"
                 "${wl-paste} --type image --watch cliphist store"
                 "${pkgs.mate.mate-polkit}/bin/polkit-mate"

home/utils/desktop.nix

@@ -4,6 +4,7 @@
         (import ./common.nix { inherit inputs config pkgs; })
         (import ./python.nix { inherit inputs config pkgs; })
         (import ../hyprland { inherit inputs pkgs; })
+        (import ../ags { inherit inputs pkgs; })
         ../rofi
         ../alacritty
         ../kitty