From 55bdc0f653b398d49c5c95d98da797b2b8d5393e Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Tue, 12 Oct 2021 15:35:52 +0200
Subject: l codimd: set domain and serve via ssl

---
 lass/2configs/codimd.nix | 39 ++++++++++++++++++++++++++++-----------
 1 file changed, 28 insertions(+), 11 deletions(-)

(limited to 'lass')

diff --git a/lass/2configs/codimd.nix b/lass/2configs/codimd.nix
index d29a65210..070781a31 100644
--- a/lass/2configs/codimd.nix
+++ b/lass/2configs/codimd.nix
@@ -1,27 +1,44 @@
 { config, pkgs, lib, ... }:
 with import <stockholm/lib>;
-{
-  services.nginx.virtualHosts.codimd = {
+let
+  domain = "codi.lassul.us";
+in {
+  services.nginx.virtualHosts.${domain} = {
     enableACME = true;
-    addSSL = true;
-    serverName = "codi.lassul.us";
-    locations."/".extraConfig = ''
-      client_max_body_size 4G;
-      proxy_set_header Host $host;
-      proxy_pass http://localhost:3091;
-    '';
+    forceSSL = true;
+    locations."/" = {
+      proxyPass = "https://localhost:3091";
+      proxyWebsockets = true;
+    };
+  };
+
+  security.acme.certs.${domain}.group = "hedgecert";
+  users.groups.hedgecert.members = [ "codimd" "nginx" ];
+
+  security.dhparams = {
+    enable = true;
+    params.hedgedoc = {};
   };
 
   services.hedgedoc = {
     enable = true;
-    configuration.allowOrigin = [ "*" ];
+    configuration.allowOrigin = [ domain ];
     configuration = {
       db = {
         dialect = "sqlite";
         storage = "/var/lib/codimd/db.codimd.sqlite";
-        useCDN = false;
       };
+      useCDN = false;
       port = 3091;
+      domain = domain;
+      allowFreeURL = true;
+
+      useSSL = true;
+      protocolUseSSL = true;
+      sslCAPath = [ "/etc/ssl/certs/ca-certificates.crt" ];
+      sslCertPath = "/var/lib/acme/${domain}/cert.pem";
+      sslKeyPath = "/var/lib/acme/${domain}/key.pem";
+      dhParamPath = config.security.dhparams.params.hedgedoc.path;
     };
   };
 }
-- 
cgit v1.2.3


From 9ea664b63c348a5855299250ec45f622c1404c5d Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 23 Oct 2021 12:13:53 +0200
Subject: l coaxmetal.r: use nixos-unstable

---
 lass/1systems/coaxmetal/source.nix | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 lass/1systems/coaxmetal/source.nix

(limited to 'lass')

diff --git a/lass/1systems/coaxmetal/source.nix b/lass/1systems/coaxmetal/source.nix
new file mode 100644
index 000000000..0e2628b5b
--- /dev/null
+++ b/lass/1systems/coaxmetal/source.nix
@@ -0,0 +1,4 @@
+{ lib, pkgs, ... }:
+{
+  nixpkgs.git.ref = lib.mkForce (lib.importJSON ../../../krebs/nixpkgs-unstable.json).rev;
+}
-- 
cgit v1.2.3


From 0c15f3b6a7a216eec1fb1ba368da5c3ea4b43c5e Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 23 Oct 2021 16:12:58 +0200
Subject: l: disable tmpfs on /tmp

---
 lass/2configs/default.nix | 2 --
 1 file changed, 2 deletions(-)

(limited to 'lass')

diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix
index eb38d0e97..1bcfb162c 100644
--- a/lass/2configs/default.nix
+++ b/lass/2configs/default.nix
@@ -89,8 +89,6 @@ with import <stockholm/lib>;
 
   services.timesyncd.enable = mkForce true;
 
-  boot.tmpOnTmpfs = true;
-
   # multiple-definition-problem when defining environment.variables.EDITOR
   environment.extraInit = ''
     EDITOR=vim
-- 
cgit v1.2.3


From d1a55f88766b72769e5f756f8b4724e13e1c6981 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 23 Oct 2021 19:03:02 +0200
Subject: l coaxmetal.r: build with unstable

---
 lass/1systems/coaxmetal/source.nix | 23 ++++++++++++++++++++---
 lass/krops.nix                     |  2 +-
 2 files changed, 21 insertions(+), 4 deletions(-)

(limited to 'lass')

diff --git a/lass/1systems/coaxmetal/source.nix b/lass/1systems/coaxmetal/source.nix
index 0e2628b5b..7f335ec05 100644
--- a/lass/1systems/coaxmetal/source.nix
+++ b/lass/1systems/coaxmetal/source.nix
@@ -1,4 +1,21 @@
-{ lib, pkgs, ... }:
-{
-  nixpkgs.git.ref = lib.mkForce (lib.importJSON ../../../krebs/nixpkgs-unstable.json).rev;
+{ lib, pkgs, test, ... }: let
+  npkgs = lib.importJSON ../../../krebs/nixpkgs-unstable.json;
+in {
+  nixpkgs = lib.mkForce (if test then { derivation = let
+    rev = npkgs.rev;
+    sha256 = npkgs.sha256;
+  in ''
+    with import (builtins.fetchTarball {
+      url = "https://github.com/nixos/nixpkgs/archive/${rev}.tar.gz";
+      sha256 = "${sha256}";
+    }) {};
+    pkgs.fetchFromGitHub {
+      owner = "nixos";
+      repo = "nixpkgs";
+      rev = "${rev}";
+      sha256 = "${sha256}";
+    }
+  ''; } else {
+    git.ref = npkgs.rev;
+  });
 }
diff --git a/lass/krops.nix b/lass/krops.nix
index 128c9ee04..fe5c00f3d 100644
--- a/lass/krops.nix
+++ b/lass/krops.nix
@@ -24,7 +24,7 @@
         };
       };
     }
