Move julia :3

common/users/default.nix

@@ -9,21 +9,9 @@
       openssh.authorizedKeys.keys = [
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGGYqCcDg9hTINHyf8S56/P83+ZzqwV2t9gUsVYyajjR"
       ];
-
-    };
-
-    julia = {
-      isNormalUser = true;
-      extraGroups = [ "wheel" ];
-      shell = pkgs.fish;
-
-      openssh.authorizedKeys.keys = [
-        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIa/G3M13aVJpOIX8U/5duiGiNNGmM88/0k0+o0EUGRI cardno:20 876 680"
-      ];
     };
   };
 
   users.users.root.openssh.authorizedKeys.keys =
     config.users.users.agatha.openssh.authorizedKeys.keys;
-
 }

common/users/julia.nix

@@ -0,0 +1,13 @@
+{ config, pkgs, ... }: {
+  users.users = {
+    julia = {
+      isNormalUser = true;
+      extraGroups = [ "wheel" ];
+      shell = pkgs.fish;
+
+      openssh.authorizedKeys.keys = [
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIa/G3M13aVJpOIX8U/5duiGiNNGmM88/0k0+o0EUGRI cardno:20 876 680"
+      ];
+    };
+  };
+}

hosts/bloodletting/configuration.nix

@@ -1,6 +1,7 @@
 { config, pkgs, ... }: {
   imports = [
     ./hardware-configuration.nix
+    ../../common/users/julia.nix
     ../../common/fragments/bin.nix
     ../../common/fragments/fail2ban.nix
     ../../common/fragments/grafana.nix
@@ -15,9 +16,9 @@
   ];
 
   nixpkgs.overlays = [
-    (self: super: {
+    (final: prev: {
-      bin = self.callPackage ../../common/pkgs/bin.nix { };
+      bin = final.callPackage ../../common/pkgs/bin.nix { };
-      vampysite = self.callPackage ../../common/pkgs/vampysite.nix { };
+      vampysite = final.callPackage ../../common/pkgs/vampysite.nix { };
     })
   ];