diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/default.nix | 1 | ||||
| -rw-r--r-- | modules/pass/default.nix | 65 | ||||
| -rwxr-xr-x | modules/pass/passmenu | 36 | ||||
| -rw-r--r-- | modules/sway/default.nix | 1 | ||||
| -rw-r--r-- | modules/zsh/default.nix | 7 |
5 files changed, 109 insertions, 1 deletions
diff --git a/modules/default.nix b/modules/default.nix index d881953..6087536 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -10,5 +10,6 @@ ./qutebrowser ./services ./gpg + ./pass ]; } diff --git a/modules/pass/default.nix b/modules/pass/default.nix new file mode 100644 index 0000000..e73fd76 --- /dev/null +++ b/modules/pass/default.nix @@ -0,0 +1,65 @@ +{ config, lib, pkgs, ... }: +let + cfg = config.modules.pass; + + inherit (lib) mkEnableOption mkOption mkIf types; +in +{ + options.modules.pass = { + enable = mkEnableOption "pass"; + enableExtensions = mkEnableOption "extensions"; + key = mkOption { + type = types.nullOr types.str; + description = "gpg key, spaces forbidden"; + default = ""; + }; + wmenu = mkOption { + type = types.str; + description = "dmenu command to use for passmenu in a wayland session"; + default = "wmenu -n 4c4c4c -N 0d0d0d -s 8aac8b -S 0d0d0d -l 10"; + }; + xmenu = mkOption { + type = types.str; + description = "dmenu command to use for passmenu in an x session"; + default = "dmenu"; + }; + }; + + config = mkIf cfg.enable { + home.packages = with pkgs; [(writeShellScriptBin "passmenu" '' + shopt -s nullglob globstar + + if [[ -n $WAYLAND_DISPLAY ]]; then + menu="${cfg.wmenu}" + elif [[ -n $DISPLAY ]]; then + menu="${cfg.xmenu}" # fallback to dmenu if running under x11 + else + echo "Error: No Wayland or X11 display detected" >&2 + exit 1 + fi + + prefix=''${PASSWORD_STORE_DIR-~/.password-store} + password_files=( "$prefix"/**/*.gpg ) + password_files=( "''${password_files[@]#"$prefix"/}" ) + password_files=( "''${password_files[@]%.gpg}" ) + + password=$(printf '%s\n' "''${password_files[@]}" | $menu "$@") + + [[ -n $password ]] || exit + + pass show -c "$password" 2>/dev/null + '')]; + programs.password-store = { + package = pkgs.pass.override { + dmenuSupport = false; + }; + enable = true; + settings = { + PASSWORD_STORE_CHARACTER_SET="[:alnum:]*!@^&_\-=[]|;~,./?"; + PASSWORD_STORE_CLIP_TIME="25"; + PASSWORD_STORE_KEY=cfg.key; + PASSWORD_STORE_ENABLE_EXTENSIONS = if cfg.enableExtensions then "1" else "0"; + }; + }; + }; +} diff --git a/modules/pass/passmenu b/modules/pass/passmenu new file mode 100755 index 0000000..f20e66e --- /dev/null +++ b/modules/pass/passmenu @@ -0,0 +1,36 @@ +#!/usr/bin/env bash + +shopt -s nullglob globstar + +typeit=0 +if [[ $1 == "--type" ]]; then + typeit=1 + shift +fi + +if [[ -n $WAYLAND_DISPLAY ]]; then + dmenu=wmenu + dmenu="wmenu -n 4c4c4c -N 0d0d0d -s 8aac8b -S 0d0d0d -l 10" + xdotool="ydotool type --file -" +elif [[ -n $DISPLAY ]]; then + dmenu=wmenu + xdotool="xdotool type --clearmodifiers --file -" +else + echo "Error: No Wayland or X11 display detected" >&2 + exit 1 +fi + +prefix=${PASSWORD_STORE_DIR-~/.password-store} +password_files=( "$prefix"/**/*.gpg ) +password_files=( "${password_files[@]#"$prefix"/}" ) +password_files=( "${password_files[@]%.gpg}" ) + +password=$(printf '%s\n' "${password_files[@]}" | $dmenu "$@") + +[[ -n $password ]] || exit + +if [[ $typeit -eq 0 ]]; then + pass show -c "$password" 2>/dev/null +else + pass show "$password" | { IFS= read -r pass; printf %s "$pass"; } | $xdotool +fi diff --git a/modules/sway/default.nix b/modules/sway/default.nix index 3027bad..d6b0eec 100644 --- a/modules/sway/default.nix +++ b/modules/sway/default.nix @@ -177,6 +177,7 @@ in keybindings = { "${modifier}+Return" = "exec ${terminal}"; + "${modifier}+p" = "exec passmenu"; "${modifier}+Shift+w" = "exec browser"; "${modifier}+d" = "exec ${menu}"; diff --git a/modules/zsh/default.nix b/modules/zsh/default.nix index 0a66a20..3997ee2 100644 --- a/modules/zsh/default.nix +++ b/modules/zsh/default.nix @@ -28,7 +28,7 @@ in }; programs.zsh = { - enable = true; + enable = true; autocd = true; enableCompletion = true; defaultKeymap = "viins"; @@ -37,6 +37,11 @@ in dl = "~/dl"; src = "~/src"; }; + shellAliases = { + ls = "eza"; + ll = "eza -l"; + hide = "swayhide"; + }; autosuggestion.enable = true; initExtra = '' source ~/.oh-my-zsh/themes/${cfg.theme}.zsh-theme |