From fbb525b7f62a9b028aa1aa9698a3c155ded42205 Mon Sep 17 00:00:00 2001
From: "Alexander \"PapaTutuWawa" <papatutuwawa@polynom.me>
Date: Thu, 24 Feb 2022 11:25:43 +0100
Subject: [PATCH] base: Fix small things

---
 lib/baseSystem.nix | 10 ++++++++++
 lib/mkSystem.nix   |  2 +-
 lib/network.nix    |  2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/lib/baseSystem.nix b/lib/baseSystem.nix
index f9be1ee..926c62d 100644
--- a/lib/baseSystem.nix
+++ b/lib/baseSystem.nix
@@ -262,6 +262,16 @@ in {
     registry = {
       nixpkgs.flake = inputs.nixpkgs;
     };
+    settings = {
+      substituters = [
+        "https://cache.nixos.org/" # Official binary substitute
+        "https://nix-community.cachix.org/" # For emacsGccPgtk
+      ];
+      trusted-public-keys = [
+        "hydra.nixos.org-1:CNHJZBh9K4tP3EKF6FkkgeVYsS3ohTl+oS0Qa8bezVs=" # Official binary substitute
+        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" # nix-community
+      ];
+    };
   };
   
   boot = {
diff --git a/lib/mkSystem.nix b/lib/mkSystem.nix
index b412adc..836d139 100644
--- a/lib/mkSystem.nix
+++ b/lib/mkSystem.nix
@@ -52,7 +52,7 @@ in inputs.nixpkgs.lib.nixosSystem {
     # My module system
     (import ../modules)
     inputs.ostylk.nixosModules.nftables
-    inputs.tablet-mode.nixosModules
+    inputs.tablet-mode.nixosModule
 
     # Actual config
     (import ./baseSystem.nix)
diff --git a/lib/network.nix b/lib/network.nix
index 0fad2cc..323aca3 100644
--- a/lib/network.nix
+++ b/lib/network.nix
@@ -2,7 +2,7 @@ rec {
   network-base = "192.168.178";
 
   # A collection of IP addresses for various uses
-  miku = "${network-base}.38";
+  miku = "${network-base}.60";
   nishimiya = "${network-base}.59";
   tamaki = "${network-base}.27";
   mashu = "${network-base}.54";