-    (if (lib.pathExists (./. + "/1systems/${name}/source.nix")) && (! test) then
+    (if lib.pathExists (./. + "/1systems/${name}/source.nix") then
       import (./. + "/1systems/${name}/source.nix") { inherit lib pkgs test; }
     else
       {}
-- 
cgit v1.2.3


From ddac84e9e6eb49805ad244829ea5add7370a7829 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 23 Oct 2021 21:53:26 +0200
Subject: l green.r: make source.nix ci compatible

---
 lass/1systems/green/source.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'lass')

diff --git a/lass/1systems/green/source.nix b/lass/1systems/green/source.nix
index 48499c9db..cc7617f92 100644
--- a/lass/1systems/green/source.nix
+++ b/lass/1systems/green/source.nix
@@ -1,5 +1,4 @@
-{ lib, pkgs, ... }:
-{
+{ lib, pkgs, test, ... }:
+if test then {
   nixpkgs-unstable = lib.mkForce { file = "/var/empty"; };
-  nixpkgs.git.shallow = true;
-}
+} else {}
-- 
cgit v1.2.3


From bd8baec395d258cf9201ef243d4237f64aaef26b Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 23 Oct 2021 22:02:15 +0200
Subject: l blue.r: don't delete nixpkgs-unstable in ci

---
 lass/1systems/blue/source.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lass')

diff --git a/lass/1systems/blue/source.nix b/lass/1systems/blue/source.nix
index 2b4158211..2a4e1336b 100644
--- a/lass/1systems/blue/source.nix
+++ b/lass/1systems/blue/source.nix
@@ -1,5 +1,5 @@
 { lib, pkgs, test, ... }:
-{
+if test then {
   nixpkgs = lib.mkIf (! test) (lib.mkForce {
     file = {
       path = toString (pkgs.fetchFromGitHub {
@@ -14,4 +14,4 @@
   nixpkgs-unstable = lib.mkForce {
     file.path = "/var/empty";
   };
-}
+} else {}
-- 
cgit v1.2.3


From 3ea4c8f5735cd99d8ede55d67deb51d44795db59 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 23 Oct 2021 22:22:38 +0200
Subject: l: fix test sources

---
 lass/1systems/blue/source.nix  | 4 ++--
 lass/1systems/green/source.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'lass')

diff --git a/lass/1systems/blue/source.nix b/lass/1systems/blue/source.nix
index 2a4e1336b..0b2bf5f5b 100644
--- a/lass/1systems/blue/source.nix
+++ b/lass/1systems/blue/source.nix
@@ -1,5 +1,5 @@
 { lib, pkgs, test, ... }:
-if test then {
+if test then {} else {
   nixpkgs = lib.mkIf (! test) (lib.mkForce {
     file = {
       path = toString (pkgs.fetchFromGitHub {
@@ -14,4 +14,4 @@ if test then {
   nixpkgs-unstable = lib.mkForce {
     file.path = "/var/empty";
   };
-} else {}
+}
diff --git a/lass/1systems/green/source.nix b/lass/1systems/green/source.nix
index cc7617f92..da137e064 100644
--- a/lass/1systems/green/source.nix
+++ b/lass/1systems/green/source.nix
@@ -1,4 +1,4 @@
 { lib, pkgs, test, ... }:
-if test then {
+if test then {} else {
   nixpkgs-unstable = lib.mkForce { file = "/var/empty"; };
-} else {}
+}
-- 
cgit v1.2.3


From 89b0f98b42c4258fbde902325bd5ba79034f98bd Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 24 Oct 2021 00:01:17 +0200
Subject: l vim: make more minimal

---
 lass/2configs/vim.nix | 14 --------------
 1 file changed, 14 deletions(-)

(limited to 'lass')

diff --git a/lass/2configs/vim.nix b/lass/2configs/vim.nix
index 0e4ac5394..6c730efdd 100644
--- a/lass/2configs/vim.nix
+++ b/lass/2configs/vim.nix
@@ -5,16 +5,6 @@ let
   out = {
     environment.systemPackages = [
       (hiPrio vim)
-      (pkgs.writeDashBin "govet" ''
-        go vet "$@"
-      '')
-      (hiPrio (pkgs.python3.withPackages (ps: [
-        ps.python-language-server
-        ps.pyls-isort
-        ps.pyflakes
-        ps.flake8
-        ps.yapf
-      ])))
     ];
 
     environment.etc.vimrc.source = vimrc;
@@ -126,11 +116,7 @@ let
   '';
 
   extra-runtimepath = concatMapStringsSep "," (pkg: "${pkg.rtp}") [
-    pkgs.vimPlugins.ack-vim
     pkgs.vimPlugins.undotree
-    pkgs.vimPlugins.vim-go
-    pkgs.vimPlugins.fzf-vim
-    pkgs.vimPlugins.LanguageClient-neovim
     (pkgs.vimUtils.buildVimPlugin {
       name = "file-line-1.0";
       src = pkgs.fetchFromGitHub {
-- 
cgit v1.2.3


From f455668ff33d7555f8fe8d02ae9cf1b72cab596c Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 24 Oct 2021 11:06:43 +0200
Subject: l: remove red.r morpheus.r uriel.r

---
 lass/1systems/morpheus/config.nix   | 29 ------------------
 lass/1systems/morpheus/physical.nix | 44 ---------------------------
 lass/1systems/red/config.nix        | 28 ------------------
 lass/1systems/red/physical.nix      |  7 -----
 lass/1systems/uriel/config.nix      | 47 -----------------------------
 lass/1systems/uriel/physical.nix    | 59 -------------------------------------
 6 files changed, 214 deletions(-)
 delete mode 100644 lass/1systems/morpheus/config.nix
 delete mode 100644 lass/1systems/morpheus/physical.nix
 delete mode 100644 lass/1systems/red/config.nix
 delete mode 100644 lass/1systems/red/physical.nix
 delete mode 100644 lass/1systems/uriel/config.nix
 delete mode 100644 lass/1systems/uriel/physical.nix

(limited to 'lass')

diff --git a/lass/1systems/morpheus/config.nix b/lass/1systems/morpheus/config.nix
deleted file mode 100644
index 79d4f528d..000000000
--- a/lass/1systems/morpheus/config.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ config, pkgs, ... }:
-with import <stockholm/lib>;
-{
-  imports = [
-    <stockholm/lass>
-    <stockholm/lass/2configs/retiolum.nix>
-
-    <stockholm/lass/2configs/syncthing.nix>
-    <stockholm/lass/2configs/green-host.nix>
-  ];
-
-  krebs.build.host = config.krebs.hosts.morpheus;
-
-  networking.wireless.enable = false;
-  networking.networkmanager.enable = true;
-
-  services.logind.lidSwitch = "ignore";
-  services.logind.lidSwitchDocked = "ignore";
-
-  environment.systemPackages = with pkgs; [
-    gitAndTools.hub
-    nix-review
-    firefox
-    ag
-  ];
-
-  services.openssh.forwardX11 = true;
-  programs.x2goserver.enable = true;
-}
diff --git a/lass/1systems/morpheus/physical.nix b/lass/1systems/morpheus/physical.nix
deleted file mode 100644
index 6e59a2273..000000000
--- a/lass/1systems/morpheus/physical.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  imports = [
-    ./config.nix
-    <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
-  ];
-
-  boot.loader.grub.enable = true;
-  boot.loader.grub.version = 2;
-  boot.loader.grub.efiSupport = true;
-  boot.loader.grub.efiInstallAsRemovable = true;
-  boot.loader.grub.device = "nodev";
-
-  networking.hostId = "06442b9a";
-
-  fileSystems."/" = {
-    device = "/dev/pool/root";
-    fsType = "btrfs";
-  };
-
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/1F60-17C6";
-    fsType = "vfat";
-  };
-
-  fileSystems."/home" = {
-    device = "/dev/pool/home";
-    fsType = "btrfs";
-  };
-
-  fileSystems."/tmp" = {
-    device = "tmpfs";
-    fsType = "tmpfs";
-    options = ["nosuid" "nodev" "noatime"];
-  };
-  boot.initrd.luks = {
-    cryptoModules = [ "aes" "sha512" "sha1" "xts" ];
-    devices.luksroot.device = "/dev/nvme0n1p3";
-  };
-
-  services.udev.extraRules = ''
-    SUBSYSTEM=="net", ATTR{address}=="f8:59:71:a9:05:65", NAME="wl0"
-    SUBSYSTEM=="net", ATTR{address}=="54:e1:ad:4f:06:83", NAME="et0"
-  '';
-}
diff --git a/lass/1systems/red/config.nix b/lass/1systems/red/config.nix
deleted file mode 100644
index 3139e94a2..000000000
--- a/lass/1systems/red/config.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-with import <stockholm/lib>;
-{ config, lib, pkgs, ... }:
-let
-  inherit (import <stockholm/lass/2configs/websites/util.nix> {inherit lib pkgs;})
-    servephpBB
-  ;
-in
-{
-  imports = [
-    <stockholm/lass>
-    <stockholm/lass/2configs>
-    <stockholm/lass/2configs/retiolum.nix>
-    <stockholm/lass/2configs/websites>
-    <stockholm/lass/2configs/websites/sqlBackup.nix>
-    (servephpBB [ "rote-allez-fraktion.de" ])
-  ];
-
-  krebs.iptables.tables.filter.INPUT.rules = [
-    { predicate = "-p tcp --dport 80"; target = "ACCEPT"; }
-  ];
-
-  krebs.build.host = config.krebs.hosts.red;
-
-  services.nginx.enable = true;
-  environment.systemPackages = [
-    pkgs.mk_sql_pair
-  ];
-}
diff --git a/lass/1systems/red/physical.nix b/lass/1systems/red/physical.nix
deleted file mode 100644
index b6aa3a894..000000000
--- a/lass/1systems/red/physical.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  imports = [
-    ./config.nix
-  ];
-  boot.isContainer = true;
-  networking.useDHCP = false;
-}
diff --git a/lass/1systems/uriel/config.nix b/lass/1systems/uriel/config.nix
deleted file mode 100644
index c3ce8fced..000000000
--- a/lass/1systems/uriel/config.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ config, pkgs, ... }:
-
-with builtins;
-with import <stockholm/lib>;
-{
-  imports = [
-    <stockholm/lass>
-    <stockholm/lass/2configs/retiolum.nix>
-    <stockholm/lass/2configs/exim-retiolum.nix>
-    {
-      # locke config
-      i18n.defaultLocale ="de_DE.UTF-8";
-      time.timeZone = "Europe/Berlin";
-      services.xserver.enable = true;
-      services.xserver.libinput.enable = false;
-      users.users.locke = {
-        uid = genid "locke";
-        home = "/home/locke";
-        group = "users";
-        createHome = true;
-        extraGroups = [
-          "audio"
-          "networkmanager"
-        ];
-        useDefaultShell = true;
-        isNormalUser = true;
-      };
-      networking.networkmanager.enable = true;
-      hardware.pulseaudio = {
-        enable = true;
-        systemWide = true;
-      };
-      environment.systemPackages = with pkgs; [
-        pavucontrol
-        firefox
-        hexchat
-        networkmanagerapplet
-      ];
-      services.xserver.desktopManager.xfce = {
-        enable = true;
-      };
-    }
-  ];
-
-  krebs.build.host = config.krebs.hosts.uriel;
-  nixpkgs.config.allowUnfree = true;
-}
diff --git a/lass/1systems/uriel/physical.nix b/lass/1systems/uriel/physical.nix
deleted file mode 100644
index 82a088643..000000000
--- a/lass/1systems/uriel/physical.nix
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  imports = [
-    ./config.nix
-  ];
-
-  hardware.enableRedistributableFirmware = true;
-  boot = {
-    #kernelParams = [
-    #  "acpi.brightness_switch_enabled=0"
-    #];
-    #loader.grub.enable = true;
-    #loader.grub.version = 2;
-    #loader.grub.device = "/dev/sda";
-
-    loader.systemd-boot.enable = true;
-    loader.timeout = 5;
-
-    initrd.luks.devices.luksroot.device = "/dev/sda2";
-    initrd.luks.cryptoModules = [ "aes" "sha512" "sha1" "xts" ];
-    initrd.availableKernelModules = [ "xhci_hcd" "ehci_pci" "ahci" "usb_storage" ];
-    #kernelModules = [ "kvm-intel" "msr" ];
-    kernelModules = [ "msr" ];
-  };
-  fileSystems = {
-    "/" = {
-      device = "/dev/pool/root";
-      fsType = "ext4";
-    };
-
-    "/bku" = {
-      device = "/dev/pool/bku";
-      fsType = "ext4";
-    };
-
-    "/boot" = {
-      device = "/dev/sda1";
-    };
-    "/tmp" = {
-      device = "tmpfs";
-      fsType = "tmpfs";
-      options = ["nosuid" "nodev" "noatime"];
-    };
-  };
-
-  services.udev.extraRules = ''
-    SUBSYSTEM=="net", ATTR{address}=="64:27:37:7d:d8:ae", NAME="wl0"
-    SUBSYSTEM=="net", ATTR{address}=="f0:de:f1:b8:c8:2e", NAME="et0"
-  '';
-
-  services.xserver.synaptics = {
-    enable = true;
-    twoFingerScroll = true;
-    accelFactor = "0.035";
-    additionalOptions = ''
-      Option "FingerHigh" "60"
-      Option "FingerLow"  "60"
-    '';
-  };
-}
-- 
cgit v1.2.3


From 0bd6a8878d6e5c56a8905a709687f04735886c55 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 24 Oct 2021 12:33:33 +0200
Subject: l green-host: use echelon.r instead of morpheus.r

---
 lass/2configs/green-host.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lass')

diff --git a/lass/2configs/green-host.nix b/lass/2configs/green-host.nix
index 355daba9c..4d2a219ec 100644
--- a/lass/2configs/green-host.nix
+++ b/lass/2configs/green-host.nix
@@ -6,12 +6,12 @@
   ];
   krebs.sync-containers.containers.green = {
     peers = [
+      "echelon"
       "icarus"
+      "littleT"
+      "mors"
       "shodan"
       "skynet"
-      "mors"
-      "morpheus"
-      "littleT"
       "styx"
     ];
     hostIp = "10.233.2.15";
-- 
cgit v1.2.3


From 2b0d7851048b208fdbcdd2d854beb2ab9d68155f Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 24 Oct 2021 12:33:48 +0200
Subject: l green-host: prune backups

---
 lass/2configs/green-host.nix | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'lass')

diff --git a/lass/2configs/green-host.nix b/lass/2configs/green-host.nix
index 4d2a219ec..a83ed0544 100644
--- a/lass/2configs/green-host.nix
+++ b/lass/2configs/green-host.nix
@@ -25,5 +25,9 @@
     repo = "/var/lib/sync-containers/green/backup";
     compression = "auto,lzma";
     startAt = "daily";
+    prune.keep = {
+      daily = 7;
+      weekly = 4;
+    };
   };
 }
-- 
cgit v1.2.3


From a1855823dec36034ba3eb7e6350dbd7496d2b93b Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 24 Oct 2021 12:53:02 +0200
Subject: l murmur: pin version, use new nginx options

---
 lass/2configs/murmur.nix | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'lass')

diff --git a/lass/2configs/murmur.nix b/lass/2configs/murmur.nix
index 9f325d0af..7cc4051a8 100644
--- a/lass/2configs/murmur.nix
+++ b/lass/2configs/murmur.nix
@@ -16,7 +16,7 @@
     StandardError = lib.mkForce "journal";
   };
   virtualisation.oci-containers.containers.mumble-web = {
-    image = "rankenstein/mumble-web";
+    image = "rankenstein/mumble-web:0.5";
     environment = {
       MUMBLE_SERVER = "lassul.us:64738";
     };
@@ -28,12 +28,9 @@
   services.nginx.virtualHosts."mumble.lassul.us" = {
     enableACME = true;
     forceSSL = true;
-    locations."/".extraConfig = ''
-      proxy_pass http://localhost:64739/;
-      proxy_set_header Accept-Encoding "";
-      proxy_http_version 1.1;
-      proxy_set_header Upgrade $http_upgrade;
-      proxy_set_header Connection $connection_upgrade;
-    '';
+    locations."/" = {
+      proxyPass = "http://localhost:64739";
+      proxyWebsockets = true;
+    };
   };
 }
-- 
cgit v1.2.3


From 60fe1fed15a1759b9bc7c14ea9d39c9cb13b7855 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 24 Oct 2021 13:24:04 +0200
Subject: l klem module: reference grep directly

---
 lass/3modules/klem.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lass')

diff --git a/lass/3modules/klem.nix b/lass/3modules/klem.nix
index a297adcd1..8536d967d 100644
--- a/lass/3modules/klem.nix
+++ b/lass/3modules/klem.nix
@@ -38,7 +38,7 @@ in {
       # match filetype against patterns
       ${concatMapStringsSep "\n" (script: ''
         ${pkgs.xclip}/bin/xclip -selection clipboard -target TARGETS -out \
-          | grep -q '${script.target}'
+          | ${pkgs.gnugrep}/bin/grep -q '${script.target}'
         if [ $? -eq 0 ]; then
           labels="$labels:${script.label}"
         fi
-- 
cgit v1.2.3


From 4c15270e18861dd84036d776dd3143a74f7ea9b2 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 24 Oct 2021 16:54:23 +0200
Subject: l prism.r: remove ts3 server

---
 lass/1systems/prism/config.nix |  1 -
 lass/2configs/ts3.nix          | 19 -------------------
 2 files changed, 20 deletions(-)
 delete mode 100644 lass/2configs/ts3.nix

(limited to 'lass')

diff --git a/lass/1systems/prism/config.nix b/lass/1systems/prism/config.nix
index d43fb804a..356b8d182 100644
--- a/lass/1systems/prism/config.nix
+++ b/lass/1systems/prism/config.nix
@@ -112,7 +112,6 @@ with import <stockholm/lib>;
       };
     }
     <stockholm/lass/2configs/exim-smarthost.nix>
-    <stockholm/lass/2configs/ts3.nix>
     <stockholm/lass/2configs/privoxy-retiolum.nix>
     <stockholm/lass/2configs/radio.nix>
     <stockholm/lass/2configs/binary-cache/server.nix>
diff --git a/lass/2configs/ts3.nix b/lass/2configs/ts3.nix
deleted file mode 100644
index d0cfdf478..000000000
--- a/lass/2configs/ts3.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ config, ... }:
-
-{
-  services.teamspeak3 = {
-    enable = true;
-  };
-
-  krebs.iptables.tables.filter.INPUT.rules = [
-    #voice port
-    { predicate = "-p tcp --dport 9987"; target = "ACCEPT"; }
-    { predicate = "-p udp --dport 9987"; target = "ACCEPT"; }
-    ##file transfer port
-    { predicate = "-p tcp --dport 30033"; target = "ACCEPT"; }
-    { predicate = "-p udp --dport 30033"; target = "ACCEPT"; }
-    ##query port
-    #{ predicate = "-p tcp --dport 10011"; target = "ACCEPT"; }
-    #{ predicate = "-p udp --dport 10011"; target = "ACCEPT"; }
-  ];
-}
-- 
cgit v1.2.3


From 566951d3f0aa9fcc64df3ef5d7bf1fcf0eff04ab Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 24 Oct 2021 16:58:08 +0200
Subject: l prism.r: fix mdmonitor service error

---
 lass/1systems/prism/config.nix   | 10 ---------
 lass/1systems/prism/physical.nix |  6 ++++++
 lass/2configs/bepasty.nix        | 44 ----------------------------------------
 3 files changed, 6 insertions(+), 54 deletions(-)
 delete mode 100644 lass/2configs/bepasty.nix

(limited to 'lass')

diff --git a/lass/1systems/prism/config.nix b/lass/1systems/prism/config.nix
index 356b8d182..45f9ae00e 100644
--- a/lass/1systems/prism/config.nix
+++ b/lass/1systems/prism/config.nix
@@ -123,16 +123,6 @@ with import <stockholm/lib>;
     <stockholm/lass/2configs/ciko.nix>
     <stockholm/lass/2configs/container-networking.nix>
     <stockholm/lass/2configs/jitsi.nix>
-    { # quasi bepasty.nix
-      imports = [
-        <stockholm/lass/2configs/bepasty.nix>
-      ];
-      krebs.bepasty.servers."paste.r".nginx.extraConfig = ''
-        if ( $server_addr = "${config.krebs.build.host.nets.internet.ip4.addr}" ) {
-          return 403;
-        }
-      '';
-    }
     {
       services.tor = {
         enable = true;
diff --git a/lass/1systems/prism/physical.nix b/lass/1systems/prism/physical.nix
index 1a3bee850..26ecd1cda 100644
--- a/lass/1systems/prism/physical.nix
+++ b/lass/1systems/prism/physical.nix
@@ -65,6 +65,12 @@
     fsType = "ext4";
   };
 
+  # silence mdmonitor.service failures
+  # https://github.com/NixOS/nixpkgs/issues/72394
+  environment.etc."mdadm.conf".text = ''
+    MAILADDR root
+  '';
+
   nix.maxJobs = lib.mkDefault 8;
   powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
 
diff --git a/lass/2configs/bepasty.nix b/lass/2configs/bepasty.nix
deleted file mode 100644
index 9bd416c05..000000000
--- a/lass/2configs/bepasty.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ config, pkgs, ... }:
-with import <stockholm/lib>;
-
-# secrets used:
-#   wildcard.krebsco.de.crt
-#   wildcard.krebsco.de.key
-#   bepasty-secret.nix     <- contains single string
-
-with import <stockholm/lib>;
-let
-  secKey = import <secrets/bepasty-secret.nix>;
-  ext-doms = [
-    "paste.lassul.us"
-    "paste.krebsco.de"
-  ];
-in {
-
-  services.nginx.enable = mkDefault true;
-  krebs.bepasty = {
-    enable = true;
-    serveNginx= true;
-
-    servers = {
-      "paste.r" = {
-        nginx = {
-          serverAliases = [
-            "paste.${config.krebs.build.host.name}"
-            "paste.r"
-          ];
-        };
-        defaultPermissions = "admin,list,create,read,delete";
-        secretKey = secKey;
-      };
-    } //
-    genAttrs ext-doms (ext-dom: {
-      nginx = {
-        forceSSL = true;
-        enableACME = true;
-      };
-      defaultPermissions = "read,create";
-      secretKey = secKey;
-    });
-  };
-}
-- 
cgit v1.2.3


From 9a74f25e56b940748950eab0d8b1e0bc95d5f95d Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 24 Oct 2021 19:53:43 +0200
Subject: l mpv: use yt-dlp

---
 lass/2configs/mpv.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'lass')

diff --git a/lass/2configs/mpv.nix b/lass/2configs/mpv.nix
index 210551a62..854af3eb5 100644
--- a/lass/2configs/mpv.nix
+++ b/lass/2configs/mpv.nix
@@ -80,7 +80,12 @@ let
     name = "mpv";
     paths = [
       (pkgs.writeDashBin "mpv" ''
-        exec ${pkgs.mpv}/bin/mpv -vo=gpu --no-config --script=${autosub} "$@"
+        exec ${pkgs.mpv}/bin/mpv \
+         -vo=gpu \
+         --no-config \
+         --script=${autosub} \
+         --script-opts=ytdl_hook-ytdl_path=${pkgs.yt-dlp}/bin/yt-dlp \
+         "$@"
       '')
       pkgs.mpv
     ];
-- 
cgit v1.2.3


From d8f72378dcbc925b0256e103828baa9ee186cce7 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 24 Oct 2021 19:58:34 +0200
Subject: l domsen: add roundcube at mail.lassul.us

---
 lass/2configs/websites/domsen.nix | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'lass')

diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix
index 40f67537e..c67451eac 100644
--- a/lass/2configs/websites/domsen.nix
+++ b/lass/2configs/websites/domsen.nix
@@ -117,6 +117,13 @@ in {
   # workaround for android 7
   security.acme.certs."lassul.us".keyType = "rsa4096";
 
+  services.roundcube = {
+    enable = true;
+    hostName = "mail.lassul.us";
+    extraConfig = ''
+      $config['smtp_port'] = 25;
+    '';
+  };
   services.dovecot2 = {
     enable = true;
     mailLocation = "maildir:~/Mail";
-- 
cgit v1.2.3


From 2e9b241e868c17a3b29d782960d24437fd9bee2a Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 24 Oct 2021 20:05:08 +0200
Subject: l domsen: use default php

---
 lass/2configs/websites/domsen.nix | 1 -
 1 file changed, 1 deletion(-)

(limited to 'lass')

diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix
index c67451eac..c434955b8 100644
--- a/lass/2configs/websites/domsen.nix
+++ b/lass/2configs/websites/domsen.nix
@@ -82,7 +82,6 @@ in {
     "o_ubikmedia_de"
   ];
 
-  services.phpfpm.phpPackage = pkgs.php73;
   services.phpfpm.phpOptions = ''
     sendmail_path = ${sendmail} -t
     upload_max_filesize = 100M
-- 
cgit v1.2.3


From 6300cb0166a87311fbe6683cd840daa8f2ad3a8e Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 24 Oct 2021 20:08:16 +0200
Subject: l domsen: fix exim authenticator permissions

---
 lass/2configs/websites/domsen.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lass')

diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix
index c434955b8..3bb9ad4f8 100644
--- a/lass/2configs/websites/domsen.nix
+++ b/lass/2configs/websites/domsen.nix
@@ -144,7 +144,7 @@ in {
       driver = plaintext
       public_name = LOGIN
       server_prompts = "Username:: : Password::"
-      server_condition = ''${run{${config.lass.usershadow.path}/bin/verify_arg ${config.lass.usershadow.pattern} $auth1 $auth2}{yes}{no}}
+      server_condition = ''${run{/run/wrappers/bin/shadow_verify_arg ${config.lass.usershadow.pattern} $auth1 $auth2}{yes}{no}}
     '';
     internet-aliases = [
       { from = "dma@ubikmedia.de"; to = "domsen"; }
-- 
cgit v1.2.3


From 3bde0ed639ed6661f1e4e7fba07a172c8db855dd Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 24 Oct 2021 20:09:20 +0200
Subject: l domsen: add line user

---
 lass/2configs/websites/domsen.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'lass')

diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix
index 3bb9ad4f8..3f055e370 100644
--- a/lass/2configs/websites/domsen.nix
+++ b/lass/2configs/websites/domsen.nix
@@ -323,6 +323,15 @@ in {
     isNormalUser = true;
   };
 
+  users.users.line = {
+    uid = genid_uint31 "line";
+    home = "/home/line";
+    useDefaultShell = true;
+    # extraGroups = [ "xanf" ];
+    createHome = true;
+    isNormalUser = true;
+  };
+
   users.groups.xanf = {};
 
   krebs.on-failure.plans.restic-backups-domsen = {
-- 
cgit v1.2.3


From ee50871bd10676e26b280084417bcbc9963ffe70 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 24 Oct 2021 20:34:17 +0200
Subject: l coaxmetal.r: force only git.ref

---
 lass/1systems/coaxmetal/source.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lass')

diff --git a/lass/1systems/coaxmetal/source.nix b/lass/1systems/coaxmetal/source.nix
index 7f335ec05..abbf26c75 100644
--- a/lass/1systems/coaxmetal/source.nix
+++ b/lass/1systems/coaxmetal/source.nix
@@ -1,7 +1,7 @@
 { lib, pkgs, test, ... }: let
   npkgs = lib.importJSON ../../../krebs/nixpkgs-unstable.json;
 in {
-  nixpkgs = lib.mkForce (if test then { derivation = let
+  nixpkgs = (if test then lib.mkForce ({ derivation = let
     rev = npkgs.rev;
     sha256 = npkgs.sha256;
   in ''
@@ -15,7 +15,7 @@ in {
       rev = "${rev}";
       sha256 = "${sha256}";
     }
-  ''; } else {
-    git.ref = npkgs.rev;
+  ''; }) else {
+    git.ref = lib.mkForce npkgs.rev;
   });
 }
-- 
cgit v1.2.3


From ff39fb0d1f436e1587c71ffa1feb462fd4d784e6 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 24 Oct 2021 21:35:54 +0200
Subject: l echelon.r: import green-host

---
 lass/1systems/coaxmetal/config.nix   |  2 +-
 lass/1systems/echelon/config.nix     |  3 +++
 lass/2configs/prism-mounts/samba.nix | 15 +++++++++++++++
 3 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 lass/2configs/prism-mounts/samba.nix

(limited to 'lass')

diff --git a/lass/1systems/coaxmetal/config.nix b/lass/1systems/coaxmetal/config.nix
index 227c5e1e9..0e6bddf5e 100644
--- a/lass/1systems/coaxmetal/config.nix
+++ b/lass/1systems/coaxmetal/config.nix
@@ -16,7 +16,7 @@
     <stockholm/lass/2configs/steam.nix>
     <stockholm/lass/2configs/wine.nix>
     <stockholm/lass/2configs/fetchWallpaper.nix>
-    # <stockholm/lass/2configs/nfs-dl.nix>
+    <stockholm/lass/2configs/prism-mounts/samba.nix>
     <stockholm/lass/2configs/pass.nix>
     <stockholm/lass/2configs/mail.nix>
     <stockholm/lass/2configs/bitcoin.nix>
diff --git a/lass/1systems/echelon/config.nix b/lass/1systems/echelon/config.nix
index 9e72916b3..eacdff782 100644
--- a/lass/1systems/echelon/config.nix
+++ b/lass/1systems/echelon/config.nix
@@ -5,10 +5,13 @@
 
     <stockholm/lass/2configs/retiolum.nix>
     <stockholm/lass/2configs/tor-initrd.nix>
+    <stockholm/lass/2configs/syncthing.nix>
+    <stockholm/lass/2configs/green-host.nix>
   ];
 
   krebs.build.host = config.krebs.hosts.echelon;
 
   boot.tmpOnTmpfs = true;
+
 }
 
diff --git a/lass/2configs/prism-mounts/samba.nix b/lass/2configs/prism-mounts/samba.nix
new file mode 100644
index 000000000..4b1475ef3
--- /dev/null
+++ b/lass/2configs/prism-mounts/samba.nix
@@ -0,0 +1,15 @@
+{
+  fileSystems."/mnt/prism" = {
+    device = "//prism.r/public";
+    fsType = "cifs";
+    options = [
+      "guest"
+      "nofail"
+      "noauto"
+      "ro"
+      "x-systemd.automount"
+      "x-systemd.device-timeout=1"
+      "x-systemd.idle-timeout=1min"
+    ];
+  };
+ }
-- 
cgit v1.2.3


From 4596a2840b6a5c04acd4c2aa05280e425074c34e Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 24 Oct 2021 22:15:02 +0200
Subject: l pass: add remote unlock command

---
 lass/2configs/pass.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'lass')

diff --git a/lass/2configs/pass.nix b/lass/2configs/pass.nix
index 48070ea06..8ec3ac092 100644
--- a/lass/2configs/pass.nix
+++ b/lass/2configs/pass.nix
@@ -4,7 +4,15 @@
   users.users.mainUser.packages = with pkgs; [
     (pass.withExtensions (ext: [ ext.pass-otp ]))
     gnupg
+    (pkgs.writers.writeDashBin "unlock" ''
+      set -efu
+      HOST=$1
+
+      pw=$(pass show "admin/$HOST/luks")
+      torify sshn root@$(pass "hosts/$HOST/initrd/hostname") "echo $pw > /crypt-ramfs/passphrase"
+    '')
   ];
 
   programs.gnupg.agent.enable = true;
+
 }
-- 
cgit v1.2.3


From 703cdd24b2680f7ea3204cc3bed6bfe68ed006ce Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 25 Oct 2021 16:03:15 +0200
Subject: l blue: remove chat stuff

---
 lass/2configs/blue.nix | 37 -------------------------------------
 1 file changed, 37 deletions(-)

(limited to 'lass')

diff --git a/lass/2configs/blue.nix b/lass/2configs/blue.nix
index 15408a200..7890743bf 100644
--- a/lass/2configs/blue.nix
+++ b/lass/2configs/blue.nix
@@ -30,43 +30,6 @@ with (import <stockholm/lib>);
     { predicate = "-i wiregrill -p tcp --dport imap"; target = "ACCEPT";}
   ];
 
-  systemd.services.chat = let
-    tmux = pkgs.writeDash "tmux" ''
-      exec ${pkgs.tmux}/bin/tmux -f ${pkgs.writeText "tmux.conf" ''
-        set-option -g prefix `
-        unbind-key C-b
-        bind ` send-prefix
-
-        set-option -g status off
-        set-option -g default-terminal screen-256color
-
-        #use session instead of windows
-        bind-key c new-session
-        bind-key p switch-client -p
-        bind-key n switch-client -n
-        bind-key C-s switch-client -l
-      ''} "$@"
-    '';
-  in {
-    description = "chat environment setup";
-    after = [ "network.target" ];
-    wantedBy = [ "multi-user.target" ];
-
-    restartIfChanged = false;
-
-    path = [
-      pkgs.rxvt_unicode.terminfo
-    ];
-
-    serviceConfig = {
-      User = "lass";
-      RemainAfterExit = true;
-      Type = "oneshot";
-      ExecStart = "${tmux} -2 new-session -d -s IM ${pkgs.weechat}/bin/weechat";
-      ExecStop = "${tmux} kill-session -t IM";
-    };
-  };
-
   services.dovecot2 = {
     enable = true;
     mailLocation = "maildir:~/Maildir";
-- 
cgit v1.2.3


From 128b2a228479de5cf8c1c2f8f9c0a5a662f85db1 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 25 Oct 2021 16:20:51 +0200
Subject: l IM: add weechat to system PATH

---
 lass/2configs/IM.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lass')

diff --git a/lass/2configs/IM.nix b/lass/2configs/IM.nix
index 5108f6bc1..5b8cebf5c 100644
--- a/lass/2configs/IM.nix
+++ b/lass/2configs/IM.nix
@@ -30,7 +30,7 @@ in {
   imports = [
     ./bitlbee.nix
   ];
-  environment.systemPackages = [ tmux ];
+  environment.systemPackages = [ tmux weechat ];
   systemd.services.chat = {
     description = "chat environment setup";
     after = [ "network.target" ];
-- 
cgit v1.2.3


From 64387bbb9a3f41b5b0c0951c9e70b2d57227e1b3 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 25 Oct 2021 16:21:41 +0200
Subject: l binary-cache: set priority behind cache.nixos.org

---
 lass/2configs/binary-cache/server.nix | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'lass')

diff --git a/lass/2configs/binary-cache/server.nix b/lass/2configs/binary-cache/server.nix
index 101dd045f..baa891821 100644
--- a/lass/2configs/binary-cache/server.nix
+++ b/lass/2configs/binary-cache/server.nix
@@ -29,6 +29,13 @@
       locations."/".extraConfig = ''
         proxy_pass http://localhost:${toString config.services.nix-serve.port};
       '';
+      locations."= /nix-cache-info".extraConfig = ''
+        alias ${pkgs.writeText "cache-info" ''
+          StoreDir: /nix/store
+          WantMassQuery: 1
+          Priority: 42
+        ''};
+      '';
     };
     virtualHosts."cache.krebsco.de" = {
       forceSSL = true;
-- 
cgit v1.2.3


From 11d70bd4bf722beb805a3bbdff92a358b1d29898 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 25 Oct 2021 16:22:12 +0200
Subject: l blue: remove more legacy stuff

---
 lass/2configs/blue.nix | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'lass')

diff --git a/lass/2configs/blue.nix b/lass/2configs/blue.nix
index 7890743bf..28c7d640d 100644
--- a/lass/2configs/blue.nix
+++ b/lass/2configs/blue.nix
@@ -2,16 +2,13 @@ with (import <stockholm/lib>);
 { config, lib, pkgs, ... }:
 
 {
-
   imports = [
-    ./bitlbee.nix
     ./mail.nix
     ./pass.nix
   ];
 
   environment.systemPackages = with pkgs; [
     ag
-    brain
     dic
     nmap
     git-preview
-- 
cgit v1.2.3


From 0442dacdb75099c639191521f926d349aea16a45 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 25 Oct 2021 16:23:03 +0200
Subject: l: deprecate mors key

---
 lass/2configs/default.nix | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

(limited to 'lass')

diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix
index 1bcfb162c..5a9428322 100644
--- a/lass/2configs/default.nix
+++ b/lass/2configs/default.nix
@@ -19,10 +19,9 @@ with import <stockholm/lib>;
       users.extraUsers = {
         root = {
           openssh.authorizedKeys.keys = [
-            config.krebs.users.lass-mors.pubkey
+            config.krebs.users.lass.pubkey
             config.krebs.users.lass-blue.pubkey
             config.krebs.users.lass-green.pubkey
-            config.krebs.users.lass-yubikey.pubkey
           ];
         };
         mainUser = {
@@ -35,25 +34,17 @@ with import <stockholm/lib>;
           isNormalUser = true;
           extraGroups = [
             "audio"
+            "video"
             "fuse"
             "wheel"
           ];
           openssh.authorizedKeys.keys = [
-            config.krebs.users.lass-mors.pubkey
+            config.krebs.users.lass.pubkey
             config.krebs.users.lass-blue.pubkey
             config.krebs.users.lass-green.pubkey
-            config.krebs.users.lass-yubikey.pubkey
-          ];
-        };
-        nix = {
-          isNormalUser = true;
-          uid = genid_uint31 "nix";
-          openssh.authorizedKeys.keys = [
-            config.krebs.hosts.mors.ssh.pubkey
           ];
         };
       };
-      nix.trustedUsers = ["nix"];
     }
     {
       environment.variables = {
-- 
cgit v1.2.3


From e99594d695e905eddc658fdd1b36c5e9efd578c8 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 25 Oct 2021 16:25:40 +0200
Subject: l: use python3 for sshuttle

---
 lass/2configs/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lass')

diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix
index 5a9428322..bfade92c4 100644
--- a/lass/2configs/default.nix
+++ b/lass/2configs/default.nix
@@ -61,7 +61,7 @@ with import <stockholm/lib>;
     {
       #for sshuttle
       environment.systemPackages = [
-        pkgs.pythonPackages.python
+        pkgs.python3Packages.python
       ];
     }
   ];
-- 
cgit v1.2.3


From 693af05562003ba154accba30b989615fe13e68d Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 25 Oct 2021 16:26:05 +0200
Subject: l: add some pkgs

---
 lass/2configs/default.nix | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'lass')

diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix
index bfade92c4..c4cedc086 100644
--- a/lass/2configs/default.nix
+++ b/lass/2configs/default.nix
@@ -91,6 +91,7 @@ with import <stockholm/lib>;
   #stockholm
     deploy
     git
+    git-preview
     gnumake
     jq
 
@@ -115,6 +116,7 @@ with import <stockholm/lib>;
     file
     hashPassword
     kpaste
+    cyberlocker-tools
     pciutils
     pop
     q
-- 
cgit v1.2.3


From e3740cb6b4ae61c7bbbc151fedb9e5aa8edd1acd Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 25 Oct 2021 16:26:22 +0200
Subject: l: make journald storage persistent

---
 lass/2configs/default.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lass')

diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix
index c4cedc086..f3eb774cd 100644
--- a/lass/2configs/default.nix
+++ b/lass/2configs/default.nix
@@ -178,6 +178,7 @@ with import <stockholm/lib>;
   services.journald.extraConfig = ''
     SystemMaxUse=1G
     RuntimeMaxUse=128M
+    Storage=persistent
   '';
 
   krebs.iptables = {
-- 
cgit v1.2.3


From 12046d150162bf1c111a0ea858cd67a5017221e6 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 25 Oct 2021 16:26:30 +0200
Subject: l: set default timezone

---
 lass/2configs/default.nix | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'lass')

diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix
index f3eb774cd..91922e5c9 100644
--- a/lass/2configs/default.nix
+++ b/lass/2configs/default.nix
@@ -217,5 +217,7 @@ with import <stockholm/lib>;
 
   # use 24:00 time format, the default got sneakily changed around 20.03
   i18n.defaultLocale = mkDefault "C.UTF-8";
+  time.timeZone = mkDefault"Europe/Berlin";
+
   system.stateVersion = mkDefault "20.03";
 }
-- 
cgit v1.2.3


From 3a7c33394328108cc9159de89367a90701fcbc80 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 25 Oct 2021 19:52:54 +0200
Subject: l green.r: add brain repo

---
 lass/1systems/green/config.nix |  9 +++++++
 lass/2configs/git-brain.nix    | 57 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 66 insertions(+)
 create mode 100644 lass/2configs/git-brain.nix

(limited to 'lass')

diff --git a/lass/1systems/green/config.nix b/lass/1systems/green/config.nix
index d7bf62b40..b41e396c9 100644
--- a/lass/1systems/green/config.nix
+++ b/lass/1systems/green/config.nix
@@ -17,6 +17,8 @@ with import <stockholm/lib>;
     <stockholm/lass/2configs/IM.nix>
     <stockholm/lass/2configs/muchsync.nix>
     <stockholm/lass/2configs/pass.nix>
+
+    <stockholm/lass/2configs/git-brain.nix>
   ];
 
   krebs.build.host = config.krebs.hosts.green;
@@ -68,6 +70,13 @@ with import <stockholm/lib>;
       ];
       clearTarget = true;
     };
+    "/var/lib/git" = {
+      source = "/var/state/git";
+      options = [
+        "-M ${toString config.users.users.git.uid}"
+      ];
+      clearTarget = true;
+    };
   };
 
   systemd.services."bindfs-_home_lass_Maildir".serviceConfig.ExecStartPost = pkgs.writeDash "symlink-notmuch" ''
diff --git a/lass/2configs/git-brain.nix b/lass/2configs/git-brain.nix
new file mode 100644
index 000000000..1c6f92fcd
--- /dev/null
+++ b/lass/2configs/git-brain.nix
@@ -0,0 +1,57 @@
+{ config, lib, pkgs, ... }:
+with import <stockholm/lib>;
+let
+
+  repos = krebs-repos;
+  rules = concatMap krebs-rules (attrValues krebs-repos);
+
+  krebs-repos = mapAttrs make-krebs-repo {
+    brain = { };
+    krebs-secrets = { };
+  };
+
+
+  make-krebs-repo = with git; name: { cgit ? {}, ... }: {
+    inherit cgit name;
+    public = false;
+    hooks = {
+      post-receive = pkgs.git-hooks.irc-announce {
+        nick = config.networking.hostName;
+        verbose = true;
+        channel = "#xxx";
+        # TODO remove the hardcoded hostname
+        server = "irc.r";
+      };
+    };
+  };
+
+
+
+  # TODO: get the list of all krebsministers
+  krebsminister = with config.krebs.users; [ makefu tv ];
+  krebs-rules = repo:
+    set-owners repo [ config.krebs.users.lass ] ++ set-ro-access repo krebsminister;
+
+  set-ro-access = with git; repo: user:
+      singleton {
+        inherit user;
+        repo = [ repo ];
+        perm = fetch;
+      };
+
+  set-owners = with git;repo: user:
+      singleton {
+        inherit user;
+        repo = [ repo ];
+        perm = push "refs/*" [ non-fast-forward create delete merge ];
+      };
+
+in {
+  krebs.git = {
+    enable = true;
+    cgit = {
+      enable = false;
+    };
+    inherit repos rules;
+  };
+}
-- 
cgit v1.2.3


From ae9b7488fa5af6233a38a52bf53fc3c0e2da6532 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 25 Oct 2021 19:56:30 +0200
Subject: l radio: add controls page

---
 lass/2configs/radio.nix | 83 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 83 insertions(+)

(limited to 'lass')

diff --git a/lass/2configs/radio.nix b/lass/2configs/radio.nix
index b1e1ed4d9..4a061244d 100644
--- a/lass/2configs/radio.nix
+++ b/lass/2configs/radio.nix
@@ -356,6 +356,89 @@ in {
       locations."= /good".extraConfig = ''
         proxy_pass http://localhost:8001;
       '';
+      locations."= /controls".extraConfig = ''
+        default_type "text/html";
+        alias ${pkgs.writeText "controls.html" ''
+<!doctype html>
+
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+
+  <title>The_Playlist Voting!</title>
+<style>
+#good {
+    display: block;
+  width: 100%;
+  border: none;
+  background-color: #04AA6D;
+  padding: 14px;
+  margin: 14px 0 0 0;
+  height: 100px;
+  font-size: 16px;
+  cursor: pointer;
+  text-align: center;
+}
+#bad {
+    display: block;
+  width: 100%;
+  border: none;
+  background-color: red;
+  padding: 14px;
+    height: 100px;
+
+  margin: 14px 0 0 0;
+  font-size: 16px;
+  cursor: pointer;
+  text-align: center;
+}
+</style>
+
+</head>
+
+<body>
+  <div id=votenote></div>
+  <button id=good type="button"> GUT </button>
+
+  <button id=bad type="button"> SCHLECHT </button>
+  <center>
+    Currently Running: <br/><div>
+      <b id=current></b>
+    </div>
+    <div id=vote>
+    </div>
+    <audio controls autoplay="autoplay">
+      <source src="https://radio.lassul.us/radio.ogg" type="audio/ogg">
+      Your browser does not support the audio element.
+    </audio>
+  </center>
+
+  <script>
+    document.getElementById("good").onclick=async ()=>{
+      let result = await fetch("https://radio.lassul.us/good", {"method": "POST"})
+      document.getElementById("vote").textContent =  "Dieses Lied findest du gut"
+    };
+    document.getElementById("bad").onclick=async ()=>{
+      let result = await fetch("https://radio.lassul.us/skip", {"method": "POST"})
+      document.getElementById("vote").textContent =  "Dieses Lied findest du schlecht"
+    };
+
+    async function current() {
+      let result = await fetch("https://radio.lassul.us/current", {"method": "GET"})
+      let data = await result.json()
+      document.getElementById("current").textContent = data.name
+    }
+    window.onload = function() {
+      window.setInterval('current()', 10000)
+      current()
+    }
+
+  </script>
+</body>
+</html>
+      ''};
+      '';
       extraConfig = ''
         add_header 'Access-Control-Allow-Origin' '*';
         add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
