fix bobi configuration

This commit is contained in:
Ingolf Wagner 2023-04-28 14:20:03 +02:00
parent 50cec47e23
commit c2b03b56fe
No known key found for this signature in database
GPG key ID: 76BF5F1928B9618B
4 changed files with 18 additions and 20 deletions

View file

@ -276,7 +276,8 @@
}; };
bobi = { name, nodes, pkgs, ... }: { bobi = { name, nodes, pkgs, ... }: {
deployment.targetHost = "${name}.private"; #deployment.targetHost = "${name}.private";
deployment.targetHost = "192.168.178.31";
deployment.buildOnTarget = false; deployment.buildOnTarget = false;
deployment.tags = [ "desktop" "usb" "private" ]; deployment.tags = [ "desktop" "usb" "private" ];
imports = [ imports = [
@ -291,8 +292,7 @@
}; };
mobi = { name, nodes, pkgs, ... }: { mobi = { name, nodes, pkgs, ... }: {
#deployment.targetHost = "${name}.private"; deployment.targetHost = "${name}.private";
deployment.targetHost = "192.168.178.31";
deployment.buildOnTarget = false; deployment.buildOnTarget = false;
deployment.tags = [ "desktop" "usb" "private" ]; deployment.tags = [ "desktop" "usb" "private" ];
imports = [ imports = [

View file

@ -2,6 +2,7 @@
imports = [ imports = [
../../components
../../system/desktop ../../system/desktop
./hardware-configuration.nix ./hardware-configuration.nix
./tinc.nix ./tinc.nix
@ -24,11 +25,13 @@
}; };
}; };
components.gui.enable = true;
# fonts # fonts
# ----- # -----
programs.custom.urxvt.fontSize = 12; programs.custom.urxvt.fontSize = 16;
programs.custom.xterm.fontSize = 12; programs.custom.urxvt.fontType = "vector";
system.custom.fonts.dpi = 100; programs.custom.xterm.fontSize = 16;
configuration.desktop = { configuration.desktop = {
width = 1366; width = 1366;
@ -63,11 +66,12 @@
EDITOR=vim EDITOR=vim
''; '';
boot.supportedFilesystems = [ "zfs" ];
networking.hostId = "2ed43034";
services.openssh.enable = true; services.openssh.enable = true;
components.network.sshd.onlyTincAccess = false; 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" ]; 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 # This value determines the NixOS release from which the default

View file

@ -1,14 +1,5 @@
{ config, lib, pkgs, ... }: { config, ... }:
with lib;
{ {
module.cluster.services.tinc = { tinc.private.enable = true;
"private" = { tinc.private.ipv4 = "10.23.42.25";
enable = true;
openPort = true;
connectTo = [ "robi" ];
};
};
} }

View file

@ -66,6 +66,9 @@
EDITOR=vim EDITOR=vim
''; '';
boot.supportedFilesystems = [ "zfs" ];
networking.hostId = "5794a3f8";
services.openssh.enable = true; services.openssh.enable = true;
components.network.sshd.onlyTincAccess = false; components.network.sshd.onlyTincAccess = false;