Styx: Try Lix

flake.lock

@@ -228,6 +228,39 @@
         "type": "github"
       }
     },
+    "flake-utils_3": {
+      "inputs": {
+        "systems": "systems_3"
+      },
+      "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"
+      }
+    },
     "gitignore": {
       "inputs": {
         "nixpkgs": [
@@ -291,6 +324,41 @@
         "type": "github"
       }
     },
+    "lix": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1718419213,
+        "narHash": "sha256-WY7BGnu5PnbK4O8cKKv9kvxwzZIGbIQUQLGPHFXitI0=",
+        "rev": "253546d5fbf8a5aa60ac8164c1b4f5794dc4e9d1",
+        "type": "tarball",
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/253546d5fbf8a5aa60ac8164c1b4f5794dc4e9d1.tar.gz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://git.lix.systems/lix-project/lix/archive/2.90.0-rc1.tar.gz"
+      }
+    },
+    "lix-module": {
+      "inputs": {
+        "flake-utils": "flake-utils_2",
+        "flakey-profile": "flakey-profile",
+        "lix": "lix",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1718778548,
+        "narHash": "sha256-64lB/NO6AQ6z6EDCemPSYZWX/Qc6Rt04cPia5T5v01g=",
+        "rev": "29ed1bb67751e5b107d08df35d18dda6d45324e9",
+        "type": "tarball",
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/29ed1bb67751e5b107d08df35d18dda6d45324e9.tar.gz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0-rc1.tar.gz"
+      }
+    },
     "mkalias": {
       "inputs": {
         "nixpkgs": [
@@ -516,13 +584,13 @@
     },
     "poetry2nix": {
       "inputs": {
-        "flake-utils": "flake-utils_2",
+        "flake-utils": "flake-utils_3",
         "nix-github-actions": "nix-github-actions",
         "nixpkgs": [
           "nifoc-overlay",
           "nixpkgs"
         ],
-        "systems": "systems_3",
+        "systems": "systems_4",
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
@@ -570,6 +638,7 @@
         "flake-parts": "flake-parts",
         "flake-root": "flake-root",
         "home-manager": "home-manager",
+        "lix-module": "lix-module",
         "mkalias": "mkalias",
         "neovim-nightly-overlay": "neovim-nightly-overlay",
         "nifoc-overlay": "nifoc-overlay",
@@ -612,6 +681,21 @@
       }
     },
     "systems_3": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_4": {
       "locked": {
         "lastModified": 1681028828,
         "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",

flake.nix

@@ -4,6 +4,13 @@
     nixos-unstable.url = "github:nixos/nixpkgs/nixos-unstable-small";
     # nixpkgs-master.url = "github:nixos/nixpkgs/master";
 
+    # Lix
+
+    lix-module = {
+      url = "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0-rc1.tar.gz";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     # Tools
 
     flake-parts.url = "github:hercules-ci/flake-parts";
@@ -81,7 +88,7 @@
       flake =
         let
           Styx = import ./system/flakes/Styx.nix {
-            inherit (inputs) nixpkgs home-manager nix-darwin agenix;
+            inherit (inputs) nixpkgs lix-module home-manager nix-darwin agenix;
             inherit inputs;
           };
 

system/flakes/Styx.nix

@@ -1,4 +1,4 @@
-{ nixpkgs, home-manager, nix-darwin, agenix, inputs, ... }:
+{ nixpkgs, lix-module, home-manager, nix-darwin, agenix, inputs, ... }:
 
 let
   default-system = "aarch64-darwin";
@@ -25,25 +25,28 @@ in
   system = nix-darwin.lib.darwinSystem {
     system = default-system;
     modules = [
-      ../hosts/Styx.nix
-
-      home-manager.darwinModules.home-manager
-
-      agenix.darwinModules.default
-
       {
         nixpkgs = nixpkgsConfig;
         nix = {
-          # nixPath = [ "nixpkgs=${nixpkgs}" ];
+          registry.nixpkgs.to = { type = "path"; path = nixpkgs.outPath; };
-          registry.nixpkgs.flake = nixpkgs;
+          nixPath = nixpkgs.lib.mkForce [ "nixpkgs=flake:nixpkgs" ];
         };
+      }
 
+      lix-module.nixosModules.default
+
+      home-manager.darwinModules.home-manager
+      {
         home-manager = {
           useGlobalPkgs = true;
           useUserPackages = true;
           users.daniel = import ../../home/hosts/Styx.nix;
         };
       }
+
+      agenix.darwinModules.default
+
+      ../hosts/Styx.nix
     ];
   };
 }

system/hosts/Styx.nix

@@ -1,5 +1,3 @@
-{ pkgs, ... }:
-
 let
   homeDir = "/Users/daniel";
 in
@@ -18,7 +16,7 @@ in
   ];
 
   nix = {
-    package = pkgs.nixVersions.stable;
+    # package = pkgs.nixVersions.stable;
 
     settings = {
       experimental-features = [ "nix-command" "flakes" ];
@@ -36,6 +34,8 @@ in
         "https://attic.cache.daniel.sx/nifoc-systems?priority=30"
         "https://nix-community.cachix.org?priority=50"
         "https://cache.garnix.io?priority=60"
+        "https://cache.lix.systems?priority=70"
+        "https://pre-commit-hooks.cachix.org?priority=80"
       ];
 
       extra-trusted-substituters = [
@@ -46,6 +46,8 @@ in
         "nifoc-systems:eDDqVP5BFR6/1KvXbF9oUL8JahDdmbrsYtxlQ57LOTU="
         "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
         "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
+        "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o="
+        "pre-commit-hooks.cachix.org-1:Pkk3Panw5AW24TOv6kz3PvLhlH8puAsJTBbOPmBo7Rc="
 
         # extra-trusted-substituters
         "devshells:YXtbU0DheB229oCr2D0H0qHjj2Ed/e2VZiLSXgQ1IVA="