deploy: take deploy-rs from cache

hosts/frikandel/wireguard.nix

@@ -27,7 +27,7 @@
   ];
 
   systemd.services.wireguard-wg-private = {
-    after = [
+    wantedBy = [
       "network.target"
       "network-online.target"
       "nss-lookup.target"
@@ -44,7 +44,7 @@
     };
   };
 
-  age.secrets.wg-private-key.file = "${flake.self}/secrets/wg-private-frikandel-server.age";
+  age.secrets.wg-private-key.file = "${flake.self}/secrets/wg-private-frikandel.age";
 
   # Enable WireGuard
   networking.wireguard.interfaces = {

lib/deploy.nix

@@ -49,11 +49,23 @@ in {
     lib.recursiveUpdate
     (lib.mapAttrs
       (
-        _: c: {
+        _: c: let
+          system = c.pkgs.stdenv.hostPlatform.system;
+          # Unmodified nixpkgs
+          pkgs = import inputs.nixpkgs { inherit system; };
+          # nixpkgs with deploy-rs overlay but force the nixpkgs package
+          deployPkgs = import inputs.nixpkgs {
+            inherit system;
+            overlays = [
+              inputs.deploy-rs.overlay # or deploy-rs.overlays.default
+              (self: super: { deploy-rs = { inherit (pkgs) deploy-rs; lib = super.deploy-rs.lib; }; })
+            ];
+          };
+        in {
           hostname = getFqdn c;
           profiles.system = {
             user = "root";
-            path = inputs.deploy-rs.lib.${c.pkgs.stdenv.hostPlatform.system}.activate.nixos c;
+            path = deployPkgs.deploy-rs.lib.activate.nixos c;
           };
         }
       )

modules/printing/default.nix

@@ -24,7 +24,7 @@
 
   environment.persistence."/persist" = {
     directories = [
-      "/etc/lib/cups"
+      "/var/lib/cups"
     ];
   };
 }

modules/terminal-life/.config/git/config.nix

@@ -12,8 +12,8 @@ in ''  [user]
     else ""
   }
     ${
-    if user.fullName != null
+    if user.name != null
-    then "name = ${user.fullName}"
+    then "name = ${user.name}"
     else ""
   }
     ${
@@ -27,7 +27,19 @@ in ''  [user]
   [alias]
     pol = pull
     ack = -c color.grep.linenumber=\"bold yellow\"\n    -c color.grep.filename=\"bold green\"\n    -c color.grep.match=\"reverse yellow\"\n    grep --break --heading --line-number
-  # define command which will be used when "nvim"is set as a merge tool
+    lg = "!f() { \
+        git log --all --color --graph --pretty=format:'%C(bold yellow)<sig>%G?</sig>%C(reset) %C(red)%h%C(reset) -%C(yellow)%d%C(reset) %s %C(green)(%cr) %C(blue)<%an>%C(reset)' | \
+        sed \
+        -e 's#<sig>G</sig>#Good#' \
+        -e 's#<sig>B</sig>#\\nBAD \\nBAD \\nBAD \\nBAD \\nBAD#' \
+        -e 's#<sig>U</sig>#Unknown#' \
+        -e 's#<sig>X</sig>#Expired#' \
+        -e 's#<sig>Y</sig>#Expired Key#' \
+        -e 's#<sig>R</sig>#Revoked#' \
+        -e 's#<sig>E</sig>#Missing Key#' \
+        -e 's#<sig>N</sig>#None#' | \
+        less -r; \
+    }; f"
 
   [mergetool]
     prompt = false

secrets/secrets.nix

@@ -86,7 +86,7 @@ in {
   "wg-private-stroopwafel.age".publicKeys = stroopwafelKeys ++ baseKeys;
   "wg-private-pie.age".publicKeys = pieKeys ++ baseKeys;
   "wg-private-droppie.age".publicKeys = droppieKeys ++ baseKeys;
-  "wg-private-frikandel-server.age".publicKeys = frikandelKeys ++ baseKeys;
+  "wg-private-frikandel.age".publicKeys = frikandelKeys ++ baseKeys;
 
   "wg-tunnel-stroopwafel.age".publicKeys = stroopwafelKeys ++ baseKeys;
   "wg-tunnel-droppie.age".publicKeys = droppieKeys ++ baseKeys;

users/b12f/.config/neomutt/hetzner_benjaminbaedorf.eu.signature

@@ -0,0 +1,9 @@
+
+Benjamin Yule Bädorf (they/them)
+Software Engineer
+
+MAIL: hello@benjaminbaedorf.eu
+GPG: FC62 3BBC BD26 04D5 CC9D 90BA E77B 0AAA F0D9 B76B
+GIT: git.pub.solar/b12f
+MATRIX: @b12f:pub.solar
+WEB: b12f.io

users/b12f/email.nix

@@ -132,6 +132,10 @@ in {
             imap.host = "imap.mailbox.org";
           };
         }
+        {
+          address = mkEmailAddress "hetzner" "benjaminbaedorf.eu";
+          host = "mail.hosting.de";
+        }
       ];
     };
 

users/yule/default.nix

@@ -17,7 +17,7 @@ in {
         password = "$y$j9T$k3SMmHUdr4V/VTo9yja5J1$u0ZbZ8y3Z7WbVrkK6ps0SWnvLEeLsn6C9EM7ChK8Pn1";
         passwordlessSudo = true;
         fullName = "yule";
-        email = "yule@benjaminbaedorf.eu";
+        email = "git@benjaminbaedorf.eu";
         gpgKeyId = "FC623BBCBD2604D5CC9D90BAE77B0AAAF0D9B76B";
       };
     };