give up on agenix; set up remote deploys (not currently working)

3 files changed, 16 insertions, 8 deletions

diff --git a/modules/services/nixos/ssh.nix b/modules/services/nixos/ssh.nix
index 6db41bf..bf1aefe 100644
--- a/modules/services/nixos/ssh.nix
+++ b/modules/services/nixos/ssh.nix
@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...
@@ -9,8 +8,14 @@ in
   lib.mkIf cfg.enable {
     services.openssh = {
       enable = true;
+      hostKeys = [
+        {
+          path = "/etc/ssh/ssh_host_ed25519_key";
+          type = "ed25519";
+        }
+      ];
       settings = {
-        PermitRootLogin = "no";
+        PermitRootLogin = "prohibit-password";
         PasswordAuthentication = false;
       };
     };
diff --git a/modules/terminal/hjem/programs/lazygit.nix b/modules/terminal/hjem/programs/lazygit.nix
index a939446..5eb546e 100644
--- a/modules/terminal/hjem/programs/lazygit.nix
+++ b/modules/terminal/hjem/programs/lazygit.nix
@@ -7,7 +7,7 @@
   cfg = config.collinux.terminal.programs.lazygit;
 
   settings = {
-    git.paging.pager = "${pkgs.diff-so-fancy}/bin/diff-so-fancy";
+    git.pagers = [(lib.getExe pkgs.diff-so-fancy)];
     gui = {
       showRandomTip = false;
       commitLength.show = false;
diff --git a/modules/user/nixos/default.nix b/modules/user/nixos/default.nix
index 0257198..b14e52d 100644
--- a/modules/user/nixos/default.nix
+++ b/modules/user/nixos/default.nix
@@ -6,11 +6,14 @@
 }: let
   cfg = config.collinux.user;
 in {
-  users.users."${cfg.name}" = {
-    isNormalUser = true;
-    description = cfg.name;
-    extraGroups = ["networkmanager" "pipewire" "disks" "input" "video" "dialout" "kvm"] ++ (lib.optional cfg.isAdmin "wheel");
-    hashedPasswordFile = config.age.secrets."${cfg.name}@${hostname}-passwd".path;
+  users = {
+    mutableUsers = true;
+
+    users."${cfg.name}" = {
+      isNormalUser = true;
+      description = cfg.name;
+      extraGroups = ["networkmanager" "pipewire" "disks" "input" "video" "dialout" "kvm"] ++ (lib.optional cfg.isAdmin "wheel");
+    };
   };
   security.sudo-rs.enable = true;
   services.userborn.enable = true;