From 80459262004c8e31e4937450862e2158a3716095 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 8 Mar 2023 13:33:24 +0100 Subject: [PATCH 1/5] kartei/mic92: expose public tinc endpoint addresses --- kartei/mic92/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/kartei/mic92/default.nix b/kartei/mic92/default.nix index 98580100d..04aa57d1d 100644 --- a/kartei/mic92/default.nix +++ b/kartei/mic92/default.nix @@ -827,7 +827,14 @@ in { ruby = { owner = config.krebs.users.mic92; nets = rec { + internet = { + # of4.dse.cit.tum.de. + ip4.addr = "131.159.38.101"; + ip6.addr = "2a09:80c0:38::101"; + aliases = [ "ruby.i" ]; + }; retiolum = { + via = internet; aliases = [ "ruby.r" ]; tinc.pubkey = '' -----BEGIN RSA PUBLIC KEY----- @@ -859,6 +866,7 @@ in { aliases = [ "amy.i" ]; }; retiolum = { + via = internet; aliases = [ "amy.r" ]; tinc.pubkey = '' -----BEGIN RSA PUBLIC KEY----- @@ -884,6 +892,7 @@ in { aliases = [ "rose.i" ]; }; retiolum = { + via = internet; aliases = [ "rose.r" ]; tinc.pubkey = '' -----BEGIN RSA PUBLIC KEY----- @@ -910,6 +919,7 @@ in { aliases = [ "clara.i" ]; }; retiolum = { + via = internet; aliases = [ "clara.r" ]; tinc.pubkey = '' -----BEGIN RSA PUBLIC KEY----- From ed7c330026e48bbde759253f0952a94fdb7e2de6 Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 13 Mar 2023 10:53:48 +0100 Subject: [PATCH 2/5] krops: 1.28.1 -> 1.28.2 --- submodules/krops | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/krops b/submodules/krops index 3ebbfc626..59aa5d0e4 160000 --- a/submodules/krops +++ b/submodules/krops @@ -1 +1 @@ -Subproject commit 3ebbfc62615d4ba253a4dd96bac0f4b2128a2b6d +Subproject commit 59aa5d0e41cf4a6d4356673feb1adbd0fcf68936 From d873abf0a92c709ec9f79b49fa5d2e5bd244f0ad Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 15 Mar 2023 18:49:24 +0100 Subject: [PATCH 3/5] tv ru: replace zfs by btrfs --- tv/1systems/ru/config.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/tv/1systems/ru/config.nix b/tv/1systems/ru/config.nix index e66cddead..0fc62167e 100644 --- a/tv/1systems/ru/config.nix +++ b/tv/1systems/ru/config.nix @@ -12,20 +12,23 @@ with import ./lib; boot.loader.systemd-boot.enable = true; fileSystems."/" = { - device = "main/root"; - fsType = "zfs"; + device = "/dev/mapper/ruvg0-root"; + fsType = "btrfs"; + options = ["defaults" "noatime" "compress=zstd"]; }; fileSystems."/boot" = { device = "/dev/nvme0n1p1"; fsType = "vfat"; }; fileSystems."/home" = { - device = "main/home"; - fsType = "zfs"; + device = "/dev/mapper/ruvg0-home"; + fsType = "btrfs"; + options = ["defaults" "noatime" "compress=zstd"]; }; fileSystems."/bku" = { - device = "main/bku"; - fsType = "zfs"; + device = "/dev/mapper/ruvg0-bku"; + fsType = "btrfs"; + options = ["defaults" "noatime" "compress=zstd"]; }; krebs.build.host = config.krebs.hosts.ru; From 782c8652366c173626c2f1ddd40eb1b220bd97d6 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 22 Mar 2023 18:04:21 +0100 Subject: [PATCH 4/5] tv fzmenu: admit symlinks --- tv/5pkgs/simple/fzmenu/bin/otpmenu | 11 +++++++---- tv/5pkgs/simple/fzmenu/bin/passmenu | 12 ++++++++---- tv/5pkgs/simple/fzmenu/default.nix | 6 ++++-- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/tv/5pkgs/simple/fzmenu/bin/otpmenu b/tv/5pkgs/simple/fzmenu/bin/otpmenu index 12bd60a9d..273a408e6 100755 --- a/tv/5pkgs/simple/fzmenu/bin/otpmenu +++ b/tv/5pkgs/simple/fzmenu/bin/otpmenu @@ -10,14 +10,17 @@ case ${FZMENU_PHASE-0} in ;; 1) if result=$( + PASSWORD_STORE_DIR=${PASSWORD_STORE_DIR-$HOME/.password-store} FZF_DEFAULT_OPTS=${FZMENU_FZF_DEFAULT_OPTS-} if test -n "$FZF_DEFAULT_OPTS"; then export FZF_DEFAULT_OPTS fi - pass git ls-files '*/otp.gpg' | \ - sed ' - - s/\/otp\.gpg$// + find -L "$PASSWORD_STORE_DIR" -type f -name 'otp.gpg' | + awk -F / -v PASSWORD_STORE_DIR="$PASSWORD_STORE_DIR" ' + { n = length(PASSWORD_STORE_DIR "/") } + $NF == "otp.gpg" { + print substr($0, 1 + n, length($0)-length("/otp.gpg")-n) + } ' | exec fzf \ --history=/dev/null \ diff --git a/tv/5pkgs/simple/fzmenu/bin/passmenu b/tv/5pkgs/simple/fzmenu/bin/passmenu index da8e739ee..76153f53e 100755 --- a/tv/5pkgs/simple/fzmenu/bin/passmenu +++ b/tv/5pkgs/simple/fzmenu/bin/passmenu @@ -10,14 +10,18 @@ case ${FZMENU_PHASE-0} in ;; 1) if result=$( + PASSWORD_STORE_DIR=${PASSWORD_STORE_DIR-$HOME/.password-store} FZF_DEFAULT_OPTS=${FZMENU_FZF_DEFAULT_OPTS-} if test -n "$FZF_DEFAULT_OPTS"; then export FZF_DEFAULT_OPTS fi - pass git ls-files '*/*.gpg' | \ - sed ' - /\/otp\.gpg$:/d - s/\.gpg$// + find -L "$PASSWORD_STORE_DIR" -type f -name '*.gpg' | + awk -F / -v PASSWORD_STORE_DIR="$PASSWORD_STORE_DIR" ' + { n = length(PASSWORD_STORE_DIR "/") } + $NF == "otp.gpg" { next } + /.*\.gpg$/ { + print substr($0, 1 + n, length($0)-length(".gpg")-n) + } ' | exec fzf \ --history=/dev/null \ diff --git a/tv/5pkgs/simple/fzmenu/default.nix b/tv/5pkgs/simple/fzmenu/default.nix index 7e19505c1..1a285ee99 100644 --- a/tv/5pkgs/simple/fzmenu/default.nix +++ b/tv/5pkgs/simple/fzmenu/default.nix @@ -21,8 +21,9 @@ pkgs.runCommand "fzmenu" { --replace '#PATH=' PATH=${lib.makeBinPath [ pkgs.coreutils pkgs.dash + pkgs.findutils pkgs.fzf - pkgs.gnused + pkgs.gawk (pkgs.pass.withExtensions (ext: [ ext.pass-otp ])) @@ -36,8 +37,9 @@ pkgs.runCommand "fzmenu" { --replace '#PATH=' PATH=${lib.makeBinPath [ pkgs.coreutils pkgs.dash + pkgs.findutils pkgs.fzf - pkgs.gnused + pkgs.gawk (pkgs.pass.withExtensions (ext: [ ext.pass-otp ])) From 18b7ea4675e69fd564604a845bb60db3794e3042 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 24 Mar 2023 12:53:36 +0100 Subject: [PATCH 5/5] github: update rsa key --- krebs/3modules/github/known-hosts.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/krebs/3modules/github/known-hosts.nix b/krebs/3modules/github/known-hosts.nix index c0d0b588a..3725ff2b8 100644 --- a/krebs/3modules/github/known-hosts.nix +++ b/krebs/3modules/github/known-hosts.nix @@ -6,6 +6,6 @@ # update known-hosts.json using ./update lib.importJSON ./known-hosts.json ; - publicKey = "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ=="; + publicKey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCj7ndNxQowgcQnjshcLrqPEiiphnt+VTTvDP6mHBL9j1aNUkY4Ue1gvwnGLVlOhGeYrnZaMgRK6+PKCUXaDbC7qtbW8gIkhL7aGCsOr/C56SJMy/BCZfxd1nWzAOxSDPgVsmerOBYfNqltV9/hWCqBywINIR+5dIg6JTJ72pcEpEjcYgXkE2YEFXV1JHnsKgbLWNlhScqb2UmyRkQyytRLtL+38TGxkxCflmO+5Z8CSSNY7GidjMIZ7Q4zMjA2n1nGrlTDkzwDCsw+wqFPGQA179cnfGWOWRVruj16z6XyvxvjJwbz0wQZ75XK5tKSb7FNyeIEs4TT4jk+S4dhPeAUC5y+bDYirYgM4GC7uEnztnZyaVWQ7B381AK4Qdrwt51ZqExKbQpTUNn+EjqoTwvqNj4kqx5QUCI0ThS/YkOxJCXmPUWZbhjpCg56i+2aB6CmK2JGhn57K5mj0MNdBXA4/WnwH6XoPWJzK5Nyu2zB3nAZp+S5hpQs+p1vN1/wsjk="; }; }