Luj/snowfield
1
0
Fork 0
mirror of https://github.com/JulienMalka/snowfield.git synced 2025-04-01 09:40:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore: use upstream lix

Browse source
This commit is contained in:
Julien Malka 2024-06-25 10:12:15 +02:00
parent 2fc092f395
commit 46a8a443dc
Signed by: Luj
GPG key ID: 6FC74C847011FD83
2 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/mkmachine.nix
View file

@ -37,18 +37,11 @@ import "${nixpkgs}/nixos/lib/eval-config.nix" {
(import "${inputs.impermanence}/nixos.nix") (import "${inputs.impermanence}/nixos.nix")
(import inputs.lanzaboote).nixosModules.lanzaboote (import inputs.lanzaboote).nixosModules.lanzaboote
(import inputs.lila).nixosModules.hash-collection (import inputs.lila).nixosModules.hash-collection
(import "${inputs.lix-module}/module.nix" { inherit (inputs) lix; })
{ {
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
nixpkgs.system = system; nixpkgs.system = system;
networking.hostName = name; networking.hostName = name;
nixpkgs.overlays = lib.mkAfter [ nixpkgs.overlays = lib.mkAfter [
# TODO: Remove when https://git.lix.systems/lix-project/lix/issues/310 is fixed
(_: prev: {
nix = prev.nix.overrideAttrs (_: {
doCheck = false;
});
})
(overlay-unstable system) (overlay-unstable system)
(_final: prev: { (_final: prev: {
waybar = prev.waybar.overrideAttrs (oldAttrs: { waybar = prev.waybar.overrideAttrs (oldAttrs: {

3
modules/nix/default.nix
View file

@ -2,6 +2,7 @@
config, config,
lib, lib,
inputs, inputs,
pkgs,
... ...
}: }:
let let
@ -16,7 +17,7 @@ with lib;
config = mkIf cfg.enable { config = mkIf cfg.enable {
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
nix = { nix = {
#package = pkgs.unstable.nix; package = pkgs.unstable.lix;
extraOptions = '' extraOptions = ''
experimental-features = nix-command flakes experimental-features = nix-command flakes
''; '';