Merge branch 'master' of ssh://git.nx2.site:20022/nx2/dotfiles

configuration.nix

@@ -12,6 +12,7 @@ in
     ./system-modules/dm.nix
     ./system-modules/networking.nix
     ./system-modules/virtualisation.nix
+    ./system-modules/sshd.nix
     ./system-modules/hsmw.nix
     ./system-modules/docker.nix
     ./system-modules/health_reminder.nix
@@ -48,10 +49,6 @@ in
   services.xserver.libinput.enable = true;
   hardware.uinput.enable = true;
 
-  # log into this machine
-  services.openssh.enable = false;
-
-
   hardware.bluetooth.enable = true; # enables support for Bluetooth
   hardware.bluetooth.powerOnBoot = true; # 
   services.blueman.enable = true;

home-modules/starship.nix

@@ -169,9 +169,9 @@ lib.mkIf (user != "tv")
       vcsh.format =                 "[\\[vcsh [$symbol$repo\\]]($style)";
       hostname = {
         format =                    "[\\[$ssh_symbol$hostname\\]]($style)";
-        ssh_symbol = "爵";
+        ssh_symbol = "󰖟 ";
         ssh_only = true;
       };
     }; 
   }; 
-}
+}

system-modules/boot.nix

@@ -22,8 +22,8 @@
       device = "nodev";
       # useOSProber = true;
       efiSupport = true;
-      theme = grub-theme-ascii-diana;
+      #theme = grub-theme-ascii-diana;
-      font = "${grub-theme-ascii-diana}/unicode.pf2";
+      #font = "${grub-theme-ascii-diana}/unicode.pf2";
       fontSize = 50;
       splashImage = null;
   

system-modules/nx2site.nix

@@ -5,14 +5,16 @@
   ] else [];
   
   config = lib.mkIf (host == "NxACE") {
-    security.acme = {
+  #    security.acme = {
-      acceptTerms = true;
+#      acceptTerms = true;
-      defaults.email = "acme@nx2.site";
+#      defaults.email = "acme@nx2.site";
-      certs."nx2.site" = {
+#      certs."nx2.site" = {
-        dnsProvider = "namecheap";
+#        dnsProvider = "namecheap";
-        environmentFile = ../secrets/nx2site/namecheap-creds.env;
+#        environmentFile = ../secrets/nx2site/namecheap-creds.env;
-        renewalInterval = "*-*-02 00:05:00";
+#      };
-      };
+#    };
-    }; 
+    # services.nginx = {
-  };
+      # enable = true;
-}
+    # }; 
+  }; 
+ }

system-modules/sshd.nix

@@ -0,0 +1,12 @@
+{ config, pkgs, lib, secrets, ... }:
+
+{
+  services.openssh = {
+    enable = true;
+    ports = secrets.nx2site.ssh.ports;
+    settings = {
+      PasswordAuthentication = false;
+    };
+  };
+}
+

system-modules/users.nix

@@ -7,6 +7,9 @@
     isNormalUser = true;
     extraGroups = [ "networkmanager" "wheel" "audio" "video" "docker" "libvirtd" "uinput" ];
     useDefaultShell = true;
+    openssh.authorizedKeys.keys = [
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHzEtnN/GrgXK7yz+0z1x6rKHhYYQhTOFQ6c6Faz79g2 Nx2-ed25519-ssh-key"
+    ];
     packages = with pkgs; []; # all in home.nix
   };
   users.users.tv = lib.mkIf (host == "NxACE") {