From 5e4aa0d7dde257ae5ec7fb5a693489169aa293c0 Mon Sep 17 00:00:00 2001 From: Niten Date: Sat, 29 May 2021 13:08:55 -0700 Subject: [PATCH] Evolution --- config/host-config/plato.nix | 4 ++++ config/host-config/procul.nix | 1 + config/profile-config/common-ui.nix | 3 ++- home-manager/niten.nix | 2 ++ lib/fudo/git.nix | 2 +- 5 files changed, 10 insertions(+), 2 deletions(-) diff --git a/config/host-config/plato.nix b/config/host-config/plato.nix index 009dd2a..8b12ffe 100644 --- a/config/host-config/plato.nix +++ b/config/host-config/plato.nix @@ -6,6 +6,10 @@ let primary-ip = "10.0.0.21"; in { config = { + boot.kernelParams = [ "nomodeset" ]; + + console.font = "VGA"; + fudo.secrets = { host-secrets.plato = { host-keytab = { diff --git a/config/host-config/procul.nix b/config/host-config/procul.nix index f2a4d5b..cc05c27 100644 --- a/config/host-config/procul.nix +++ b/config/host-config/procul.nix @@ -4,6 +4,7 @@ with lib; let hostname = "procul"; host-ipv4 = "172.86.179.18"; + git-ipv4 = "172.86.179.19"; domain = config.fudo.hosts.${hostname}.domain; site = config.fudo.hosts.${hostname}.site; host-fqdn = "${hostname}.${domain}"; diff --git a/config/profile-config/common-ui.nix b/config/profile-config/common-ui.nix index 90ef2bd..8506b4c 100644 --- a/config/profile-config/common-ui.nix +++ b/config/profile-config/common-ui.nix @@ -18,7 +18,8 @@ in { ]; }; - system = { autoUpgrade.enable = true; }; + # We're deploying via nixops, this is just annoying + system = { autoUpgrade.enable = false; }; services = { xserver = mkIf enable-gui { diff --git a/home-manager/niten.nix b/home-manager/niten.nix index 9741cea..dd4e27b 100644 --- a/home-manager/niten.nix +++ b/home-manager/niten.nix @@ -11,6 +11,7 @@ let enable-gui = host-config.enable-gui; gui-packages = with pkgs; [ + exodus firefox jq openttd @@ -37,6 +38,7 @@ let git gnutls gnupg + google-chrome guile imagemagick ipfs diff --git a/lib/fudo/git.nix b/lib/fudo/git.nix index 7dba9b7..6893da8 100644 --- a/lib/fudo/git.nix +++ b/lib/fudo/git.nix @@ -129,7 +129,7 @@ in { settings = mkIf (cfg.ssh != null) { server = { SSH_DOMAIN = cfg.hostname; - # SSH_LISTEN_PORT = cfg.ssh.listen-port; + SSH_LISTEN_PORT = cfg.ssh.listen-port; SSH_LISTEN_HOST = cfg.ssh.listen-ip; }; };