diff --git a/flake.lock b/flake.lock index 4f813cb..8844b8e 100644 --- a/flake.lock +++ b/flake.lock @@ -3,7 +3,9 @@ "ags": { "inputs": { "astal": "astal", - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1744557573, @@ -73,6 +75,26 @@ "type": "github" } }, + "astal_2": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1747093850, + "narHash": "sha256-SaHAtzUyfm4urAcUEZlBFn7dWhoDqA6kaeFZ11CCTf8=", + "owner": "aylur", + "repo": "astal", + "rev": "4820a3e37cc8eb81db6ed991528fb23472a8e4de", + "type": "github" + }, + "original": { + "owner": "aylur", + "repo": "astal", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -199,7 +221,7 @@ "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "pre-commit-hooks": "pre-commit-hooks", "systems": "systems", "xdph": "xdph" @@ -391,22 +413,6 @@ } }, "nixpkgs": { - "locked": { - "lastModified": 1743583204, - "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { "locked": { "lastModified": 1746461020, "narHash": "sha256-7+pG1I9jvxNlmln4YgnlW4o+w0TZX24k688mibiFDUE=", @@ -422,7 +428,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_2": { "locked": { "lastModified": 1746904237, "narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=", @@ -464,9 +470,10 @@ "root": { "inputs": { "ags": "ags", + "astal": "astal_2", "home-manager": "home-manager", "hyprland": "hyprland", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_2" } }, "systems": { diff --git a/flake.nix b/flake.nix index 60908db..2c96e05 100644 --- a/flake.nix +++ b/flake.nix @@ -7,10 +7,19 @@ home-manager.inputs.nixpkgs.follows = "nixpkgs"; # ensures version follows nixpkgs hyprland.url = "github:hyprwm/Hyprland"; - ags.url = "github:aylur/ags"; + + astal = { + url = "github:aylur/astal"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + ags = { + url = "github:aylur/ags"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; - outputs = { self, nixpkgs, home-manager, ags, ... } @ inputs: + outputs = { self, nixpkgs, home-manager, ags, astal, ... } @ inputs: let lib = nixpkgs.lib; system = "x86_64-linux"; @@ -25,7 +34,7 @@ }; homeConfigurations = { biscuit = home-manager.lib.homeManagerConfiguration { - extraSpecialArgs = { inherit inputs; }; + extraSpecialArgs = { inherit inputs system; }; inherit pkgs; modules = [ ./home-manager/home.nix ]; diff --git a/packages/ags/default.nix b/packages/ags/default.nix index 127576c..946f1d2 100644 --- a/packages/ags/default.nix +++ b/packages/ags/default.nix @@ -1,6 +1,13 @@ -{ inputs, pkgs, ... }: { +{ inputs, pkgs, system, ... }: { # add the home manager module - imports = [ inputs.ags.homeManagerModules.default ]; + imports = [ + inputs.ags.homeManagerModules.default + # inputs.astal.homeManagerModules.default + ]; + + home.packages = [ + inputs.astal.packages.${system}.default + ]; programs.ags = { enable = true; @@ -14,4 +21,7 @@ fzf ]; }; + # programs.astal = { + # enable = true; + # }; }