summaryrefslogtreecommitdiffstats
path: root/tv
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2023-04-02 18:42:50 +0200
committermakefu <github@syntax-fehler.de>2023-04-02 18:42:50 +0200
commit7239ec83c5531fa100d1863fec9d82033d13ad34 (patch)
tree1cfde19ffaf06d44a5fd30d7fc0ca2eaad2d4ad2 /tv
parentd335011fce054bebc0e429ea10bccabaf898d2b2 (diff)
parentc4bf35d8e13d1258fcbacd118a0fc75197b9fe7e (diff)
Merge remote-tracking branch 'lassul.us/master'
Diffstat (limited to 'tv')
-rw-r--r--tv/1systems/ru/config.nix15
-rwxr-xr-xtv/5pkgs/simple/fzmenu/bin/otpmenu11
-rwxr-xr-xtv/5pkgs/simple/fzmenu/bin/passmenu12
-rw-r--r--tv/5pkgs/simple/fzmenu/default.nix6
4 files changed, 28 insertions, 16 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;
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
]))