diff --git a/kat/default.nix b/kat/default.nix index 51a4b08..8424afc 100644 --- a/kat/default.nix +++ b/kat/default.nix @@ -72,7 +72,10 @@ in "nixos=${self-meta.nixpkgs-paths.nixpkgs}" ]; channel.enable = false; - settings.nix-path = config.nix.nixPath; + settings = { + nix-path = config.nix.nixPath; + experimental-features = [ "pipe-operator" ]; + }; package = pkgs.lix; }; diff --git a/kat/meta.nix b/kat/meta.nix index 4178d85..06a3bdf 100644 --- a/kat/meta.nix +++ b/kat/meta.nix @@ -71,7 +71,12 @@ let fqdn ; 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-src = pkgs.applyPatches { src = sources."nixpkgs-${version}"; diff --git a/npins/sources.json b/npins/sources.json index cad8cfe..80d1290 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -61,6 +61,34 @@ "url": null, "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": { "type": "Git", "repository": { @@ -123,4 +151,4 @@ } }, "version": 3 -} \ No newline at end of file +} diff --git a/shell.nix b/shell.nix index 66d361a..d47b2dd 100644 --- a/shell.nix +++ b/shell.nix @@ -1,6 +1,11 @@ let 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 pkgs.mkShell { packages = with pkgs; [ diff --git a/users/catvayor.nix b/users/catvayor.nix index 506854e..ba6ad61 100644 --- a/users/catvayor.nix +++ b/users/catvayor.nix @@ -68,6 +68,7 @@ pwvucontrol libnotify zathura + vlc discord signal-desktop