Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'ni/master'

Browse Source
This commit is contained in:
lassulus 2023-03-25 09:02:04 +01:00
commit 2c80bbb283
6 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
krebs/3modules/github/known-hosts.nix
View File

@ -6,6 +6,6 @@
# update known-hosts.json using ./update # update known-hosts.json using ./update
lib.importJSON ./known-hosts.json 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=";
}; };
} }

2
submodules/krops

@ -1 +1 @@
Subproject commit 3ebbfc62615d4ba253a4dd96bac0f4b2128a2b6d Subproject commit 59aa5d0e41cf4a6d4356673feb1adbd0fcf68936

15
tv/1systems/ru/config.nix
View File

@ -12,20 +12,23 @@ with import ./lib;
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
fileSystems."/" = { fileSystems."/" = {
device = "main/root"; device = "/dev/mapper/ruvg0-root";
fsType = "zfs"; fsType = "btrfs";
options = ["defaults" "noatime" "compress=zstd"];
}; };
fileSystems."/boot" = { fileSystems."/boot" = {
device = "/dev/nvme0n1p1"; device = "/dev/nvme0n1p1";
fsType = "vfat"; fsType = "vfat";
}; };
fileSystems."/home" = { fileSystems."/home" = {
device = "main/home"; device = "/dev/mapper/ruvg0-home";
fsType = "zfs"; fsType = "btrfs";
options = ["defaults" "noatime" "compress=zstd"];
}; };
fileSystems."/bku" = { fileSystems."/bku" = {
device = "main/bku"; device = "/dev/mapper/ruvg0-bku";
fsType = "zfs"; fsType = "btrfs";
options = ["defaults" "noatime" "compress=zstd"];
}; };
krebs.build.host = config.krebs.hosts.ru; krebs.build.host = config.krebs.hosts.ru;

11
tv/5pkgs/simple/fzmenu/bin/otpmenu
View File

@ -10,14 +10,17 @@ case ${FZMENU_PHASE-0} in
;; ;;
1) 1)
if result=$( if result=$(
PASSWORD_STORE_DIR=${PASSWORD_STORE_DIR-$HOME/.password-store}
FZF_DEFAULT_OPTS=${FZMENU_FZF_DEFAULT_OPTS-} FZF_DEFAULT_OPTS=${FZMENU_FZF_DEFAULT_OPTS-}
if test -n "$FZF_DEFAULT_OPTS"; then if test -n "$FZF_DEFAULT_OPTS"; then
export FZF_DEFAULT_OPTS export FZF_DEFAULT_OPTS
fi fi
pass git ls-files '*/otp.gpg' | \ find -L "$PASSWORD_STORE_DIR" -type f -name 'otp.gpg' |
sed ' awk -F / -v PASSWORD_STORE_DIR="$PASSWORD_STORE_DIR" '
{ n = length(PASSWORD_STORE_DIR "/") }
s/\/otp\.gpg$// $NF == "otp.gpg" {
print substr($0, 1 + n, length($0)-length("/otp.gpg")-n)
}
' | ' |
exec fzf \ exec fzf \
--history=/dev/null \ --history=/dev/null \

12
tv/5pkgs/simple/fzmenu/bin/passmenu
View File

@ -10,14 +10,18 @@ case ${FZMENU_PHASE-0} in
;; ;;
1) 1)
if result=$( if result=$(
PASSWORD_STORE_DIR=${PASSWORD_STORE_DIR-$HOME/.password-store}
FZF_DEFAULT_OPTS=${FZMENU_FZF_DEFAULT_OPTS-} FZF_DEFAULT_OPTS=${FZMENU_FZF_DEFAULT_OPTS-}
if test -n "$FZF_DEFAULT_OPTS"; then if test -n "$FZF_DEFAULT_OPTS"; then
export FZF_DEFAULT_OPTS export FZF_DEFAULT_OPTS
fi fi
pass git ls-files '*/*.gpg' | \ find -L "$PASSWORD_STORE_DIR" -type f -name '*.gpg' |
sed ' awk -F / -v PASSWORD_STORE_DIR="$PASSWORD_STORE_DIR" '
/\/otp\.gpg$:/d { n = length(PASSWORD_STORE_DIR "/") }
s/\.gpg$// $NF == "otp.gpg" { next }
/.*\.gpg$/ {
print substr($0, 1 + n, length($0)-length(".gpg")-n)
}
' | ' |
exec fzf \ exec fzf \
--history=/dev/null \ --history=/dev/null \

6
tv/5pkgs/simple/fzmenu/default.nix
View File

@ -21,8 +21,9 @@ pkgs.runCommand "fzmenu" {
--replace '#PATH=' PATH=${lib.makeBinPath [ --replace '#PATH=' PATH=${lib.makeBinPath [
pkgs.coreutils pkgs.coreutils
pkgs.dash pkgs.dash
pkgs.findutils
pkgs.fzf pkgs.fzf
pkgs.gnused pkgs.gawk
(pkgs.pass.withExtensions (ext: [ (pkgs.pass.withExtensions (ext: [
ext.pass-otp ext.pass-otp
])) ]))
@ -36,8 +37,9 @@ pkgs.runCommand "fzmenu" {
--replace '#PATH=' PATH=${lib.makeBinPath [ --replace '#PATH=' PATH=${lib.makeBinPath [
pkgs.coreutils pkgs.coreutils
pkgs.dash pkgs.dash
pkgs.findutils
pkgs.fzf pkgs.fzf
pkgs.gnused pkgs.gawk
(pkgs.pass.withExtensions (ext: [ (pkgs.pass.withExtensions (ext: [
ext.pass-otp ext.pass-otp
])) ]))