From b208413a08b7a5e1a7becfd6c87e2bc9a3deab76 Mon Sep 17 00:00:00 2001
From: scouckel <james.krinsky@gmail.com>
Date: Wed, 29 Apr 2026 05:22:36 -0500
Subject: lix + kernel cachix for linux-surface

---
 flake.nix                           | 11 +++++++++++
 modules/hosts/dragotha/dragotha.nix | 10 ++++++++++
 modules/hosts/tiamat/tiamat.nix     |  2 ++
 modules/hosts/vecna/vecna.nix       |  2 ++
 modules/nixosModules/createHost.nix |  7 +++++++
 5 files changed, 32 insertions(+)

diff --git a/flake.nix b/flake.nix
index 2948d2b..aa072a2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,6 +7,17 @@
     wrappers.url = "github:Lassulus/wrappers";
     wrapper-modules.url = "github:BirdeeHub/nix-wrapper-modules";
 
+    lix = {
+      url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz";
+      flake = false;
+    };
+
+    lix-module = {
+      url = "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.lix.follows = "lix";
+    };
+
     home-manager = {
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
diff --git a/modules/hosts/dragotha/dragotha.nix b/modules/hosts/dragotha/dragotha.nix
index 2108a72..82de721 100644
--- a/modules/hosts/dragotha/dragotha.nix
+++ b/modules/hosts/dragotha/dragotha.nix
@@ -5,6 +5,7 @@
 }: {
   flake.nixosConfigurations.dragotha = inputs.nixpkgs.lib.nixosSystem {
     modules = [
+      inputs.lix-module.nixosModules.default
       self.nixosModules.dragotha
       self.nixosModules.dragothaHardware
 
@@ -26,6 +27,15 @@
 
     boot.kernelParams = ["quiet"];
 
+    nix.settings = {
+      substituters = [
+        "https://linux-surface.cachix.org"
+      ];
+      trusted-public-keys = [
+        "linux-surface.cachix.org-1:h4xRj4dujnm9I9aL2V7OmUTiT7oEefGVwiI4UQrESsk="
+      ];
+    };
+
     hardware.graphics = {
       enable = true;
       enable32Bit = true;
diff --git a/modules/hosts/tiamat/tiamat.nix b/modules/hosts/tiamat/tiamat.nix
index 58c90b9..30f0a1f 100644
--- a/modules/hosts/tiamat/tiamat.nix
+++ b/modules/hosts/tiamat/tiamat.nix
@@ -5,6 +5,7 @@
 }: {
   flake.nixosConfigurations.tiamat = inputs.nixpkgs.lib.nixosSystem {
     modules = [
+      inputs.lix-module.nixosModules.default
       self.nixosModules.tiamat
       self.nixosModules.tiamatHardware
 
@@ -15,6 +16,7 @@
       self.nixosModules.tiamatNiri
       self.nixosModules.desktop
       self.nixosModules.nasClient
+      self.nixosModules.mullvad
     ];
   };
 
diff --git a/modules/hosts/vecna/vecna.nix b/modules/hosts/vecna/vecna.nix
index e2c9871..e6dedbf 100644
--- a/modules/hosts/vecna/vecna.nix
+++ b/modules/hosts/vecna/vecna.nix
@@ -5,6 +5,7 @@
 }: {
   flake.nixosConfigurations.vecna = inputs.nixpkgs.lib.nixosSystem {
     modules = [
+      inputs.lix-module.nixosModules.default
       self.nixosModules.vecna
       self.nixosModules.vecnaHardware
 
@@ -14,6 +15,7 @@
       self.nixosModules.vecnaNiri
       self.nixosModules.desktop
       self.nixosModules.nasClient
+      self.nixosModules.mullvad
     ];
   };
 
diff --git a/modules/nixosModules/createHost.nix b/modules/nixosModules/createHost.nix
index a74ac53..18fc915 100644
--- a/modules/nixosModules/createHost.nix
+++ b/modules/nixosModules/createHost.nix
@@ -78,6 +78,13 @@
       settings.PermitRootLogin = "no";
     };
 
+    programs.nh.enable = true;
+    programs.nh.clean = {
+      enable = true;
+      extraArgs = "--keep 3 --keep-since 3d";
+      dates = "weekly";
+    };
+
     system.stateVersion = "25.05";
   };
 }
-- 
cgit v1.3.1