Skip to content

Commit

Permalink
feat(nix): lets try the Lix fork, the performance enhancements sound …
Browse files Browse the repository at this point in the history
…quite good
  • Loading branch information
dr460nf1r3 committed May 7, 2024
1 parent ef42d00 commit ad0dfb3
Show file tree
Hide file tree
Showing 4 changed files with 82 additions and 4 deletions.
63 changes: 63 additions & 0 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,18 @@
inputs.pre-commit-hooks-nix.follows = "pre-commit-hooks";
};

# The Lix package manager (fork of Nix)
lix = {
url = "git+https://[email protected]/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.flake-utils.follows = "chaotic-nyx/flake-utils";
inputs.lix.follows = "lix";
inputs.nixpkgs.follows = "chaotic-nyx/nixpkgs";
};

# Nix gaming-related packages and modules
nix-gaming = {
url = "github:fufexan/nix-gaming";
Expand Down
1 change: 1 addition & 0 deletions nixos/flake-module.nix
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
inputs.disko.nixosModules.disko
inputs.hosts.nixosModule
inputs.lanzaboote.nixosModules.lanzaboote
inputs.lix-module.nixosModules.default
inputs.sops-nix.nixosModules.sops
inputs.spicetify-nix.nixosModule
];
Expand Down
10 changes: 6 additions & 4 deletions nixos/modules/nix.nix
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,7 @@ in {
'';

# Make use of nix-super if it is enabled, else use latest available
package =
if cfgSuper.enable
then pkgs.nixSuper
else pkgs.nixVersions.nix_2_22;
package = lib.mkIf cfgSuper.enable pkgs.nixSuper;

# Nix.conf settings
settings = {
Expand All @@ -107,6 +104,9 @@ in {
# Test out ca-derivations (https://nixos.wiki/wiki/Ca-derivations)
experimental-features = ["ca-derivations"];

# Lix cache
extra-substituters = ["https://cache.lix.systems"];

# For direnv GC roots
keep-derivations = true;
keep-outputs = true;
Expand Down Expand Up @@ -142,6 +142,8 @@ in {
"https://pre-commit-hooks.cachix.org" # pre commit hooks
"https://cache.garnix.io" # extra things here and there
];

trusted-public-keys = ["cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o="];
};
};

Expand Down

0 comments on commit ad0dfb3

Please sign in to comment.