maddie/config
1
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: switch to lix as the cppnix package

Browse Source
This commit is contained in:
Maddie H 2024-10-07 17:01:09 +01:00
parent 0afd702ecc
commit 72ae8fa7d3
Signed by: maddie
GPG Key ID: C296DE8C9053683F
3 changed files with 98 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
flake.lock
View File

@ -115,6 +115,39 @@
"type": "github"
}
},
"flake-utils_2": {
"inputs": {
"systems": "systems_4"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flakey-profile": {
"locked": {
"lastModified": 1712898590,
"narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=",
"owner": "lf-",
"repo": "flakey-profile",
"rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d",
"type": "github"
},
"original": {
"owner": "lf-",
"repo": "flakey-profile",
"type": "github"
}
},
"home-manager": {
"inputs": {
"nixpkgs": [
@ -299,6 +332,44 @@
"type": "github"
}
},
"lix": {
"flake": false,
"locked": {
"lastModified": 1723503926,
"narHash": "sha256-Rosl9iA9MybF5Bud4BTAQ9adbY81aGmPfV8dDBGl34s=",
"rev": "bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2",
"type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2.tar.gz?rev=bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2"
},
"original": {
"type": "tarball",
"url": "https://git.lix.systems/lix-project/lix/archive/2.91.0.tar.gz"
}
},
"lix-module": {
"inputs": {
"flake-utils": "flake-utils",
"flakey-profile": "flakey-profile",
"lix": "lix",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1723510904,
"narHash": "sha256-zNW/rqNJwhq2lYmQf19wJerRuNimjhxHKmzrWWFJYts=",
"ref": "refs/tags/2.91.0",
"rev": "622a2253a071a1fb97a4d3c8103a91114acc1140",
"revCount": 104,
"type": "git",
"url": "https://git.lix.systems/lix-project/nixos-module"
},
"original": {
"ref": "refs/tags/2.91.0",
"type": "git",
"url": "https://git.lix.systems/lix-project/nixos-module"
}
},
"nix-darwin": {
"inputs": {
"nixpkgs": [
@ -340,6 +411,7 @@
"anyrun": "anyrun",
"home-manager": "home-manager",
"hyprland": "hyprland",
"lix-module": "lix-module",
"nix-darwin": "nix-darwin",
"nixpkgs": "nixpkgs",
"woomer": "woomer"
@ -390,10 +462,25 @@
"type": "github"
}
},
"systems_4": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"woomer": {
"inputs": {
"crane": "crane",
"flake-utils": "flake-utils",
"flake-utils": "flake-utils_2",
"nixpkgs": [
"nixpkgs"
]

8
flake.nix
View File

@ -24,6 +24,10 @@
# Woomer
woomer.url = "github:coffeeispower/woomer";
woomer.inputs.nixpkgs.follows = "nixpkgs";
# Lix Module
lix-module.url = "git+https://git.lix.systems/lix-project/nixos-module?ref=refs/tags/2.91.0";
lix-module.inputs.nixpkgs.follows = "nixpkgs";
};
outputs = { self, nixpkgs, home-manager, nix-darwin, ... } @ inputs:
@ -67,6 +71,7 @@
# NixOS Modules
./systems/desktop
inputs.lix-module.nixosModules.default
];
};
@ -75,6 +80,7 @@
system = "aarch64-darwin";
specialArgs = {
inherit username;
inherit inputs;
};
modules = [
# Home Manager Modules
@ -83,6 +89,7 @@
home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = {
inherit username;
inherit inputs;
pkgs = nixpkgs_aarch64_darwin;
};
home-manager.users.${username}.imports = [
@ -93,6 +100,7 @@
# Nix Darwin Modules
./systems/laptop
inputs.lix-module.nixosModules.default
];
};

5
systems/laptop/nix.nix
View File

@ -1,9 +1,8 @@
{ pkgs, lib, ... }:
{ pkgs, lib, inputs, ... }:
{
nix = {
package = pkgs.nixVersions.latest;
package = lib.mkForce inputs.lix-module.packages.${pkgs.stdenv.hostPlatform.system}.default;
settings = {
experimental-features = [ "nix-command" "flakes" ];
auto-optimise-store = true;