7 files changed, 32 insertions, 18 deletions
diff --git a/lass/2configs/audit.nix b/lass/2configs/audit.nix
deleted file mode 100644
index 644741a5b..000000000
--- a/lass/2configs/audit.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ ... }:
-
-{
-  security.audit = {
-    rules = [
-      "-a task,never"
-    ];
-  };
-}
diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix
index a8bb8693f..1638264d9 100644
--- a/lass/2configs/baseX.nix
+++ b/lass/2configs/baseX.nix
@@ -74,21 +74,20 @@ in {
     pavucontrol
     powertop
     push
+    rxvt_unicode
+    screengrab
     slock
     sxiv
+    termite
     xclip
     xorg.xbacklight
     xorg.xhost
     xsel
-    zathura
-
-    mpv-poll
-    yt-next
-
     youtube-tools
+    yt-next
+    zathura
 
-    rxvt_unicode
-    termite
+    cabal2nix
   ];
 
   fonts.fonts = with pkgs; [
diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix
index 180647a6d..f8b750093 100644
--- a/lass/2configs/default.nix
+++ b/lass/2configs/default.nix
@@ -2,7 +2,6 @@
 with import <stockholm/lib>;
 {
   imports = [
-    ../2configs/audit.nix
     ../2configs/binary-cache/client.nix
     ../2configs/gc.nix
     ../2configs/mc.nix
diff --git a/lass/2configs/exim-smarthost.nix b/lass/2configs/exim-smarthost.nix
index f9c8f8ebc..763633dd9 100644
--- a/lass/2configs/exim-smarthost.nix
+++ b/lass/2configs/exim-smarthost.nix
@@ -46,6 +46,8 @@ with import <stockholm/lib>;
       { from = "apple@lassul.us"; to = lass.mail; }
       { from = "coinbase@lassul.us"; to = lass.mail; }
       { from = "tomtop@lassul.us"; to = lass.mail; }
+      { from = "aliexpress@lassul.us"; to = lass.mail; }
+      { from = "business@lassul.us"; to = lass.mail; }
     ];
     system-aliases = [
       { from = "mailer-daemon"; to = "postmaster"; }
diff --git a/lass/2configs/mail.nix b/lass/2configs/mail.nix
index 91127f737..962efaf3f 100644
--- a/lass/2configs/mail.nix
+++ b/lass/2configs/mail.nix
@@ -76,6 +76,7 @@ let
         "INBOX"     "notmuch://?query=tag:inbox \
                      and NOT to:nix-devel\
                      and NOT to:shackspace\
+                     and NOT to:security\
                      and NOT to:c-base" \
         "shack"     "notmuch://?query=to:shackspace"\
         "c-base"    "notmuch://?query=to:c-base"\
diff --git a/lass/2configs/vim.nix b/lass/2configs/vim.nix
index 698344b09..f6c736fbc 100644
--- a/lass/2configs/vim.nix
+++ b/lass/2configs/vim.nix
@@ -98,8 +98,13 @@ let
     noremap <esc>[c <nop> | noremap! <esc>[c <nop>
     noremap <esc>[d <nop> | noremap! <esc>[d <nop>
 
+    " search with ack
     let g:ackprg = 'ag --vimgrep'
     cnoreabbrev Ack Ack!
+
+    " copy/paste from/to xclipboard
+    noremap x "_x
+    set clipboard=unnamedplus
   '';
 
   extra-runtimepath = concatMapStringsSep "," (pkg: "${pkg.rtp}") [
diff --git a/lass/2configs/websites/lassulus.nix b/lass/2configs/websites/lassulus.nix
index 6e185a4d6..77f0c79e3 100644
--- a/lass/2configs/websites/lassulus.nix
+++ b/lass/2configs/websites/lassulus.nix
@@ -147,12 +147,29 @@ in {
     in ''
       alias ${initscript};
     '';
+    locations."/pub".extraConfig = ''
+      alias ${pkgs.writeText "pub" config.krebs.users.lass.pubkey};
+    '';
+  };
+
+  security.acme.certs."cgit.lassul.us" = {
+    email = "lassulus@gmail.com";
+    webroot = "/var/lib/acme/acme-challenges";
+    plugins = [
+      "account_key.json"
+      "key.pem"
+      "fullchain.pem"
+    ];
+    group = "nginx";
+    allowKeysForGroup = true;
   };
 
+
   services.nginx.virtualHosts.cgit = {
     serverName = "cgit.lassul.us";
     addSSL = true;
-    enableACME = true;
+    sslCertificate = "/var/lib/acme/cgit.lassul.us/fullchain.pem";
+    sslCertificateKey = "/var/lib/acme/cgit.lassul.us/key.pem";
   };
 
   users.users.blog = {