feat(lix): use in colmena
This commit is contained in:
parent
e8f8a54b5d
commit
8b89374afa
5 changed files with 46 additions and 4 deletions
|
@ -72,7 +72,10 @@ in
|
||||||
"nixos=${self-meta.nixpkgs-paths.nixpkgs}"
|
"nixos=${self-meta.nixpkgs-paths.nixpkgs}"
|
||||||
];
|
];
|
||||||
channel.enable = false;
|
channel.enable = false;
|
||||||
settings.nix-path = config.nix.nixPath;
|
settings = {
|
||||||
|
nix-path = config.nix.nixPath;
|
||||||
|
experimental-features = [ "pipe-operator" ];
|
||||||
|
};
|
||||||
package = pkgs.lix;
|
package = pkgs.lix;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -71,7 +71,12 @@ let
|
||||||
fqdn
|
fqdn
|
||||||
;
|
;
|
||||||
patches = [ ./nginx-fallback.patch ] ++ config.patches;
|
patches = [ ./nginx-fallback.patch ] ++ config.patches;
|
||||||
overlay-paths = [ "${sources.kat-pkgs}/overlay.nix" ] ++ config.overlay-paths;
|
overlay-paths = [
|
||||||
|
"${sources.kat-pkgs}/overlay.nix"
|
||||||
|
(pkgs.writeText "lix-overlay.nix" ''
|
||||||
|
import "${sources.lix-overlay}/overlay.nix" { lix = ${sources.lix}; }
|
||||||
|
'')
|
||||||
|
] ++ config.overlay-paths;
|
||||||
nixpkgs-paths = {
|
nixpkgs-paths = {
|
||||||
nixpkgs-src = pkgs.applyPatches {
|
nixpkgs-src = pkgs.applyPatches {
|
||||||
src = sources."nixpkgs-${version}";
|
src = sources."nixpkgs-${version}";
|
||||||
|
|
|
@ -61,6 +61,34 @@
|
||||||
"url": null,
|
"url": null,
|
||||||
"hash": "0mjbbjqi80dmnljpccf2535x8i62y1gvcwb1xv27xl2b6mzn3f3j"
|
"hash": "0mjbbjqi80dmnljpccf2535x8i62y1gvcwb1xv27xl2b6mzn3f3j"
|
||||||
},
|
},
|
||||||
|
"lix": {
|
||||||
|
"type": "GitRelease",
|
||||||
|
"repository": {
|
||||||
|
"type": "Git",
|
||||||
|
"url": "https://git.lix.systems/lix-project/lix"
|
||||||
|
},
|
||||||
|
"pre_releases": false,
|
||||||
|
"version_upper_bound": null,
|
||||||
|
"release_prefix": null,
|
||||||
|
"version": "2.91.1",
|
||||||
|
"revision": "ad9d06f7838a25beec425ff406fe68721fef73be",
|
||||||
|
"url": null,
|
||||||
|
"hash": "0ibpbvc6871bqyab0msml2g2y3c6jvg6yb169lykg4257izss8c6"
|
||||||
|
},
|
||||||
|
"lix-overlay": {
|
||||||
|
"type": "GitRelease",
|
||||||
|
"repository": {
|
||||||
|
"type": "Git",
|
||||||
|
"url": "https://git.lix.systems/lix-project/nixos-module"
|
||||||
|
},
|
||||||
|
"pre_releases": false,
|
||||||
|
"version_upper_bound": null,
|
||||||
|
"release_prefix": null,
|
||||||
|
"version": "2.91.1-2",
|
||||||
|
"revision": "96824d606a6656650bbe436366bc89d5ee3a6573",
|
||||||
|
"url": null,
|
||||||
|
"hash": ""
|
||||||
|
},
|
||||||
"nixos-images": {
|
"nixos-images": {
|
||||||
"type": "Git",
|
"type": "Git",
|
||||||
"repository": {
|
"repository": {
|
||||||
|
|
|
@ -1,6 +1,11 @@
|
||||||
let
|
let
|
||||||
sources = import ./npins;
|
sources = import ./npins;
|
||||||
pkgs = import sources.nixpkgs-unstable { };
|
pkgs = import sources.nixpkgs-unstable {
|
||||||
|
overlays = [
|
||||||
|
(import "${sources.kat-pkgs}/overlay.nix")
|
||||||
|
(import "${sources.lix-overlay}/overlay.nix" { lix = "${sources.lix}"; })
|
||||||
|
];
|
||||||
|
};
|
||||||
in
|
in
|
||||||
pkgs.mkShell {
|
pkgs.mkShell {
|
||||||
packages = with pkgs; [
|
packages = with pkgs; [
|
||||||
|
|
|
@ -68,6 +68,7 @@
|
||||||
pwvucontrol
|
pwvucontrol
|
||||||
libnotify
|
libnotify
|
||||||
zathura
|
zathura
|
||||||
|
vlc
|
||||||
|
|
||||||
discord
|
discord
|
||||||
signal-desktop
|
signal-desktop
|
||||||
|
|
Loading…
Add table
Reference in a new issue