From c2b03b56feedc8a050e7fd551a874e48d0efe3ce Mon Sep 17 00:00:00 2001
From: Ingolf Wagner <contact@ingolf-wagner.de>
Date: Fri, 28 Apr 2023 14:20:03 +0200
Subject: [PATCH] fix bobi configuration

---
 flake.nix                             |  6 +++---
 nixos/machines/bobi/configuration.nix | 14 +++++++++-----
 nixos/machines/bobi/tinc.nix          | 15 +++------------
 nixos/machines/mobi/configuration.nix |  3 +++
 4 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/flake.nix b/flake.nix
index 8e6530c..ed63b08 100644
--- a/flake.nix
+++ b/flake.nix
@@ -276,7 +276,8 @@
           };
 
           bobi = { name, nodes, pkgs, ... }: {
-            deployment.targetHost = "${name}.private";
+            #deployment.targetHost = "${name}.private";
+            deployment.targetHost = "192.168.178.31";
             deployment.buildOnTarget = false;
             deployment.tags = [ "desktop" "usb" "private" ];
             imports = [
@@ -291,8 +292,7 @@
           };
 
           mobi = { name, nodes, pkgs, ... }: {
-            #deployment.targetHost = "${name}.private";
-            deployment.targetHost = "192.168.178.31";
+            deployment.targetHost = "${name}.private";
             deployment.buildOnTarget = false;
             deployment.tags = [ "desktop" "usb" "private" ];
             imports = [
diff --git a/nixos/machines/bobi/configuration.nix b/nixos/machines/bobi/configuration.nix
index 5d05f4a..12527e9 100644
--- a/nixos/machines/bobi/configuration.nix
+++ b/nixos/machines/bobi/configuration.nix
@@ -2,6 +2,7 @@
 
   imports = [
 
+    ../../components
     ../../system/desktop
     ./hardware-configuration.nix
     ./tinc.nix
@@ -24,11 +25,13 @@
     };
   };
 
+  components.gui.enable = true;
+
   # fonts
   # -----
-  programs.custom.urxvt.fontSize = 12;
-  programs.custom.xterm.fontSize = 12;
-  system.custom.fonts.dpi = 100;
+  programs.custom.urxvt.fontSize = 16;
+  programs.custom.urxvt.fontType = "vector";
+  programs.custom.xterm.fontSize = 16;
 
   configuration.desktop = {
     width = 1366;
@@ -63,11 +66,12 @@
     EDITOR=vim
   '';
 
+  boot.supportedFilesystems = [ "zfs" ];
+  networking.hostId = "2ed43034";
+
   services.openssh.enable = true;
   components.network.sshd.onlyTincAccess = false;
 
-  nix.settings.max-jobs = lib.mkDefault 1;
-
   users.users.root.openssh.authorizedKeys.keys = [ "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC6uza62+Go9sBFs3XZE2OkugBv9PJ7Yv8ebCskE5WYPcahMZIKkQw+zkGI8EGzOPJhQEv2xk+XBf2VOzj0Fto4nh8X5+Llb1nM+YxQPk1SVlwbNAlhh24L1w2vKtBtMy277MF4EP+caGceYP6gki5+DzlPUSdFSAEFFWgN1WPkiyUii15Xi3QuCMR8F18dbwVUYbT11vwNhdiAXWphrQG+yPguALBGR+21JM6fffOln3BhoDUp2poVc5Qe2EBuUbRUV3/fOU4HwWVKZ7KCFvLZBSVFutXCj5HuNWJ5T3RuuxJSmY5lYuFZx9gD+n+DAEJt30iXWcaJlmUqQB5awcB1S2d9pJ141V4vjiCMKUJHIdspFrI23rFNYD9k2ZXDA8VOnQE33BzmgF9xOVh6qr4G0oEpsNqJoKybVTUeSyl4+ifzdQANouvySgLJV/pcqaxX1srSDIUlcM2vDMWAs3ryCa0aAlmAVZIHgRhh6wa+IXW8gIYt+5biPWUuihJ4zGBEwkyVXXf2xsecMWCAGPWPDL0/fBfY9krNfC5M2sqxey2ShFIq+R/wMdaI7yVjUCF2QIUNiIdFbJL6bDrDyHnEXJJN+rAo23jUoTZZRv7Jq3DB/A5H7a73VCcblZyUmwMSlpg3wos7pdw5Ctta3zQPoxoAKGS1uZ+yTeZbPMmdbw== contact@ingolf-wagner.de" ];
 
   # This value determines the NixOS release from which the default
diff --git a/nixos/machines/bobi/tinc.nix b/nixos/machines/bobi/tinc.nix
index c1713c3..2693db2 100644
--- a/nixos/machines/bobi/tinc.nix
+++ b/nixos/machines/bobi/tinc.nix
@@ -1,14 +1,5 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
+{ config, ... }:
 {
-  module.cluster.services.tinc = {
-    "private" = {
-      enable = true;
-      openPort = true;
-      connectTo = [ "robi" ];
-    };
-  };
-
+  tinc.private.enable = true;
+  tinc.private.ipv4 = "10.23.42.25";
 }
diff --git a/nixos/machines/mobi/configuration.nix b/nixos/machines/mobi/configuration.nix
index 5f502bd..a365d01 100644
--- a/nixos/machines/mobi/configuration.nix
+++ b/nixos/machines/mobi/configuration.nix
@@ -66,6 +66,9 @@
     EDITOR=vim
   '';
 
+  boot.supportedFilesystems = [ "zfs" ];
+  networking.hostId = "5794a3f8";
+
   services.openssh.enable = true;
   components.network.sshd.onlyTincAccess = false;