Merge branch 'main' into sleipner-authorised-keys

base: openssh added sleipner ssh keys
Merge pull request 'base openssh added sleipner ssh keys' (!83 ) from sleipner-authorised-keys into main
2025-12-19 16:17:15 +01:00 · 2024-10-12 22:29:10 +02:00 · 2024-10-12 22:28:14 +02:00 · 2024-10-12 21:48:08 +02:00 · 2024-10-12 21:47:31 +02:00 · 2024-10-08 14:08:17 +02:00
4 changed files with 15 additions and 9 deletions
--- a/base/networking.nix
+++ b/base/networking.nix
@@ -1,16 +1,13 @@
 { lib, values, ... }:
 {
+  systemd.network.enable = true;
  networking.domain = "pvv.ntnu.no";
  networking.useDHCP = false;
-  # networking.search = [ "pvv.ntnu.no" "pvv.org" ];
-  # networking.nameservers = lib.mkDefault [ "129.241.0.200" "129.241.0.201" ];
-  # networking.tempAddresses = lib.mkDefault "disabled";
-  # networking.defaultGateway = values.hosts.gateway;

-  systemd.network.enable = true;
+  # The rest of the networking configuration is usually sourced from /values.nix

  services.resolved = {
    enable = lib.mkDefault true;
    dnssec = "false"; # Supposdly this keeps breaking and the default is to allow downgrades anyways...
  };
-}
+}
--- a/base/services/openssh.nix
+++ b/base/services/openssh.nix
@@ -10,5 +10,12 @@
      Match All
    '';
    settings.PermitRootLogin = "yes";
+
+    users.users."root".openssh.authorizedKeys.keys = [
+      "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCqVt4LCe0YIttr9swFxjkjn37ZDY9JxwVC+2gvfSINDJorOCtqPjDOTD2fTS1Gz08QCwpnLWq2kyvRchu6WgriAbSACpbZZBgxRaF/FVh3oiMVFGnNKGnv6/fdo/vZtu8mUVuqtmTrgLYpZdbR4oD3XiBlDKs7Cv5hPqt95lnP6MNFvE8mICCfd1PwhsABd2IQ5laz3u77/RXhNFJL0Kf2/+6gk9awcLuwHrPdvq7c3BxRHbc9UMRQENyjyQPa7aLe+uJBFLKP51I8VBuDpDacuibQx7nMt6N2UJ2KWI0JxRMHuJNq4S5jidR82aOw9gzGbTv30SKNLMqsZ0xj4LtdqCXDiZF6Lr09PsJYsvnBUFWa14HGcThKDtgwQwBryNViYmfv//0h9+RLZiU0ab+NEwSs7Zh5iAD+vhx64QqNX3tR7Le4SWXh8W0eShU9N78qYdSkiC3Ui7htxeqOocXM/P4AwbnHsLELIvkHdvgchCPvl8ygZa4WJTEWv16+ICskJcAKWGuqjvXAFuwjJJmPp9xLW9O0DFfQhMELiGamQR9wK07yYQVr34iah6qZO7cwhSKyEPFrVPIaNtfDhsjED639F7vmktf26SWNJHWfW0wOHILjI6TgqUvy0JDd8W8w0CHlAfz6Fs2l99NNgNF8dB3vBASbxS0hu/y0PVu/xQ== openstack-sleipner"
+
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICCbgJ0Uwh9VSVhfId7l9i5/jk4CvAK5rbkiab8R+moF root@sleipner"
+    ];
  };
-}
+}
+
--- a/users/danio.nix
+++ b/users/danio.nix
@@ -3,7 +3,7 @@
 {
  users.users.danio = {
    isNormalUser = true;
-    extraGroups = [ "drift" "nix-builder-users" ];
+    extraGroups = [ "drift" "nix-builder-users" "wheel" ];
    shell = pkgs.zsh;

    openssh.authorizedKeys.keys = [
--- a/values.nix
+++ b/values.nix
@@ -25,6 +25,8 @@ in rec {

  hosts = {
    gateway = pvv-ipv4 129;
+    gateway6 = pvv-ipv6 1;
+
    bekkalokk = {
      ipv4 = pvv-ipv4 168;
      ipv6 = pvv-ipv6 168;
@@ -63,7 +65,7 @@ in rec {
  defaultNetworkConfig = {
    dns = [ "129.241.0.200" "129.241.0.201" "2001:700:300:1900::200" "2001:700:300:1900::201" ];
    domains = [ "pvv.ntnu.no" "pvv.org" ];
-    gateway = [ hosts.gateway ];
+    gateway = [ hosts.gateway hosts.gateway6 ];

    networkConfig.IPv6AcceptRA = "no";
    DHCP = "no";
Author	SHA1	Message	Date
Adrian Gunnar Lauterer	54b52cbf91	Merge branch 'main' into sleipner-authorised-keys	2024-10-12 22:29:10 +02:00
Adrian G L	2aae6327e3	base: openssh added sleipner ssh keys	2024-10-12 22:28:14 +02:00
Adrian Gunnar Lauterer	c62ea129ed	Merge pull request 'base openssh added sleipner ssh keys' (!83 ) from sleipner-authorised-keys into main Reviewed-on: https://git.pvv.ntnu.no/Drift/pvv-nixos-config/pulls/83	2024-10-12 21:48:08 +02:00
Adrian G L	4b41ddcf5d	base: openssh added sleipner ssh keys	2024-10-12 21:47:31 +02:00
Daniel Olsen	abec66b287	users/danio: add to wheel	2024-10-08 14:08:17 +02:00
Felix Albrigtsen	aa884353c7	Merge pull request 'Add ipv6 gateway' (!82 ) from ipv6-fix into main Reviewed-on: https://git.pvv.ntnu.no/Drift/pvv-nixos-config/pulls/82 Reviewed-by: Daniel Lovbrotte Olsen <danio@pvv.ntnu.no>	2024-09-28 21:44:55 +02:00
Felix Albrigtsen	2147b56864	Add ipv6 gateway	2024-09-28 21:35:57 +02:00