-- 
cgit v1.2.3


From 9bc7f5d7d537e86ec5ea1a89be23a9614fb47caf Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 25 Oct 2021 20:02:09 +0200
Subject: l radio: use hackint irc server

---
 lass/2configs/radio.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lass')

diff --git a/lass/2configs/radio.nix b/lass/2configs/radio.nix
index 4a061244d..501251d13 100644
--- a/lass/2configs/radio.nix
+++ b/lass/2configs/radio.nix
@@ -454,7 +454,7 @@ in {
           </head>
           <body>
             <div style="display:inline-block;margin:0px;padding:0px;overflow:hidden">
-              <iframe src="https://kiwiirc.com/client/irc.freenode.org/?nick=kiwi_test|?&theme=cli#the_playlist" frameborder="0" style="overflow:hidden;overflow-x:hidden;overflow-y:hidden;height:95%;width:100%;position:absolute;top:0px;left:0px;right:0px;bottom:0px" height="95%" width="100%"></iframe>
+              <iframe src="https://kiwiirc.com/client/irc.hackint.org/?nick=kiwi_test|?&theme=cli#the_playlist" frameborder="0" style="overflow:hidden;overflow-x:hidden;overflow-y:hidden;height:95%;width:100%;position:absolute;top:0px;left:0px;right:0px;bottom:0px" height="95%" width="100%"></iframe>
             </div>
             <div style="position:absolute;bottom:1px;display:inline-block;background-color:red;">
               <audio controls autoplay="autoplay"><source src="http://lassul.us:8000/radio.ogg" type="audio/ogg">Your browser does not support the audio element.</audio>
-- 
cgit v1.2.3


From c6cfd582ec1c3ef21ddc63a1edef6d6b9d4cdcbe Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 25 Oct 2021 20:03:42 +0200
Subject: l exim-smarthost: add green & coaxmetal to sender hosts

---
 lass/2configs/exim-smarthost.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'lass')

