diff --git a/flake.lock b/flake.lock index 48a2714..394c0d2 100644 --- a/flake.lock +++ b/flake.lock @@ -953,13 +953,17 @@ } }, "niri-mobile": { - "flake": false, + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, "locked": { - "lastModified": 1794889107, - "narHash": "sha256-tvHafWVnTFoIvD47mawvUkloNuweG92yf94ysgDPvok=", + "lastModified": 1794889881, + "narHash": "sha256-ZI7YfIbZbC7e2hQHQSWzOma6npDAvwTgNIFUC6lS8+8=", "owner": "Henry-Hiles", "repo": "niri", - "rev": "09cbacc42dc28062c0fc539a674f356d52eb662b", + "rev": "82e7e8e1d40e21f250dc0e9cf24a441476c32718", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 3445607..d5dbbe0 100755 --- a/flake.nix +++ b/flake.nix @@ -14,7 +14,7 @@ }; niri-mobile = { url = "github:Henry-Hiles/niri/quad/mobile"; - flake = false; + inputs.nixpkgs.follows = "nixpkgs"; }; nixphone = { url = "git+https://codeberg.org/nixphone/nixphone"; diff --git a/modules/mobile/niri.nix b/modules/mobile/niri.nix index dec6d5d..b19231d 100644 --- a/modules/mobile/niri.nix +++ b/modules/mobile/niri.nix @@ -6,19 +6,6 @@ ... }: let - src = inputs.niri-mobile; - - niri = pkgs.niri.overrideAttrs (old: { - inherit src; - cargoDeps = pkgs.rustPlatform.importCargoLock { - lockFile = "${src}/Cargo.lock"; - allowBuiltinFetchGit = true; - }; - env = old.env // { - NIRI_BUILD_COMMIT = "quad-mobile-${src.shortRev}"; - }; - }); - swayosdStyle = pkgs.writeText "swayosd.css" '' @import url("file://${pkgs.swayosd}/etc/xdg/swayosd/style.css"); @@ -50,12 +37,12 @@ let ''; in { - nixpkgs.overlays = [ inputs.app-grid.overlays.default ]; + nixpkgs.overlays = [ + inputs.niri-mobile.overlays.default + inputs.app-grid.overlays.default + ]; - programs.niri = { - enable = true; - package = niri; - }; + programs.niri.enable = true; environment.etc."niri/config.kdl".text = '' output "DSI-1" { @@ -130,7 +117,7 @@ in } ''; - quad.session = lib.getExe' niri "niri-session"; + quad.session = lib.getExe' pkgs.niri "niri-session"; services.logind.settings.Login = { HandlePowerKey = "ignore";