use sway git
This commit is contained in:
parent
d1a843b71c
commit
1f2123f82e
53
flake.lock
53
flake.lock
|
@ -184,6 +184,21 @@
|
||||||
"type": "indirect"
|
"type": "indirect"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"nixpkgs-staging": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1670188712,
|
||||||
|
"narHash": "sha256-qwUJrFL02S2hFmjky+IAjl2ENM3A5bfzW38EcBevqe0=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "fe21b9ccd39efcdce2230ad01c1fd0da391d970f",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"id": "nixpkgs",
|
||||||
|
"ref": "staging",
|
||||||
|
"type": "indirect"
|
||||||
|
}
|
||||||
|
},
|
||||||
"nixpkgs-unstable": {
|
"nixpkgs-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1669791787,
|
"lastModified": 1669791787,
|
||||||
|
@ -271,12 +286,15 @@
|
||||||
"material-wifi-icons": "material-wifi-icons",
|
"material-wifi-icons": "material-wifi-icons",
|
||||||
"nil-lsp": "nil-lsp",
|
"nil-lsp": "nil-lsp",
|
||||||
"nixpkgs": "nixpkgs_2",
|
"nixpkgs": "nixpkgs_2",
|
||||||
|
"nixpkgs-staging": "nixpkgs-staging",
|
||||||
"nixpkgs-unstable": "nixpkgs-unstable",
|
"nixpkgs-unstable": "nixpkgs-unstable",
|
||||||
"nur": "nur",
|
"nur": "nur",
|
||||||
"ranger-icons": "ranger-icons",
|
"ranger-icons": "ranger-icons",
|
||||||
"ranger-sixel": "ranger-sixel",
|
"ranger-sixel": "ranger-sixel",
|
||||||
"sea-orm-cli": "sea-orm-cli",
|
"sea-orm-cli": "sea-orm-cli",
|
||||||
"wegank": "wegank"
|
"sway-vrr-fixed": "sway-vrr-fixed",
|
||||||
|
"wegank": "wegank",
|
||||||
|
"wlroots-vrr-fixed": "wlroots-vrr-fixed"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"rust-analyzer-src": {
|
"rust-analyzer-src": {
|
||||||
|
@ -337,6 +355,22 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"sway-vrr-fixed": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1670184101,
|
||||||
|
"narHash": "sha256-NNLaS/YhevRw7PzhvDQDUmr9Ef7VEkbuQ4kncwiG7Go=",
|
||||||
|
"owner": "swaywm",
|
||||||
|
"repo": "sway",
|
||||||
|
"rev": "e1b268af98edeb09e570e8855ef64f0719cbafe2",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "swaywm",
|
||||||
|
"repo": "sway",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"utils": {
|
"utils": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1667395993,
|
"lastModified": 1667395993,
|
||||||
|
@ -389,6 +423,23 @@
|
||||||
"repo": "wlroots",
|
"repo": "wlroots",
|
||||||
"type": "gitlab"
|
"type": "gitlab"
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"wlroots-vrr-fixed": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1643923194,
|
||||||
|
"narHash": "sha256-MFR38UuB/wW7J9ODDUOfgTzKLse0SSMIRYTpEaEdRwM=",
|
||||||
|
"ref": "0.15",
|
||||||
|
"rev": "29938b74251e826f3778f6bf9c54974a30488cc1",
|
||||||
|
"revCount": 5322,
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://gitlab.freedesktop.org/wlroots/wlroots"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"ref": "0.15",
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://gitlab.freedesktop.org/wlroots/wlroots"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"root": "root",
|
"root": "root",
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "nixpkgs/nixos-22.11";
|
nixpkgs.url = "nixpkgs/nixos-22.11";
|
||||||
nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
|
nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
|
||||||
|
nixpkgs-staging.url = "nixpkgs/staging";
|
||||||
home-manager.url = "github:nix-community/home-manager/release-22.11";
|
home-manager.url = "github:nix-community/home-manager/release-22.11";
|
||||||
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
nur.url = "github:nix-community/NUR";
|
nur.url = "github:nix-community/NUR";
|
||||||
|
@ -18,6 +19,11 @@
|
||||||
inputs.nixpkgs.follows = "nixpkgs-unstable";
|
inputs.nixpkgs.follows = "nixpkgs-unstable";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
sway-vrr-fixed = {
|
||||||
|
url = "github:swaywm/sway";
|
||||||
|
flake = false;
|
||||||
|
};
|
||||||
|
|
||||||
alacritty-sixel.url = "github:ayosec/alacritty";
|
alacritty-sixel.url = "github:ayosec/alacritty";
|
||||||
alacritty-sixel.flake = false;
|
alacritty-sixel.flake = false;
|
||||||
|
|
||||||
|
|
|
@ -6,6 +6,26 @@
|
||||||
(import ./sway.nix)
|
(import ./sway.nix)
|
||||||
(final: prev: {
|
(final: prev: {
|
||||||
unstable = inputs.nixpkgs-unstable.legacyPackages.${prev.system};
|
unstable = inputs.nixpkgs-unstable.legacyPackages.${prev.system};
|
||||||
|
staging = inputs.nixpkgs-staging.legacyPackages.${prev.system};
|
||||||
|
})
|
||||||
|
(final: prev: {
|
||||||
|
wlroots = prev.unstable.wlroots.overrideAttrs (old: {
|
||||||
|
src = inputs.wlroots-vrr-fixed;
|
||||||
|
nativeBuildInputs = old.nativeBuildInputs ++ [
|
||||||
|
pkgs.unstable.hwdata
|
||||||
|
(pkgs.unstable.libdrm.overrideAttrs (_: {
|
||||||
|
inherit (pkgs.staging.libdrm) version src;
|
||||||
|
}))
|
||||||
|
(pkgs.unstable.wayland-protocols.overrideAttrs (_: {
|
||||||
|
inherit (pkgs.staging.wayland-protocols) version src;
|
||||||
|
}))
|
||||||
|
];
|
||||||
|
});
|
||||||
|
})
|
||||||
|
(final: prev: {
|
||||||
|
sway = prev.unstable.sway.overrideAttrs (_: {
|
||||||
|
src = inputs.sway-vrr-fixed;
|
||||||
|
});
|
||||||
})
|
})
|
||||||
(final: prev: {
|
(final: prev: {
|
||||||
uservars = import ../user/variables.nix;
|
uservars = import ../user/variables.nix;
|
||||||
|
|
Loading…
Reference in a new issue