From 39cc7e81edc35f34fa8e242277bd69f51d84566f Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 22 May 2020 20:16:53 +0200 Subject: [PATCH 1/7] urlwatch module: use users.users.{name} istead of a list --- krebs/3modules/urlwatch.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 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; }; From 5cdfea58e13c968d4324363c8111305446279cef Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 25 May 2020 15:27:41 +0200 Subject: [PATCH 2/7] ma urlwatch: generalize lidl --- makefu/2configs/urlwatch/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/makefu/2configs/urlwatch/default.nix b/makefu/2configs/urlwatch/default.nix index f93d47caa..c90b83ea9 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:( Date: Mon, 25 May 2020 15:27:59 +0200 Subject: [PATCH 3/7] =?UTF-8?q?ma=20urlwatch:=20remove=20mauernutfr=C3=A4s?= =?UTF-8?q?e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- makefu/2configs/urlwatch/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/makefu/2configs/urlwatch/default.nix b/makefu/2configs/urlwatch/default.nix index c90b83ea9..b07a1e807 100644 --- a/makefu/2configs/urlwatch/default.nix +++ b/makefu/2configs/urlwatch/default.nix @@ -46,7 +46,6 @@ in { # shopping ( lidl https://www.lidl.de/de/parkside-nass-trockensauger-pnts-1500-d5/p303117 ) - ( lidl https://www.lidl.de/de/parkside-mauernutfraese-pmnf-1350-d4/p294989 ) # TODO: dymo cups ] ++ map grss [ From 5d47f5d33d29b4ef95d3788bcb581f0ebf41e9ba Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 28 May 2020 16:06:05 +0200 Subject: [PATCH 4/7] ma omo.r: enable home-manager zsh config --- makefu/1systems/omo/config.nix | 13 ++++++++++--- makefu/1systems/omo/hw/omo.nix | 19 ++++++++++--------- makefu/1systems/omo/source.nix | 1 + 3 files changed, 21 insertions(+), 12 deletions(-) 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 - { environment.systemPackages = with pkgs;[ tmux picocom ];} + + + + + + + + # + { environment.systemPackages = [ pkgs.esniper ]; } - # # # @@ -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; } From fa5f65ee7695b5742ec83b852e6e5a7f749a3428 Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 1 Jun 2020 14:41:20 +0200 Subject: [PATCH 5/7] ma awesomecfg: start essentials on startup closes #36 --- makefu/5pkgs/awesomecfg/full.cfg | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) 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 -- }}} From bed170dd8a8ca5ba4c9109fc858dc658f90df68c Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 5 Jun 2020 10:31:17 +0200 Subject: [PATCH 6/7] pkgs.kpaste: paste either stdin or file from parameter --- krebs/5pkgs/simple/kpaste/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/krebs/5pkgs/simple/kpaste/default.nix b/krebs/5pkgs/simple/kpaste/default.nix index 217cb8a44..02f482316 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/\/krebsco.de/}' + ${curl}/bin/curl -sS http://p.r --data-binary @"''${1:--}" | + ${gnused}/bin/sed '$ {p;s/\/krebsco.de/}' '' From 360e823a9a187dd61d1c7f3f712a8edc9e7879d9 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 5 Jun 2020 10:39:43 +0200 Subject: [PATCH 7/7] pkgs.kpaste: replace internal host with https external host --- krebs/5pkgs/simple/kpaste/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/krebs/5pkgs/simple/kpaste/default.nix b/krebs/5pkgs/simple/kpaste/default.nix index 02f482316..9820c931d 100644 --- a/krebs/5pkgs/simple/kpaste/default.nix +++ b/krebs/5pkgs/simple/kpaste/default.nix @@ -2,5 +2,5 @@ writeDashBin "kpaste" '' ${curl}/bin/curl -sS http://p.r --data-binary @"''${1:--}" | - ${gnused}/bin/sed '$ {p;s/\/krebsco.de/}' + ${gnused}/bin/sed '$ {p;s|http://p.r|https://p.krebsco.de|}' ''