From 6b8843a2c14262676ab436b9b0fbb342503be7c8 Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 8 Jun 2020 23:10:56 +0200 Subject: dic: 1.1.0 -> 1.1.1 --- krebs/5pkgs/simple/dic/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/krebs/5pkgs/simple/dic/default.nix b/krebs/5pkgs/simple/dic/default.nix index 6533a1b9..a7489963 100644 --- a/krebs/5pkgs/simple/dic/default.nix +++ b/krebs/5pkgs/simple/dic/default.nix @@ -4,9 +4,9 @@ stdenv.mkDerivation { name = "dic"; src = fetchgit { - url = http://cgit.ni.krebsco.de/dic; - rev = "refs/tags/v1.1.0"; - sha256 = "1xzn20b9kfz96nvjli8grpi11v80jbl0dmifksmirwcj5v81ndav"; + url = https://cgit.ni.krebsco.de/dic; + rev = "refs/tags/v1.1.1"; + sha256 = "1gbj967a5hj53fdkkxijqgwnl9hb8kskz0cmpjq7v65ffz3v6vag"; }; phases = [ -- cgit v1.2.3 From 17083fa080a61fd33f4b5f8a0d3148c0bebacb31 Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 8 Jun 2020 23:13:41 +0200 Subject: krops: 1.21.0 -> 1.22.0 --- submodules/krops | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/krops b/submodules/krops index 55aa2c77..44e8dd5c 160000 --- a/submodules/krops +++ b/submodules/krops @@ -1 +1 @@ -Subproject commit 55aa2c77ce8183f3d2b24f54efa33ab6a42e1e02 +Subproject commit 44e8dd5cea9cdae04eecd7e15cdfc45a96643cd5 -- cgit v1.2.3 From eb60b27e2b89bc92bfccab35bb6937023df3b518 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 10 Jun 2020 10:55:10 +0200 Subject: red: init at 0bfb499 --- krebs/5pkgs/simple/red.nix | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 krebs/5pkgs/simple/red.nix diff --git a/krebs/5pkgs/simple/red.nix b/krebs/5pkgs/simple/red.nix new file mode 100644 index 00000000..51f02aa5 --- /dev/null +++ b/krebs/5pkgs/simple/red.nix @@ -0,0 +1,23 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "red"; + version = "g${lib.substring 0 7 src.rev}"; + + src = fetchFromGitHub { + owner = "antonmedv"; + repo = "red"; + rev = "0bfb499760f391d09c6addec2527b0f77eaacdd6"; + sha256 = "0i8f8ih3z97zzbkjkwy4y8z75izm1fscq0rr1g77q7z3kz1lrgrx"; + }; + + modSha256 = "0640x6p5hi7yp001cw13z5a17bi9vgd3gij5fxa1y06d3848cv7l"; + + meta = { + description = "Terminal log analysis tools"; + homepage = https://github.com/analysis/red; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.tv ]; + platforms = lib.platforms.linux; + }; +} -- cgit v1.2.3 From ac9d61188407fb6d133a0f0a8912a04f4d860677 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 16 Jun 2020 20:27:59 +0200 Subject: fzfmenu: make -name and -title configurable --- krebs/5pkgs/simple/fzfmenu/default.nix | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/krebs/5pkgs/simple/fzfmenu/default.nix b/krebs/5pkgs/simple/fzfmenu/default.nix index 64e95d23..1ee55a5a 100644 --- a/krebs/5pkgs/simple/fzfmenu/default.nix +++ b/krebs/5pkgs/simple/fzfmenu/default.nix @@ -1,4 +1,31 @@ -{ pkgs, ... }: +with import ; +{ pkgs, ... }@args: + +let + # config cannot be declared in the input attribute set because that would + # cause callPackage to inject the wrong config. Instead, get it from ... + # via args. + config = args.config or {}; + + cfg = eval.config; + + eval = evalModules { + modules = singleton { + _file = toString ./profile.nix; + imports = singleton config; + options = { + appName = mkOption { + default = "fzfmenu"; + type = types.label; + }; + windowTitle = mkOption { + default = "fzfmenu"; + type = types.str; + }; + }; + }; + }; +in pkgs.writeDashBin "fzfmenu" '' set -efu @@ -34,7 +61,8 @@ pkgs.writeDashBin "fzfmenu" '' OUTPUT="$(${pkgs.coreutils}/bin/mktemp)" if [ -z ''${TERM+x} ]; then #check if we can print fzf in the shell ${pkgs.rxvt_unicode}/bin/urxvt \ - -name fzfmenu -title fzfmenu \ + -name ${cfg.appName} \ + -title ${shell.escape cfg.windowTitle} \ -e ${pkgs.dash}/bin/dash -c \ "echo \"$INPUT\" | ${pkgs.fzf}/bin/fzf \ --history=/dev/null \ -- cgit v1.2.3 From 59aa9811f3d4b9e4762ec20c5424b42b170bd782 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 16 Jun 2020 21:13:00 +0200 Subject: fzfmenu: DRY and don't create temporary file --- krebs/5pkgs/simple/fzfmenu/default.nix | 80 +++++++++++++++++----------------- 1 file changed, 39 insertions(+), 41 deletions(-) diff --git a/krebs/5pkgs/simple/fzfmenu/default.nix b/krebs/5pkgs/simple/fzfmenu/default.nix index 1ee55a5a..6d5e3798 100644 --- a/krebs/5pkgs/simple/fzfmenu/default.nix +++ b/krebs/5pkgs/simple/fzfmenu/default.nix @@ -29,55 +29,53 @@ in pkgs.writeDashBin "fzfmenu" '' set -efu + + # Spawn terminal if called without one, like e.g. from a window manager. + if [ -z ''${TERM+x} ]; then + exec 3<&0 + exec 4>&1 + export FZFMENU_INPUT_FD=3 + export FZFMENU_OUTPUT_FD=4 + exec ${pkgs.rxvt_unicode}/bin/urxvt \ + -name ${cfg.appName} \ + -title ${shell.escape cfg.windowTitle} \ + -e "$0" "$@" + else + exec 0<&''${FZFMENU_INPUT_FD-0} + exec 1>&''${FZFMENU_OUTPUT_FD-1} + fi + PROMPT=">" - for i in "$@" - do - case $i in + for i in "$@"; do + case $i in -p) - PROMPT="$2" - shift - shift - break - ;; + PROMPT=$2 + shift 2 + break + ;; -l) - # no reason to filter number of lines - LINES="$2" - shift - shift - break - ;; + # no reason to filter number of lines + LINES=$2 + shift 2 + break + ;; -i) - # we do this anyway - shift - break - ;; + # we do this anyway + shift + break + ;; *) - echo "Unknown option $1" >&2 - shift - ;; - esac + echo "Unknown option $1" >&2 + shift + ;; + esac done - INPUT=$(${pkgs.coreutils}/bin/cat) - OUTPUT="$(${pkgs.coreutils}/bin/mktemp)" - if [ -z ''${TERM+x} ]; then #check if we can print fzf in the shell - ${pkgs.rxvt_unicode}/bin/urxvt \ - -name ${cfg.appName} \ - -title ${shell.escape cfg.windowTitle} \ - -e ${pkgs.dash}/bin/dash -c \ - "echo \"$INPUT\" | ${pkgs.fzf}/bin/fzf \ - --history=/dev/null \ - --print-query \ - --prompt=\"$PROMPT\" \ - --reverse \ - > \"$OUTPUT\"" 2>/dev/null - else - echo "$INPUT" | ${pkgs.fzf}/bin/fzf \ + + ${pkgs.fzf}/bin/fzf \ --history=/dev/null \ --print-query \ --prompt="$PROMPT" \ --reverse \ - > "$OUTPUT" - fi - ${pkgs.coreutils}/bin/tail -1 "$OUTPUT" - ${pkgs.coreutils}/bin/rm "$OUTPUT" + | + ${pkgs.coreutils}/bin/tail -1 '' -- cgit v1.2.3 From 773095812fa57d2f78bc7a2f491ef5dc9188b2bf Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 16 Jun 2020 21:16:25 +0200 Subject: fzfmenu: make default prompt configurable --- krebs/5pkgs/simple/fzfmenu/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/krebs/5pkgs/simple/fzfmenu/default.nix b/krebs/5pkgs/simple/fzfmenu/default.nix index 6d5e3798..446419a0 100644 --- a/krebs/5pkgs/simple/fzfmenu/default.nix +++ b/krebs/5pkgs/simple/fzfmenu/default.nix @@ -14,6 +14,10 @@ let _file = toString ./profile.nix; imports = singleton config; options = { + defaultPrompt = mkOption { + default = ">"; + type = types.str; + }; appName = mkOption { default = "fzfmenu"; type = types.label; @@ -45,7 +49,7 @@ pkgs.writeDashBin "fzfmenu" '' exec 1>&''${FZFMENU_OUTPUT_FD-1} fi - PROMPT=">" + PROMPT=${shell.escape cfg.defaultPrompt} for i in "$@"; do case $i in -p) -- cgit v1.2.3 From 3197b9a93007cda073df939c40131fda15415a64 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 16 Jun 2020 21:19:23 +0200 Subject: fzfmenu: support $FZFMENU_FZF_DEFAULT_OPTS --- krebs/5pkgs/simple/fzfmenu/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/krebs/5pkgs/simple/fzfmenu/default.nix b/krebs/5pkgs/simple/fzfmenu/default.nix index 446419a0..04e53899 100644 --- a/krebs/5pkgs/simple/fzfmenu/default.nix +++ b/krebs/5pkgs/simple/fzfmenu/default.nix @@ -75,6 +75,11 @@ pkgs.writeDashBin "fzfmenu" '' esac done + FZF_DEFAULT_OPTS=''${FZFMENU_FZF_DEFAULT_OPTS-} + if test -n "$FZF_DEFAULT_OPTS"; then + export FZF_DEFAULT_OPTS + fi + ${pkgs.fzf}/bin/fzf \ --history=/dev/null \ --print-query \ -- cgit v1.2.3 From aa019f372e603fa74469c9483481ea15623d7a7e Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 16 Jun 2020 21:38:24 +0200 Subject: fzfmenu: make --print-query configurable --- krebs/5pkgs/simple/fzfmenu/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/krebs/5pkgs/simple/fzfmenu/default.nix b/krebs/5pkgs/simple/fzfmenu/default.nix index 04e53899..4c7784b4 100644 --- a/krebs/5pkgs/simple/fzfmenu/default.nix +++ b/krebs/5pkgs/simple/fzfmenu/default.nix @@ -14,13 +14,17 @@ let _file = toString ./profile.nix; imports = singleton config; options = { + appName = mkOption { + default = "fzfmenu"; + type = types.label; + }; defaultPrompt = mkOption { default = ">"; type = types.str; }; - appName = mkOption { - default = "fzfmenu"; - type = types.label; + printQuery = mkOption { + default = true; + type = types.bool; }; windowTitle = mkOption { default = "fzfmenu"; @@ -82,9 +86,8 @@ pkgs.writeDashBin "fzfmenu" '' ${pkgs.fzf}/bin/fzf \ --history=/dev/null \ - --print-query \ --prompt="$PROMPT" \ --reverse \ - | - ${pkgs.coreutils}/bin/tail -1 + ${optionalString cfg.printQuery "--print-query"} \ + ${optionalString cfg.printQuery "| ${pkgs.coreutils}/bin/tail -1"} '' -- cgit v1.2.3 From f027eaacf27da0661cc9e0d062d64884b22ce290 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 16 Jun 2020 21:38:32 +0200 Subject: fzfmenu: make --reverse configurable --- krebs/5pkgs/simple/fzfmenu/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/krebs/5pkgs/simple/fzfmenu/default.nix b/krebs/5pkgs/simple/fzfmenu/default.nix index 4c7784b4..76235ddb 100644 --- a/krebs/5pkgs/simple/fzfmenu/default.nix +++ b/krebs/5pkgs/simple/fzfmenu/default.nix @@ -26,6 +26,10 @@ let default = true; type = types.bool; }; + reverse = mkOption { + default = true; + type = types.bool; + }; windowTitle = mkOption { default = "fzfmenu"; type = types.str; @@ -87,7 +91,7 @@ pkgs.writeDashBin "fzfmenu" '' ${pkgs.fzf}/bin/fzf \ --history=/dev/null \ --prompt="$PROMPT" \ - --reverse \ + ${optionalString cfg.reverse "--reverse"} \ ${optionalString cfg.printQuery "--print-query"} \ ${optionalString cfg.printQuery "| ${pkgs.coreutils}/bin/tail -1"} '' -- cgit v1.2.3 From 4a31be59b8731c13405f38a76904662a2c344203 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 16 Jun 2020 21:42:35 +0200 Subject: fzfmenu: selectively override FZF_DEFAULT_OPTS --- krebs/5pkgs/simple/fzfmenu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/krebs/5pkgs/simple/fzfmenu/default.nix b/krebs/5pkgs/simple/fzfmenu/default.nix index 76235ddb..537b90f4 100644 --- a/krebs/5pkgs/simple/fzfmenu/default.nix +++ b/krebs/5pkgs/simple/fzfmenu/default.nix @@ -83,8 +83,8 @@ pkgs.writeDashBin "fzfmenu" '' esac done - FZF_DEFAULT_OPTS=''${FZFMENU_FZF_DEFAULT_OPTS-} - if test -n "$FZF_DEFAULT_OPTS"; then + if test -n "''${FZFMENU_FZF_DEFAULT_OPTS-}"; then + FZF_DEFAULT_OPTS=''${FZFMENU_FZF_DEFAULT_OPTS-} export FZF_DEFAULT_OPTS fi -- cgit v1.2.3 From a7dda2aba38aa3278238fd54f935a2a20030b946 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 16 Jun 2020 23:13:46 +0200 Subject: tv mu: enable autoLogin --- tv/1systems/mu/config.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/tv/1systems/mu/config.nix b/tv/1systems/mu/config.nix index 145c73c0..b6a25a2b 100644 --- a/tv/1systems/mu/config.nix +++ b/tv/1systems/mu/config.nix @@ -108,13 +108,11 @@ with import ; twoFingerScroll = true; }; - services.xserver.desktopManager.plasma5 = { - enable = true; - }; - services.xserver.displayManager.auto = { - enable = true; - user = "vv"; - }; + services.xserver.desktopManager.plasma5.enable = true; + + services.xserver.displayManager.lightdm.autoLogin.enable = true; + services.xserver.displayManager.lightdm.autoLogin.user = "vv"; + services.xserver.displayManager.lightdm.enable = true; users.users.vv = { inherit (config.krebs.users.vv) home uid; -- cgit v1.2.3 From 6d21d74376a1a3bd4173ae966bb0a8dc038989cf Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 16 Jun 2020 23:14:59 +0200 Subject: tv alnus: enable autoLogin --- tv/1systems/alnus/config.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tv/1systems/alnus/config.nix b/tv/1systems/alnus/config.nix index 21583f74..d91699df 100644 --- a/tv/1systems/alnus/config.nix +++ b/tv/1systems/alnus/config.nix @@ -71,10 +71,10 @@ with import ; }; desktopManager.xfce.enable = true; - displayManager.auto = { - enable = true; - user = "dv"; - }; + + displayManager.lightdm.autoLogin.enable = true; + displayManager.lightdm.autoLogin.user = "dv"; + displayManager.lightdm.enable = true; }; users.users.dv = { -- cgit v1.2.3 From f8d3ab8602bbb22921ad389fdcba7a655b211f84 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 16 Jun 2020 23:30:14 +0200 Subject: tv alnus: fix typo --- tv/1systems/alnus/config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tv/1systems/alnus/config.nix b/tv/1systems/alnus/config.nix index d91699df..66bd52ab 100644 --- a/tv/1systems/alnus/config.nix +++ b/tv/1systems/alnus/config.nix @@ -12,7 +12,7 @@ with import ; initrd = { availableKernelModules = [ "ahci" ]; luks.cryptoModules = [ "aes" "sha512" "xts" ]; - luks.devices.luksroot.devices = "/dev/sda2"; + luks.devices.luksroot.device = "/dev/sda2"; }; }; -- cgit v1.2.3 From 74a050db4e556524b361a73395964272bd1bae18 Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 22 Jun 2020 20:59:00 +0200 Subject: krops: 1.22.0 -> 1.22.1 --- submodules/krops | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/krops b/submodules/krops index 44e8dd5c..3e731035 160000 --- a/submodules/krops +++ b/submodules/krops @@ -1 +1 @@ -Subproject commit 44e8dd5cea9cdae04eecd7e15cdfc45a96643cd5 +Subproject commit 3e731035ed44659624e6d00bbb35570f2b8811fd -- cgit v1.2.3