diff --git a/modules/sys/software/gaming/gaming_pkgs.nix b/modules/sys/software/gaming/gaming_pkgs.nix index 3b13e6b..ad393b3 100755 --- a/modules/sys/software/gaming/gaming_pkgs.nix +++ b/modules/sys/software/gaming/gaming_pkgs.nix @@ -15,6 +15,10 @@ in { lib.mkEnableOption "enables gaming packages"; }; config = lib.mkIf config.movOpts.softwareCfg.gamingPkgs.enable { - environment.systemPackages = with pkgs; [ snes9x-gtk cust-openrct2 ]; + environment.systemPackages = with pkgs; [ + snes9x-gtk + cust-openrct2 + dwarf-fortress-packages.dwarf-fortress-full + ]; }; } diff --git a/overlay/scripts/wm-controls/keyring.nix b/overlay/scripts/wm-controls/keyring.nix index a1a9cc4..7718f6a 100755 --- a/overlay/scripts/wm-controls/keyring.nix +++ b/overlay/scripts/wm-controls/keyring.nix @@ -12,10 +12,6 @@ pkgs.writeShellApplication { text = '' #!/run/current-system/sw/bin/bash - # prevent multiple instances, conditional check happens in the hyprland bind - touch /tmp/keyringfile - trap "[ -f /tmp/keyringfile ] && /run/current-system/sw/bin/rm /tmp/keyringfile" EXIT SIGHUP SIGINT - # get passwords from password store, remove .password store/ prefix and .gpg suffix, exlude .gpg-id file, open results in fzf pass_string=$(find "$HOME"/.password-store -type f | sed 's|.*/.password-store/||; s|\.gpg$||' | sed 's|^\([^/]*\)|\x1b[32m\1\x1b[0m|' | rg -v "\.git|.gpg-id" | sort -r | fzf --border --border-label="$(whoami)'s keyring" --ansi --layout=reverse) @@ -33,7 +29,6 @@ pkgs.writeShellApplication { pkill -CONT wl-paste EOF - /run/current-system/sw/bin/rm /tmp/keyringfile sleep 0.5 exit 0 '';