From 0a17a244962778ef1597ac5749fb66d886053dd8 Mon Sep 17 00:00:00 2001
From: lassulus <lass@blue.r>
Date: Thu, 4 Oct 2018 12:36:23 +0200
Subject: l mors.r: add adb-sync to pkgs

---
 lass/1systems/mors/config.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lass/1systems')

diff --git a/lass/1systems/mors/config.nix b/lass/1systems/mors/config.nix
index 69954a3e..d3fb441a 100644
--- a/lass/1systems/mors/config.nix
+++ b/lass/1systems/mors/config.nix
@@ -77,6 +77,7 @@ with import <stockholm/lib>;
       environment.systemPackages = [
         pkgs.ovh-zone
         pkgs.bank
+        pkgs.adb-sync
       ];
     }
     {
-- 
cgit v1.2.3


From 1ca261eb502780a77d3059f54128720a2ed58e6a Mon Sep 17 00:00:00 2001
From: lassulus <lass@blue.r>
Date: Sat, 6 Oct 2018 18:33:03 +0200
Subject: l prism.r: remove radio.lassul.us

---
 lass/1systems/prism/config.nix | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'lass/1systems')

diff --git a/lass/1systems/prism/config.nix b/lass/1systems/prism/config.nix
index f8372107..bf7de6fc 100644
--- a/lass/1systems/prism/config.nix
+++ b/lass/1systems/prism/config.nix
@@ -291,16 +291,6 @@ with import <stockholm/lib>;
       ];
     }
     {
-      services.nginx = {
-        enable = true;
-        virtualHosts."radio.lassul.us" = {
-          forceSSL = true;
-          enableACME = true;
-          locations."/".extraConfig = ''
-            proxy_pass http://localhost:8000;
-          '';
-        };
-      };
     }
     {
       lass.nichtparasoup.enable = true;
-- 
cgit v1.2.3


From 921473db45c83c192d3b72a7e326715b9652abbf Mon Sep 17 00:00:00 2001
From: lassulus <lass@blue.r>
Date: Sat, 6 Oct 2018 22:10:26 +0200
Subject: l mors.r: use stable nix

---
 lass/1systems/mors/config.nix | 1 -
 1 file changed, 1 deletion(-)

(limited to 'lass/1systems')

diff --git a/lass/1systems/mors/config.nix b/lass/1systems/mors/config.nix
index d3fb441a..6d65b58c 100644
--- a/lass/1systems/mors/config.nix
+++ b/lass/1systems/mors/config.nix
@@ -144,7 +144,6 @@ with import <stockholm/lib>;
     OnCalendar = "00:37";
   };
 
-  nix.package = pkgs.nixUnstable;
   programs.adb.enable = true;
   users.users.mainUser.extraGroups = [ "adbusers" "docker" ];
   virtualisation.docker.enable = true;
-- 
cgit v1.2.3


From 6b08d5aa46adc80d8a1ab4ed1d3e320c61a19f01 Mon Sep 17 00:00:00 2001
From: lassulus <lass@blue.r>
Date: Sun, 7 Oct 2018 20:57:53 +0200
Subject: remove nin

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

(limited to 'lass/1systems')

diff --git a/lass/1systems/prism/config.nix b/lass/1systems/prism/config.nix
index bf7de6fc..808f35b2 100644
--- a/lass/1systems/prism/config.nix
+++ b/lass/1systems/prism/config.nix
@@ -57,13 +57,6 @@ with import <stockholm/lib>;
           config.krebs.users.makefu.pubkey
         ];
       };
-      users.users.nin = {
-        uid = genid "nin";
-        isNormalUser = true;
-        openssh.authorizedKeys.keys = [
-          config.krebs.users.nin.pubkey
-        ];
-      };
       users.extraUsers.dritter = {
         uid = genid "dritter";
         isNormalUser = true;
@@ -119,7 +112,6 @@ with import <stockholm/lib>;
           services.openssh.enable = true;
           users.users.root.openssh.authorizedKeys.keys = [
             config.krebs.users.lass.pubkey
-            config.krebs.users.nin.pubkey
           ];
         };
         autoStart = true;
-- 
cgit v1.2.3