summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDevin Finlinson <devin.finlinson@pm.me>2024-06-02 18:40:02 -0600
committerDevin Finlinson <devin.finlinson@pm.me>2024-06-02 18:40:02 -0600
commit1d39c2ad9066452b3e3f639d2323cf61a9a6a818 (patch)
treea3624a19938a1e5eacfad91281d0662e2adaa6d3
parentc0161445b6a14255cf75f09e17ba28f49ed5f5b1 (diff)
lix is an alternative to the cppnix compiler
-rw-r--r--flake.lock98
-rw-r--r--flake.nix14
-rw-r--r--modules/nixos/nix-common.nix2
3 files changed, 110 insertions, 4 deletions
diff --git a/flake.lock b/flake.lock
index e54b90b..7cbe5e8 100644
--- a/flake.lock
+++ b/flake.lock
@@ -112,6 +112,39 @@
"type": "github"
}
},
+ "flake-utils": {
+ "inputs": {
+ "systems": "systems_2"
+ },
+ "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": [
@@ -174,11 +207,11 @@
"xdph": "xdph"
},
"locked": {
- "lastModified": 1717352589,
- "narHash": "sha256-uA6kIOVFnadGzomQ3QUIAOA6/SI2kyBYoF5gR/xCusY=",
+ "lastModified": 1717362715,
+ "narHash": "sha256-u+vzlsasYoLH2SCekT2kVgC1kheLFSbWDMr7wA9AmgA=",
"owner": "hyprwm",
"repo": "Hyprland",
- "rev": "6868a39f1145dcb11c1d721e765077f21128e80c",
+ "rev": "358e59e69d27a69381bc0872b5b8d1184bc6b6a1",
"type": "github"
},
"original": {
@@ -264,6 +297,48 @@
"type": "github"
}
},
+ "lix": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1714955862,
+ "narHash": "sha256-REWlo2RYHfJkxnmZTEJu3Cd/2VM+wjjpPy7Xi4BdDTQ=",
+ "ref": "refs/tags/2.90-beta.1",
+ "rev": "b6799ab0374a8e1907a48915d3187e07da41d88c",
+ "revCount": 15501,
+ "type": "git",
+ "url": "https://git.lix.systems/lix-project/lix"
+ },
+ "original": {
+ "ref": "refs/tags/2.90-beta.1",
+ "type": "git",
+ "url": "https://git.lix.systems/lix-project/lix"
+ }
+ },
+ "lix-module": {
+ "inputs": {
+ "flake-utils": "flake-utils",
+ "flakey-profile": "flakey-profile",
+ "lix": [
+ "lix"
+ ],
+ "nixpkgs": [
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1717036776,
+ "narHash": "sha256-joKTxvywYlKspGGKOIXho6oRbggOPyayEqAyuZCavO0=",
+ "ref": "refs/heads/main",
+ "rev": "b4b38e6b5fe18da9464f291ae5fbf2ea9acb9ccb",
+ "revCount": 86,
+ "type": "git",
+ "url": "https://git.lix.systems/lix-project/nixos-module"
+ },
+ "original": {
+ "type": "git",
+ "url": "https://git.lix.systems/lix-project/nixos-module"
+ }
+ },
"nix-colors": {
"inputs": {
"base16-schemes": "base16-schemes",
@@ -392,6 +467,8 @@
"catppuccin-starship": "catppuccin-starship",
"home-manager": "home-manager",
"hyprland": "hyprland",
+ "lix": "lix",
+ "lix-module": "lix-module",
"nix-colors": "nix-colors",
"nixos-generators": "nixos-generators",
"nixpkgs": "nixpkgs",
@@ -415,6 +492,21 @@
"type": "github"
}
},
+ "systems_2": {
+ "locked": {
+ "lastModified": 1681028828,
+ "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+ "owner": "nix-systems",
+ "repo": "default",
+ "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-systems",
+ "repo": "default",
+ "type": "github"
+ }
+ },
"wallpapers": {
"flake": false,
"locked": {
diff --git a/flake.nix b/flake.nix
index 68495fa..7892ea5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -13,6 +13,17 @@
inputs.nixpkgs.follows = "nixpkgs-unstable";
};
+ # alternative nix compiler
+ lix = {
+ url = "git+https://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";
+ };
+
# modern window compositor
hyprland = {
url = "github:hyprwm/Hyprland";
@@ -304,7 +315,8 @@
specialArgs = { inherit inputs; };
modules = [
./machines/khad/configuration.nix
-
+ lix-module.nixosModules.default
+
./modules/users/defin.nix
./modules/users/root.nix
diff --git a/modules/nixos/nix-common.nix b/modules/nixos/nix-common.nix
index 237f83f..a3d291b 100644
--- a/modules/nixos/nix-common.nix
+++ b/modules/nixos/nix-common.nix
@@ -5,6 +5,8 @@
# Users allowed to run nix
allowed-users = [ "root" "@wheel" "@builders" "@video" ];
experimental-features = [ "nix-command" "flakes" ];
+ extra-substituters = [ "https://cache.lix.systems" ];
+ trusted-public-keys = [ "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o=" ];
};
# Clean up old generations after 30 days