Merge remote-tracking branch 'gum/master'

7 files changed, 47 insertions, 36 deletions

diff --git a/krebs/3modules/urlwatch.nix b/krebs/3modules/urlwatch.nix
index 43535b08f..0b7a71db5 100644
--- a/krebs/3modules/urlwatch.nix
+++ b/krebs/3modules/urlwatch.nix
@@ -189,8 +189,8 @@ let
         '';
       };
     };
-    users.extraUsers = singleton {
-      inherit (user) name uid;
+    users.users.${user.name} = {
+      inherit (user) uid;
       home = cfg.dataDir;
       createHome = true;
     };
diff --git a/krebs/5pkgs/simple/kpaste/default.nix b/krebs/5pkgs/simple/kpaste/default.nix
index 217cb8a44..9820c931d 100644
--- a/krebs/5pkgs/simple/kpaste/default.nix
+++ b/krebs/5pkgs/simple/kpaste/default.nix
@@ -1,6 +1,6 @@
 { curl, gnused, writeDashBin }:
 
 writeDashBin "kpaste" ''
-  ${curl}/bin/curl -sS http://p.r --data-binary @- |
-  ${gnused}/bin/sed '$ {p;s/\<r\>/krebsco.de/}'
+  ${curl}/bin/curl -sS http://p.r --data-binary @"''${1:--}" |
+  ${gnused}/bin/sed '$ {p;s|http://p.r|https://p.krebsco.de|}'
 ''
diff --git a/makefu/1systems/omo/config.nix b/makefu/1systems/omo/config.nix
index cfe0d0a3f..34bd42592 100644
--- a/makefu/1systems/omo/config.nix
+++ b/makefu/1systems/omo/config.nix
@@ -11,19 +11,26 @@ in {
       ./hw/omo.nix
       #./hw/tsp.nix
       <stockholm/makefu>
-      { environment.systemPackages = with pkgs;[ tmux picocom ];}
+      <stockholm/makefu/2configs/headless.nix>
       <stockholm/makefu/2configs/support-nixos.nix>
+      <stockholm/makefu/2configs/nur.nix>
+
       <stockholm/makefu/2configs/zsh-user.nix>
+      <stockholm/makefu/2configs/home-manager>
+      <stockholm/makefu/2configs/home-manager/cli.nix>
+      <stockholm/makefu/2configs/editor/neovim>
+
+
       <stockholm/makefu/2configs/backup/state.nix>
       <stockholm/makefu/2configs/exim-retiolum.nix>
       # <stockholm/makefu/2configs/smart-monitor.nix>
       <stockholm/makefu/2configs/mail-client.nix>
       <stockholm/makefu/2configs/mosh.nix>
       <stockholm/makefu/2configs/tools/core.nix>
+      <stockholm/makefu/2configs/tools/dev.nix>
       <stockholm/makefu/2configs/tools/desktop.nix>
       <stockholm/makefu/2configs/tools/mobility.nix>
       { environment.systemPackages = [ pkgs.esniper ]; }
-      # <stockholm/makefu/2configs/disable_v6.nix>
       #<stockholm/makefu/2configs/graphite-standalone.nix>
       #<stockholm/makefu/2configs/share-user-sftp.nix>
 
@@ -108,7 +115,7 @@ in {
     ];
   makefu.full-populate =  true;
   nixpkgs.config.allowUnfree = true;
-  krebs.rtorrent = (builtins.trace (builtins.toJSON config.services.telegraf.extraConfig)) {
+  krebs.rtorrent = {
     downloadDir = lib.mkForce "/media/cryptX/torrent";
     extraConfig = ''
       upload_rate = 500
diff --git a/makefu/1systems/omo/hw/omo.nix b/makefu/1systems/omo/hw/omo.nix
index 87af2a314..586ad98c4 100644
--- a/makefu/1systems/omo/hw/omo.nix
+++ b/makefu/1systems/omo/hw/omo.nix
@@ -80,18 +80,19 @@ in {
   boot = {
     initrd.luks = {
       devices = let
-        usbkey = name: device: {
-          inherit name device keyFile;
+        usbkey = device: {
+          inherit device keyFile;
           keyFileSize = 4096;
           allowDiscards = true;
         };
-      in [
-        (usbkey "luksroot" rootPartition)
-        (usbkey "crypt0" cryptDisk0)
-        (usbkey "crypt1" cryptDisk1)
-        (usbkey "crypt2" cryptDisk2)
-        (usbkey "crypt3" cryptDisk3)
-      ];
+      in
+      {
+        luksroot = usbkey rootPartition;
+        crypt0 = usbkey  cryptDisk0;
+        crypt1 = usbkey  cryptDisk1;
+        crypt2 = usbkey  cryptDisk2;
+        crypt3 = usbkey  cryptDisk3;
+      };
     };
     loader.grub.device = lib.mkForce rootDisk;
 
diff --git a/makefu/1systems/omo/source.nix b/makefu/1systems/omo/source.nix
index 05c17377f..b56e855fc 100644
--- a/makefu/1systems/omo/source.nix
+++ b/makefu/1systems/omo/source.nix
@@ -2,4 +2,5 @@
   name="omo";
   torrent = true;
   unstable = true;
+  home-manager = true;
 }
diff --git a/makefu/2configs/urlwatch/default.nix b/makefu/2configs/urlwatch/default.nix
index f93d47caa..b07a1e807 100644
--- a/makefu/2configs/urlwatch/default.nix
+++ b/makefu/2configs/urlwatch/default.nix
@@ -5,11 +5,15 @@ let
     url = "https://github.com/${name}/releases.atom";
     filter = "grepi:(<updated|<media.thumbnail)";
   };
+  lidl = url: {
+    inherit url;
+    filter = "grepi:<!-- sf";
+  };
 in {
   krebs.urlwatch = {
     enable = true;
     mailto = config.krebs.users.makefu.mail;
-    onCalendar = "*-*-* 05:00:00";
+    onCalendar = "*-*-* 03,15:13:37";
     hooksFile = ./hook.py;
     urls = [
       ## nixpkgs maintenance
@@ -30,7 +34,6 @@ in {
       https://pypi.python.org/simple/pyserial/
       https://pypi.python.org/simple/semantic_version/
       # weird shit
-      http://guest:derpi@cvs2svn.tigris.org/svn/cvs2svn/tags/
       http://ftp.debian.org/debian/pool/main/a/apt-cacher-ng/
       https://erdgeist.org/gitweb/opentracker/info/refs?service=git-upload-pack
 
@@ -40,18 +43,23 @@ in {
         url = https://newellrubbermaid.secure.force.com/dymopkb/articles/en_US/FAQ/Dymo-Drivers-and-Downloads/?l=en_US&c=Segment:Dymo&fs=Search&pn=1 ;
         filter = "grep:Software/Linux/dymo-cups-drivers";
       }
+
+      # shopping
+      ( lidl https://www.lidl.de/de/parkside-nass-trockensauger-pnts-1500-d5/p303117 )
+
       # TODO: dymo cups
     ] ++ map grss [
       "amadvance/snapraid"
       "radare/radare2"
       "ovh/python-ovh"
       "embray/d2to1"
-      "Mic92/vicious"
+      "vicious-widgets/vicious"
       "embray/d2to1"
       "dorimanx/exfat-nofuse"
       "rapid7/metasploit-framework"
       "GothenburgBitFactory/taskserver"
       "GothenburgBitFactory/taskwarrior"
+      "mhagger/cvs2svn"
     ];
   };
 }
diff --git a/makefu/5pkgs/awesomecfg/full.cfg b/makefu/5pkgs/awesomecfg/full.cfg
index 83dd79b4d..2abfe503d 100644
--- a/makefu/5pkgs/awesomecfg/full.cfg
+++ b/makefu/5pkgs/awesomecfg/full.cfg
@@ -243,7 +243,7 @@ awful.screen.connect_for_each_screen(function(s)
     set_wallpaper(s)
 
     -- Each screen has its own tag table.
-    awful.tag({ "tmp", "news", "www", "im", "work1","work2","net","misc","remote" }, s, awful.layout.layouts[1])
+    awful.tag({ "tmp", "ssh", "www", "im", "mail","work","net","misc","remote" }, s, awful.layout.layouts[1])
 
     -- Create a promptbox for each screen
     s.mypromptbox = awful.widget.prompt()
@@ -486,14 +486,12 @@ awful.rules.rules = {
                      focus = awful.client.focus.filter,
                      keys = clientkeys,
                      buttons = clientbuttons } },
-    { rule = { class = "MPlayer" },
-      properties = { floating = true } },
+    --{ rule = { class = "MPlayer" },
+    --  properties = { floating = true } },
     { rule = { class = "pinentry" },
       properties = { floating = true } },
-    { rule = { class = "gimp" },
-      properties = { floating = true } },
-    { rule = { class = "Anamnesis" },
-      properties = { floating = true } },
+    --{ rule = { class = "gimp" },
+    --  properties = { floating = true } },
     -- Set Firefox to always map on tags number 2 of screen 1.
     -- { rule = { class = "Firefox" },
     --   properties = { tag = tags[1][2] } },
@@ -571,16 +569,12 @@ local os = {
 
 -- {{{ autostart
 do
-  local cmds =
-  {
-    -- "@networkmanagerapplet@/bin/nm-applet",
-    -- "@blueman@/bin/blueman-applet",
-    -- "@clipit@/bin/clipit"
-  }
-
-  for _,i in pairs(cmds) do
-    awful.util.spawn(i)
-  end
+  awful.spawn("urxvt", { tag = tags[1] }) # dev shell
+  awful.spawn("urxvt -e mosh makefu@gum.i", { tag = tags[2] })
+  awful.spawn("firefox", { tag = tags[3] })
+  awful.spawn("telegram-desktop", { tag = tags[4] })
+  awful.spawn("signal-desktop", { tag = tags[4] })
+  awful.spawn("urxvt -e mutt", { tag = tags[5] })
 end
 
 -- }}}