From f758f8cb07f0c2922ba00e06c6a59135c39a613a Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 12 Nov 2017 13:01:59 +0100
Subject: l mors.r: import br.nix from lass

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

(limited to 'lass/1systems/mors/config.nix')

diff --git a/lass/1systems/mors/config.nix b/lass/1systems/mors/config.nix
index 6a61ce1fa..800a27689 100644
--- a/lass/1systems/mors/config.nix
+++ b/lass/1systems/mors/config.nix
@@ -29,7 +29,7 @@ with import <stockholm/lib>;
     <stockholm/lass/2configs/syncthing.nix>
     <stockholm/lass/2configs/otp-ssh.nix>
     <stockholm/lass/2configs/c-base.nix>
-    <stockholm/tv/2configs/br.nix>
+    <stockholm/lass/2configs/br.nix>
     {
       #risk of rain port
       krebs.iptables.tables.filter.INPUT.rules = [
-- 
cgit v1.2.3


From d310705ed6364fadb67366d5224d73d421a0b58c Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 12 Nov 2017 13:02:21 +0100
Subject: l: add dnsutils to pkgs

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

(limited to 'lass/1systems/mors/config.nix')

diff --git a/lass/1systems/mors/config.nix b/lass/1systems/mors/config.nix
index 800a27689..acb5f2476 100644
--- a/lass/1systems/mors/config.nix
+++ b/lass/1systems/mors/config.nix
@@ -135,6 +135,8 @@ with import <stockholm/lib>;
 
     macchanger
     dpass
+
+    dnsutils
   ];
 
   #TODO: fix this shit
-- 
cgit v1.2.3


From 3f6c5603a243cc8846d60fcfa1df60ca40052646 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 12 Nov 2017 13:02:48 +0100
Subject: l mors.r: enable adb debugging

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

(limited to 'lass/1systems/mors/config.nix')

diff --git a/lass/1systems/mors/config.nix b/lass/1systems/mors/config.nix
index acb5f2476..fee43f8cd 100644
--- a/lass/1systems/mors/config.nix
+++ b/lass/1systems/mors/config.nix
@@ -194,4 +194,8 @@ with import <stockholm/lib>;
       exec nix-shell -I stockholm="$PWD" --run 'test --system="$SYSTEM" --target="$SYSTEM/var/test/" --force-populate'
     '';
   };
+
+  #nix.package = pkgs.nixUnstable;
+  programs.adb.enable = true;
+  users.users.mainUser.extraGroups = [ "adbusers" ];
 }
-- 
cgit v1.2.3


From 01e608ac6b76f2a1dc7316a308e30114f9b0d1d3 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Tue, 12 Dec 2017 17:30:48 +0100
Subject: l deploy: run with --diff

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

(limited to 'lass/1systems/mors/config.nix')

diff --git a/lass/1systems/mors/config.nix b/lass/1systems/mors/config.nix
index fee43f8cd..ad133802f 100644
--- a/lass/1systems/mors/config.nix
+++ b/lass/1systems/mors/config.nix
@@ -179,7 +179,7 @@ with import <stockholm/lib>;
         echo 'secrets are crypted' >&2
         exit 23
       else
-        exec nix-shell -I stockholm="$PWD" --run 'deploy --system="$SYSTEM"'
+        exec nix-shell -I stockholm="$PWD" --run 'deploy --diff --system="$SYSTEM"'
       fi
     '';
     predeploy = pkgs.writeDash "predeploy" ''
-- 
cgit v1.2.3