From 5080d69f9d9c458b89e5a2a9f9c4daa9b5095d0f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 8 May 2024 11:16:20 +0200 Subject: [PATCH] Switch to lix --- flake.nix | 17 +++++++++++++++++ nixos/shared/default.nix | 2 ++ 2 files changed, 19 insertions(+) diff --git a/flake.nix b/flake.nix index b9741b2..45b9d48 100644 --- a/flake.nix +++ b/flake.nix @@ -5,6 +5,16 @@ # Nixpkgs nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + lix = { + url = "git+https://git@git.lix.systems/lix-project/lix?ref=refs/tags/2.90-beta.1"; + flake = false; + }; + lix-module = { + url = "git+https://git.lix.systems/lix-project/nixos-module"; + inputs.lix.follows = "lix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + nixos-hardware.url = "github:NixOS/nixos-hardware/master"; # Disko for declaratively setting disk formatting @@ -104,6 +114,7 @@ # linger, # pihole, lanzaboote, + lix-module, jovian, nixos-hardware, nix-index-database, @@ -156,6 +167,7 @@ disko.nixosModules.disko home-manager.nixosModules.home-manager nix-index-database.nixosModules.nix-index + lix-module.nixosModules.default catppuccin.nixosModules.catppuccin { home-manager.sharedModules = [ @@ -177,6 +189,7 @@ disko.nixosModules.disko home-manager.nixosModules.home-manager nix-index-database.nixosModules.nix-index + lix-module.nixosModules.default catppuccin.nixosModules.catppuccin { home-manager.sharedModules = [ @@ -197,6 +210,7 @@ disko.nixosModules.disko simple-nixos-mailserver.nixosModule catppuccin.nixosModules.catppuccin + lix-module.nixosModules.default { home-manager.sharedModules = [ inputs.catppuccin.homeManagerModules.catppuccin @@ -216,6 +230,7 @@ disko.nixosModules.disko jovian.nixosModules.jovian home-manager.nixosModules.home-manager + lix-module.nixosModules.default catppuccin.nixosModules.catppuccin { home-manager.sharedModules = [ @@ -237,6 +252,7 @@ home-manager.nixosModules.home-manager nix-index-database.nixosModules.nix-index catppuccin.nixosModules.catppuccin + lix-module.nixosModules.default { home-manager.sharedModules = [ inputs.plasma-manager.homeManagerModules.plasma-manager @@ -257,6 +273,7 @@ home-manager.nixosModules.home-manager nix-index-database.nixosModules.nix-index catppuccin.nixosModules.catppuccin + lix-module.nixosModules.default { home-manager.sharedModules = [ inputs.catppuccin.homeManagerModules.catppuccin diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index 43711d2..100badc 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -33,6 +33,8 @@ experimental-features = "nix-command flakes"; # Deduplicate and optimize nix store auto-optimise-store = true; + extra-substituters = ["https://cache.lix.systems"]; + trusted-public-keys = ["cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o="]; }; };