use niri flake

This commit is contained in:
Henry Hiles 2026-11-16 23:36:08 -05:00
commit cf92170b72
Signed by: Henry-Hiles
SSH key fingerprint: SHA256:VKQUdS31Q90KvX7EkKMHMBpUspcmItAh86a+v7PGiIs
3 changed files with 15 additions and 24 deletions

12
flake.lock generated
View file

@ -953,13 +953,17 @@
} }
}, },
"niri-mobile": { "niri-mobile": {
"flake": false, "inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": { "locked": {
"lastModified": 1794889107, "lastModified": 1794889881,
"narHash": "sha256-tvHafWVnTFoIvD47mawvUkloNuweG92yf94ysgDPvok=", "narHash": "sha256-ZI7YfIbZbC7e2hQHQSWzOma6npDAvwTgNIFUC6lS8+8=",
"owner": "Henry-Hiles", "owner": "Henry-Hiles",
"repo": "niri", "repo": "niri",
"rev": "09cbacc42dc28062c0fc539a674f356d52eb662b", "rev": "82e7e8e1d40e21f250dc0e9cf24a441476c32718",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -14,7 +14,7 @@
}; };
niri-mobile = { niri-mobile = {
url = "github:Henry-Hiles/niri/quad/mobile"; url = "github:Henry-Hiles/niri/quad/mobile";
flake = false; inputs.nixpkgs.follows = "nixpkgs";
}; };
nixphone = { nixphone = {
url = "git+https://codeberg.org/nixphone/nixphone"; url = "git+https://codeberg.org/nixphone/nixphone";

View file

@ -6,19 +6,6 @@
... ...
}: }:
let 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" '' swayosdStyle = pkgs.writeText "swayosd.css" ''
@import url("file://${pkgs.swayosd}/etc/xdg/swayosd/style.css"); @import url("file://${pkgs.swayosd}/etc/xdg/swayosd/style.css");
@ -50,12 +37,12 @@ let
''; '';
in in
{ {
nixpkgs.overlays = [ inputs.app-grid.overlays.default ]; nixpkgs.overlays = [
inputs.niri-mobile.overlays.default
inputs.app-grid.overlays.default
];
programs.niri = { programs.niri.enable = true;
enable = true;
package = niri;
};
environment.etc."niri/config.kdl".text = '' environment.etc."niri/config.kdl".text = ''
output "DSI-1" { 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 = { services.logind.settings.Login = {
HandlePowerKey = "ignore"; HandlePowerKey = "ignore";