From e9788650e4bef53e77794a7bec5e37e5a1946a92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Mon, 21 Jul 2025 17:02:17 +0200
Subject: nixos: move ridcully

---
 nixos/configurations/adm-omnia.nix |  1 -
 nixos/configurations/ridcully.nix  | 10 ++--------
 nixos/configurations/spt-omnia.nix |  1 +
 nixos/modules/hosts.nix            |  6 +++---
 4 files changed, 6 insertions(+), 12 deletions(-)

(limited to 'nixos')

diff --git a/nixos/configurations/adm-omnia.nix b/nixos/configurations/adm-omnia.nix
index 55ee733..2b80bbc 100644
--- a/nixos/configurations/adm-omnia.nix
+++ b/nixos/configurations/adm-omnia.nix
@@ -15,7 +15,6 @@ in {
       wan = "pppoe-wan";
       lanIP = hosts.omnia;
       staticLeases = {
-        "70:85:c2:4a:59:f2" = hosts.ridcully;
         "7c:b0:c2:bb:9c:ca" = hosts.albert;
         "4c:d5:77:0d:85:d9" = hosts.binky;
         "b8:27:eb:49:54:5a" = hosts.mpd;
diff --git a/nixos/configurations/ridcully.nix b/nixos/configurations/ridcully.nix
index 0b2705c..3dd9beb 100644
--- a/nixos/configurations/ridcully.nix
+++ b/nixos/configurations/ridcully.nix
@@ -1,10 +1,4 @@
-{
-  lib,
-  pkgs,
-  ...
-}: let
-  inherit (lib) mkDefault;
-in {
+{pkgs, ...}: {
   system.stateVersion = "24.05";
   nixpkgs.hostPlatform.system = "x86_64-linux";
   deploy.enable = true;
@@ -79,5 +73,5 @@ in {
   };
 
   # Force nix to use less jobs
-  nix.settings.max-jobs = 8;
+  nix.settings.max-jobs = 4;
 }
diff --git a/nixos/configurations/spt-omnia.nix b/nixos/configurations/spt-omnia.nix
index 1809b2a..9abe74f 100644
--- a/nixos/configurations/spt-omnia.nix
+++ b/nixos/configurations/spt-omnia.nix
@@ -15,6 +15,7 @@ in {
       lanIP = hosts.omnia;
       staticLeases = {
         "a8:a1:59:10:32:c4" = hosts.errol;
+        "70:85:c2:4a:59:f2" = hosts.ridcully;
         "7c:b0:c2:bb:9c:ca" = hosts.albert;
         "4c:d5:77:0d:85:d9" = hosts.binky;
         "b8:27:eb:57:a2:31" = hosts.mpd;
diff --git a/nixos/modules/hosts.nix b/nixos/modules/hosts.nix
index 5604792..9affe19 100644
--- a/nixos/modules/hosts.nix
+++ b/nixos/modules/hosts.nix
@@ -53,6 +53,7 @@ in {
         # Local
         "mpd" = "10.8.2.51";
         "errol" = "10.8.2.60";
+        "ridcully" = "10.8.2.59";
         "printer" = "10.8.2.90";
         # Portable
         "albert" = "10.8.2.61";
@@ -63,7 +64,6 @@ in {
         "omnia" = "10.8.3.1";
         "omnia2" = "10.8.3.3";
         # Local
-        "ridcully" = "10.8.3.60";
         "3dprint" = "10.8.3.80";
         "mpd" = "10.8.3.51";
         "printer" = "192.168.1.20";
@@ -91,14 +91,14 @@ in {
       "${cnf.spt.mox2}" = ["mox2.spt"];
       "10.8.2.4" = ["mi3g.spt"];
       "${cnf.spt.mpd}" = ["mpd.spt"];
-      "${cnf.spt.errol}" = ["errol" "desktop.spt"];
+      "${cnf.spt.errol}" = ["errol"];
+      "${cnf.spt.ridcully}" = ["ridcully"];
       "${cnf.spt.albert}" = ["albert.spt"];
       "${cnf.spt.binky}" = ["binky.spt"];
       # Adm
       "${cnf.adm.omnia}" = ["omnia.adm"];
       "10.8.3.2" = ["redmi.adm"];
       "${cnf.adm.omnia2}" = ["omnia2.adm"];
-      "${cnf.adm.ridcully}" = ["ridcully" "desktop.adm"];
       "${cnf.adm.albert}" = ["albert.adm"];
       "${cnf.adm.binky}" = ["binky.adm"];
       "${cnf.adm."3dprint"}" = ["3dprint"];
-- 
cgit v1.2.3