diff --git a/flake.lock b/flake.lock index 133e043..8a5624d 100644 --- a/flake.lock +++ b/flake.lock @@ -75,13 +75,17 @@ } }, "app-grid": { - "flake": false, + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, "locked": { - "lastModified": 1794877575, - "narHash": "sha256-X6NYOOVCLq2R01SsEhrwbBuxfpVGWN1dwK0pNShe8iY=", + "lastModified": 1794880757, + "narHash": "sha256-9UNy7aMPH1q9D3B6hQuRenh7Gf+dWsMp/+vpS56ZCbk=", "ref": "refs/heads/main", - "rev": "f7bd700f1d1a6f21138b6e3ad4aff7feda37dfd8", - "revCount": 2, + "rev": "9f9acae35bd9908c5f1e836521ee8e556464f301", + "revCount": 3, "type": "git", "url": "file:///home/quadradical/Documents/Code/app-grid" }, diff --git a/flake.nix b/flake.nix index a5785f3..2622288 100755 --- a/flake.nix +++ b/flake.nix @@ -10,7 +10,7 @@ }; app-grid = { url = "git+file:///home/quadradical/Documents/Code/app-grid"; - flake = false; + inputs.nixpkgs.follows = "nixpkgs"; }; niri-mobile = { url = "git+file:///home/quadradical/Documents/Code/niri?ref=quad/mobile-testing&shallow=1"; diff --git a/modules/mobile/niri.nix b/modules/mobile/niri.nix index 22e34c5..dec6d5d 100644 --- a/modules/mobile/niri.nix +++ b/modules/mobile/niri.nix @@ -19,8 +19,6 @@ let }; }); - grid = pkgs.callPackage "${inputs.app-grid}/package.nix" { }; - swayosdStyle = pkgs.writeText "swayosd.css" '' @import url("file://${pkgs.swayosd}/etc/xdg/swayosd/style.css"); @@ -52,6 +50,8 @@ let ''; in { + nixpkgs.overlays = [ inputs.app-grid.overlays.default ]; + programs.niri = { enable = true; package = niri; @@ -117,7 +117,7 @@ in } spawn-at-startup "${lib.getExe pkgs.swaybg}" "-i" "${../../background.jpg}" "-m" "fill" - spawn-at-startup "${lib.getExe grid}" + spawn-at-startup "${lib.getExe pkgs.app-grid}" spawn-at-startup "${lib.getExe stevia}" spawn-at-startup "${lib.getExe' pkgs.swayosd "swayosd-server"}" "--style" "${swayosdStyle}" // We log in automatically, so lock straight away.