From b42fe392f34554315d8aff7c808f73a5eb25badc Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Wed, 12 Aug 2020 21:38:32 +0200
Subject: l: add deploy to all systems

---
 lass/1systems/blue/config.nix | 8 --------
 lass/2configs/default.nix     | 1 +
 lass/5pkgs/deploy/default.nix | 6 ++++++
 3 files changed, 7 insertions(+), 8 deletions(-)
 create mode 100644 lass/5pkgs/deploy/default.nix

(limited to 'lass')

diff --git a/lass/1systems/blue/config.nix b/lass/1systems/blue/config.nix
index 14f4971f..c46bb351 100644
--- a/lass/1systems/blue/config.nix
+++ b/lass/1systems/blue/config.nix
@@ -15,14 +15,6 @@ with import <stockholm/lib>;
 
   krebs.build.host = config.krebs.hosts.blue;
 
-  environment.shellAliases = {
-    deploy = pkgs.writeDash "deploy" ''
-      set -eu
-      export SYSTEM="$1"
-      $(nix-build $HOME/sync/stockholm/lass/krops.nix --no-out-link --argstr name "$SYSTEM" -A deploy)
-    '';
-  };
-
   networking.nameservers = [ "1.1.1.1" ];
 
   services.restic.backups = genAttrs [
diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix
index b0d7ff23..ae2754c9 100644
--- a/lass/2configs/default.nix
+++ b/lass/2configs/default.nix
@@ -93,6 +93,7 @@ with import <stockholm/lib>;
 
   environment.systemPackages = with pkgs; [
   #stockholm
+    deploy
     git
     gnumake
     jq
diff --git a/lass/5pkgs/deploy/default.nix b/lass/5pkgs/deploy/default.nix
new file mode 100644
index 00000000..c07cf20d
--- /dev/null
+++ b/lass/5pkgs/deploy/default.nix
@@ -0,0 +1,6 @@
+{ writers }:
+writers.writeDashBin "deploy" ''
+  set -eu
+  export SYSTEM="$1"
+  $(nix-build $HOME/sync/stockholm/lass/krops.nix --no-out-link --argstr name "$SYSTEM" -A deploy)
+''
-- 
cgit v1.2.3


From e3fdcdbadfababea9ae70e88846956ebc45e28a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 20 Aug 2020 21:16:50 +0100
Subject: mic92: lower-case user

---
 lass/1systems/prism/config.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'lass')

diff --git a/lass/1systems/prism/config.nix b/lass/1systems/prism/config.nix
index f1f14e79..33ec21e7 100644
--- a/lass/1systems/prism/config.nix
+++ b/lass/1systems/prism/config.nix
@@ -396,12 +396,12 @@ with import <stockholm/lib>;
       ];
     }
     {
-      nix.trustedUsers = [ "Mic92" ];
-      users.users.Mic92 = {
-        uid = genid_uint31 "Mic92";
+      nix.trustedUsers = [ "mic92" ];
+      users.users.mic92 = {
+        uid = genid_uint31 "mic92";
         isNormalUser = true;
         openssh.authorizedKeys.keys = [
-          config.krebs.users.Mic92.pubkey
+          config.krebs.users.mic92.pubkey
         ];
       };
     }
-- 
cgit v1.2.3