diff --git a/lass/2configs/exim-smarthost.nix b/lass/2configs/exim-smarthost.nix
index b677fe455..cb9abd43a 100644
--- a/lass/2configs/exim-smarthost.nix
+++ b/lass/2configs/exim-smarthost.nix
@@ -19,8 +19,10 @@ in {
       "lassul.us"
     ];
     relay_from_hosts = map (host: host.nets.retiolum.ip6.addr) [
-      config.krebs.hosts.mors
       config.krebs.hosts.blue
+      config.krebs.hosts.coaxmetal
+      config.krebs.hosts.green
+      config.krebs.hosts.mors
       config.krebs.hosts.xerxes
     ];
     internet-aliases = map (from: { inherit from to; }) mails;
-- 
cgit v1.2.3


From dd9dc0e71a6a252a7dd2827bba253865b9948447 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 25 Oct 2021 20:04:06 +0200
Subject: l: add tmux config

---
 lass/2configs/baseX.nix |  1 +
 lass/2configs/tmux.nix  | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+)
 create mode 100644 lass/2configs/tmux.nix

(limited to 'lass')

diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix
index 23eaa2802..e4d397efc 100644
--- a/lass/2configs/baseX.nix
+++ b/lass/2configs/baseX.nix
@@ -11,6 +11,7 @@ in {
     ./xdg-open.nix
     ./yubikey.nix
     ./pipewire.nix
+    ./tmux.nix
     ./xmonad.nix
     {
       krebs.per-user.lass.packages = [
diff --git a/lass/2configs/tmux.nix b/lass/2configs/tmux.nix
new file mode 100644
index 000000000..c977a1105
--- /dev/null
+++ b/lass/2configs/tmux.nix
@@ -0,0 +1,46 @@
+with import <stockholm/lib>;
+{ config, pkgs, ... }:
+
+{
+  nixpkgs.config.packageOverrides = super: {
+    tmux = pkgs.symlinkJoin {
+      name = "tmux";
+      paths = [
+        (pkgs.writeDashBin "tmux" ''
+          exec ${super.tmux}/bin/tmux -f ${pkgs.writeText "tmux.conf" ''
+            #change prefix key to `
+            set-option -g prefix `
+            unbind-key C-b
+            bind ` send-prefix
+
+            set-option -g default-terminal screen-256color
+
+            #use session instead of windows
+            bind-key c new-session
+            bind-key p switch-client -p
+            bind-key n switch-client -n
+            bind-key C-s switch-client -l
+          ''} "$@"
+        '')
+        super.tmux
+      ];
+    };
+  };
+  environment.systemPackages = with pkgs; [
+    tmux
+  ];
+
+  # programs.bash.interactiveShellInit = ''
+  #   if [[ "$TERM" != "linux" && -z "$TMUX" ]]; then
+  #     if [[ -n "$SSH_AUTH_SOCK" ]]; then
+  #       tmux set-environment -g SSH_AUTH_SOCK "$SSH_AUTH_SOCK" 2>/dev/null
+  #     fi
+
+  #     exec tmux -u
+  #   fi
+  #   if [[ "$__host__" != "$HOST" ]]; then
+  #     tmux set -g status-bg colour$(string_hash $HOST 255)
+  #     export __host__=$HOST
+  #   fi
+  # '';
+}
-- 
cgit v1.2.3


From 88d707576f1e944cedda7e8d7e51e76804982199 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 25 Oct 2021 20:05:17 +0200
Subject: l fetchWallpaper: use stars-berlin

---
 lass/2configs/fetchWallpaper.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lass')

diff --git a/lass/2configs/fetchWallpaper.nix b/lass/2configs/fetchWallpaper.nix
index 251f886a9..381df494d 100644
--- a/lass/2configs/fetchWallpaper.nix
+++ b/lass/2configs/fetchWallpaper.nix
@@ -5,7 +5,7 @@ let
 in {
   krebs.fetchWallpaper = {
     enable = true;
-    url = "prism/realwallpaper-krebs-stars.png";
+    url = "prism/realwallpaper-krebs-stars-berlin.png";
   };
 }
 
-- 
cgit v1.2.3


From f25fb4ae80e19e7e5c8a1c54c44da5e598b8bbb4 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 25 Oct 2021 20:15:34 +0200
Subject: l baseX: add some pkgs

---
 lass/2configs/baseX.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'lass')

diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix
index e4d397efc..124eef2cf 100644
--- a/lass/2configs/baseX.nix
+++ b/lass/2configs/baseX.nix
@@ -62,7 +62,8 @@ in {
     font-size
     fzfmenu
     gimp
-    gitAndTools.qgit
+    gitAndTools.hub
+    git-crypt
     git-preview
     gnome3.dconf
     iodine
@@ -86,6 +87,7 @@ in {
     xorg.xhost
     xsel
     zathura
+    flameshot-once
     (pkgs.writeDashBin "screenshot" ''
       set -efu
 
-- 
cgit v1.2.3


From 300f71ded68ac01b9286b52d813811f417c83280 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 25 Oct 2021 20:16:00 +0200
Subject: l gc: don't gc in containers

---
 lass/2configs/gc.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lass')

diff --git a/lass/2configs/gc.nix b/lass/2configs/gc.nix
index f9c61c461..224a6cbb9 100644
--- a/lass/2configs/gc.nix
+++ b/lass/2configs/gc.nix
@@ -3,7 +3,7 @@
 with import <stockholm/lib>;
 {
   nix.gc = {
-    automatic = ! (elem config.krebs.build.host.name [ "mors" "xerxes" ] || config.boot.isContainer);
+    automatic = ! (elem config.krebs.build.host.name [ "mors" "xerxes" "coaxmetal" ] || config.boot.isContainer);
     options = "--delete-older-than 15d";
   };
 }
-- 
cgit v1.2.3


From 22838aee86af1880f444c582d14e65e12ac31ae3 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 25 Oct 2021 20:22:43 +0200
Subject: l hw x220: remove deprecated cryptoModules

---
 lass/2configs/hw/x220.nix | 1 -
 1 file changed, 1 deletion(-)

(limited to 'lass')

diff --git a/lass/2configs/hw/x220.nix b/lass/2configs/hw/x220.nix
index 31f9787e0..b2e8892b1 100644
--- a/lass/2configs/hw/x220.nix
+++ b/lass/2configs/hw/x220.nix
@@ -6,7 +6,6 @@
 
   boot = {
     initrd.luks.devices.luksroot.device = "/dev/sda3";
-    initrd.luks.cryptoModules = [ "aes" "sha512" "sha1" "xts" ];
     initrd.availableKernelModules = [ "xhci_hcd" "ehci_pci" "ahci" "usb_storage" ];
     extraModulePackages = [
       config.boot.kernelPackages.tp_smapi
-- 
cgit v1.2.3


From ff013c82ac83055f3b5460fb67048e3182e938e9 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 25 Oct 2021 20:23:02 +0200
Subject: l hw x220: remove tmpfs on /tmp

---
 lass/2configs/hw/x220.nix | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'lass')

diff --git a/lass/2configs/hw/x220.nix b/lass/2configs/hw/x220.nix
index b2e8892b1..cbb5b168d 100644
--- a/lass/2configs/hw/x220.nix
+++ b/lass/2configs/hw/x220.nix
@@ -35,11 +35,6 @@
       fsType = "btrfs";
       options = ["defaults" "noatime" "ssd" "compress=lzo"];
     };
-    "/tmp" = {
-      device = "tmpfs";
-      fsType = "tmpfs";
-      options = ["nosuid" "nodev" "noatime"];
-    };
   };
 
   services.logind.lidSwitch = "ignore";
-- 
cgit v1.2.3


From 21a73205b72615156232eb84a4028eeb7dd5220a Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 25 Oct 2021 20:24:13 +0200
Subject: l git: allow pushing via yubi and green only

---
 lass/2configs/git.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lass')

diff --git a/lass/2configs/git.nix b/lass/2configs/git.nix
index e6aeca5d1..e6c77f64b 100644
--- a/lass/2configs/git.nix
+++ b/lass/2configs/git.nix
@@ -189,7 +189,7 @@ let
     with git // config.krebs.users;
     repo:
       singleton {
-        user = [ lass lass-mors lass-blue lass-yubikey ];
+        user = [ lass lass-green ];
         repo = [ repo ];
         perm = push "refs/*" [ non-fast-forward create delete merge ];
       } ++
-- 
cgit v1.2.3


From 43b2c9368e63d79a1305002515d00d6ef12651bd Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 25 Oct 2021 20:24:50 +0200
Subject: l muchsync: add coaxmetal.r to synced hosts

---
 lass/2configs/muchsync.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lass')

diff --git a/lass/2configs/muchsync.nix b/lass/2configs/muchsync.nix
index b09bf579b..392970dbd 100644
--- a/lass/2configs/muchsync.nix
+++ b/lass/2configs/muchsync.nix
@@ -4,6 +4,7 @@ with (import <stockholm/lib>);
 {
   systemd.services.muchsync = let
     hosts = [
+      "coaxmetal.r"
       "mors.r"
       "green.r"
       "blue.r"
-- 
cgit v1.2.3


From 25fcc33c61d52297b83940943113123a46f1d1e7 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 25 Oct 2021 20:25:19 +0200
Subject: l pipewire: add pkgs.ponymix to PATH

---
 lass/2configs/pipewire.nix | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'lass')

diff --git a/lass/2configs/pipewire.nix b/lass/2configs/pipewire.nix
index 8fdcff4e3..c21ab5d9c 100644
--- a/lass/2configs/pipewire.nix
+++ b/lass/2configs/pipewire.nix
@@ -16,6 +16,7 @@
   environment.systemPackages = with pkgs; [
     alsaUtils
     pulseaudioLight
+    ponymix
   ];
 
   environment.variables.PULSE_SERVER = "localhost:4713";
@@ -26,6 +27,7 @@
     alsa.support32Bit = true;
     pulse.enable = true;
     jack.enable = true;
+
     # https://gitlab.freedesktop.org/pipewire/pipewire/-/wikis/Migrate-PulseAudio#module-native-protocol-tcp
     config.pipewire-pulse = {
       "context.properties" = {
-- 
cgit v1.2.3


From 42202f6bb4bf2b1640e8f7c3c3e242b32704ffde Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 25 Oct 2021 20:27:26 +0200
Subject: l vim: fix mouse in alacritty

---
 lass/2configs/vim.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lass')

diff --git a/lass/2configs/vim.nix b/lass/2configs/vim.nix
index 6c730efdd..36ce3d74c 100644
--- a/lass/2configs/vim.nix
+++ b/lass/2configs/vim.nix
@@ -23,6 +23,7 @@ let
     set directory=${dirs.swapdir}//
     set hlsearch
     set incsearch
+    set ttymouse=sgr
     set mouse=a
     set ruler
     set pastetoggle=<INS>
-- 
cgit v1.2.3


From 2dcbc9027ee66d5d0324cddd8c396704c74e8e9a Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 25 Oct 2021 20:28:06 +0200
Subject: l zsh: remove default aliases

---
 lass/2configs/zsh.nix | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'lass')

diff --git a/lass/2configs/zsh.nix b/lass/2configs/zsh.nix
index e65cdd97d..6571461ca 100644
--- a/lass/2configs/zsh.nix
+++ b/lass/2configs/zsh.nix
@@ -58,7 +58,6 @@
         rev = "a75fca8545f91abb8a5f802981033ef54bf1eac0";
         sha256="1lzj0qnj89mzh76ha137mnz2hf86k278rh0y9x124ghxj9yqsnb4";
       }}/LS_COLORS)
-      alias ls='ls --color'
       zstyle ':completion:*:default' list-colors ''${(s.:.)LS_COLORS}
 
       #emacs bindings
@@ -66,12 +65,6 @@
       bindkey "[8~" end-of-line
       bindkey "Oc" emacs-forward-word
       bindkey "Od" emacs-backward-word
-
-      #aliases
-      alias ll='ls -l'
-      alias la='ls -la'
-
-      #fancy window title magic
     '';
     promptInit = ''
       # TODO: figure out why we need to set this here
-- 
cgit v1.2.3


From 64b3606044c17815636213813777b139d3fedde7 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 25 Oct 2021 20:37:08 +0200
Subject: l reaktor-coders: remove lambdabot stuff

---
 lass/2configs/reaktor-coders.nix | 37 -------------------------------------
 1 file changed, 37 deletions(-)

(limited to 'lass')

diff --git a/lass/2configs/reaktor-coders.nix b/lass/2configs/reaktor-coders.nix
index 7fd6a2a29..457d5b6c7 100644
--- a/lass/2configs/reaktor-coders.nix
+++ b/lass/2configs/reaktor-coders.nix
@@ -27,43 +27,6 @@ in {
           hooks.PRIVMSG = [
             hooks.sed
             hooks.url-title
-            {
-              activate = "match";
-              pattern = ''^@([^ ]+) (.*)$'';
-              command = 1;
-              arguments = [2];
-              env.HOME = config.krebs.reaktor2.coders.stateDir;
-              commands = let
-                lambdabot = (import (pkgs.fetchFromGitHub {
-                  owner = "NixOS"; repo = "nixpkgs";
-                  rev = "a4ec1841da14fc98c5c35cc72242c23bb698d4ac";
-                  sha256 = "148fpw31s922hxrf28yhrci296f7c7zd81hf0k6zs05rq0i3szgy";
-                }) {}).lambdabot;
-                lambdabotWrapper = pkgs.writeDash "lambdabot.wrapper" ''
-                  exec ${lambdabot}/bin/lambdabot \
-                    -XStandaloneDeriving -XGADTs -XFlexibleContexts \
-                    -XFlexibleInstances -XMultiParamTypeClasses \
-                    -XOverloadedStrings -XFunctionalDependencies \
-                    -e "$@"
-                '';
-              in {
-                pl.filename = pkgs.writeDash "lambdabot-pl" ''
-                  ${lambdabotWrapper} "@pl $1"
-                '';
-                type.filename = pkgs.writeDash "lambdabot-type" ''
-                  ${lambdabotWrapper} "@type $1"
-                '';
-                "let".filename = pkgs.writeDash "lambdabot-let" ''
-                  ${lambdabotWrapper} "@let $1"
-                '';
-                run.filename = pkgs.writeDash "lambdabot-run" ''
-                  ${lambdabotWrapper} "@run $1"
-                '';
-                kind.filename = pkgs.writeDash "lambdabot-kind" ''
-                  ${lambdabotWrapper} "@kind $1"
-                '';
-              };
-            }
             {
               activate = "match";
               pattern = ''^!([^ ]+)(?:\s*(.*))?'';
-- 
cgit v1.2.3


From a04eb31e7b59d992eb006453a88698346337f897 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 25 Oct 2021 23:13:08 +0200
Subject: l sshify: add usage

---
 lass/5pkgs/sshify/default.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lass')

diff --git a/lass/5pkgs/sshify/default.nix b/lass/5pkgs/sshify/default.nix
index aba0ab6bb..445b9b4aa 100644
--- a/lass/5pkgs/sshify/default.nix
+++ b/lass/5pkgs/sshify/default.nix
@@ -1,4 +1,5 @@
 { pkgs }:
+# usage: sshify prism.r -- curl ifconfig.me
 pkgs.writers.writeBashBin "sshify" ''
   set -efu
 
-- 
cgit v1.2.3


From fdbfd2d4eca520ddee23fe76c702a4d38021d00b Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Tue, 26 Oct 2021 21:00:22 +0200
Subject: l krops: use fancy deploy

---
 lass/krops.nix | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

(limited to 'lass')

diff --git a/lass/krops.nix b/lass/krops.nix
index fe5c00f3d..769112706 100644
--- a/lass/krops.nix
+++ b/lass/krops.nix
@@ -33,9 +33,23 @@
 
 in {
 
-  # usage: $(nix-build --no-out-link --argstr name HOSTNAME -A deploy)
-  deploy = { target ? "root@${name}/var/src" }: pkgs.krops.writeDeploy "${name}-deploy" {
+  deploy = { target ? "root@${name}/var/src" }: pkgs.krops.writeCommand "deploy" {
+    command = targetPath: ''
+
+      set -fu
+
+      outDir=$(mktemp -d)
+      trap "rm -rf $outDir;" INT TERM EXIT
+
+      nix build \
+        -I "${targetPath}" \
+        -f '<nixpkgs/nixos>' config.system.build.toplevel \
+        -o "$outDir/out"
+
+      $outDir/out/bin/switch-to-configuration switch
+    '';
     source = source { test = false; };
+    allocateTTY = true;
     inherit target;
   };
 
-- 
cgit v1.2.3


From 98cc766ab53b29d34867023bd7d8855c325c43e3 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Tue, 26 Oct 2021 21:01:00 +0200
Subject: l: add some helper tools

---
 lass/2configs/programs.nix | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'lass')

diff --git a/lass/2configs/programs.nix b/lass/2configs/programs.nix
index 241d263f8..0a4b4fd9b 100644
--- a/lass/2configs/programs.nix
+++ b/lass/2configs/programs.nix
@@ -13,9 +13,23 @@
     pv
     pwgen
     remmina
+    ripgrep
     silver-searcher
+    transmission
     wget
     xsel
     youtube-dl
+    (pkgs.writeDashBin "tether-on" ''
+      adb shell svc usb setFunctions rndis
+    '')
+    (pkgs.writeDashBin "tether-off" ''
+      adb shell svc usb setFunctions
+    '')
+    (pkgs.writeDashBin "dl-movie" ''
+      ${pkgs.transmission}/bin/transmission-remote yellow.r -w /var/download/finished/sorted/movies -a "$@"
+    '')
+    (pkgs.writeDashBin "dl-series" ''
+      ${pkgs.transmission}/bin/transmission-remote yellow.r -w /var/download/finished/sorted/series -a "$@"
+    '')
   ];
 }
-- 
cgit v1.2.3


From 71ded757b3c8fb6066966b9e646d7f846d9aee4b Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Tue, 26 Oct 2021 21:01:32 +0200
Subject: l sync: add coaxmetal.r

---
 lass/2configs/sync/sync.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lass')

diff --git a/lass/2configs/sync/sync.nix b/lass/2configs/sync/sync.nix
index bee1d03ac..7c0f2e030 100644
--- a/lass/2configs/sync/sync.nix
+++ b/lass/2configs/sync/sync.nix
@@ -1,6 +1,6 @@
 {
   services.syncthing.declarative.folders."/home/lass/sync" = {
-    devices = [ "mors" "icarus" "xerxes" "shodan" "green" "blue" ];
+    devices = [ "mors" "icarus" "xerxes" "shodan" "green" "blue" "coaxmetal" ];
   };
   krebs.permown."/home/lass/sync" = {
     file-mode = "u+rw,g+rw";
--