From 13c2365b7b41a31a8475f285535e192630bc6d57 Mon Sep 17 00:00:00 2001 From: Menno van Leeuwen Date: Sat, 9 Nov 2024 03:56:39 +0100 Subject: [PATCH] fixes small bug with update.sh readded term welcome screen to dotf cleaned up 1password.nix --- bin/actions/update.sh | 3 --- bin/dotf | 12 +++++++++++- config/nixos/packages/workstation/1password.nix | 8 ++++++-- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/bin/actions/update.sh b/bin/actions/update.sh index 0c96a20..28514dc 100755 --- a/bin/actions/update.sh +++ b/bin/actions/update.sh @@ -170,9 +170,6 @@ homemanager() { # Parse arguments #################################################################################################### -# Shift the first argument since this is the script name -shift - if [ "$#" -eq 0 ]; then printfe "%s\n" "yellow" "No options passed, running full update..." diff --git a/bin/dotf b/bin/dotf index 3f3b704..e42bfbb 100755 --- a/bin/dotf +++ b/bin/dotf @@ -25,7 +25,16 @@ update() { printfe "%s\n" "red" "Error: Update script not found or not executable" return 1 fi - "$update_script" "$@" + "$update_script" $@ +} + +term() { + local term_script="$DOTFILES_BIN/actions/term.sh" + if [[ ! -x "$term_script" ]]; then + printfe "%s\n" "red" "Error: Terminal script not found or not executable" + return 1 + fi + "$term_script" "$@" } help() { @@ -97,6 +106,7 @@ main() { case "${1:-help}" in update) shift; update "$@" ;; help) shift; help "$@" ;; + term) shift; term "$@" ;; secrets) shift; secrets "$@" ;; *) help ;; esac diff --git a/config/nixos/packages/workstation/1password.nix b/config/nixos/packages/workstation/1password.nix index 12f7654..ae104c9 100644 --- a/config/nixos/packages/workstation/1password.nix +++ b/config/nixos/packages/workstation/1password.nix @@ -1,7 +1,11 @@ { pkgs, ... }: { - # 1Password - programs._1password.enable = true; + # Enables the 1Password CLI + programs._1password = { + enable = true; + }; + + # Enables the 1Password desktop app programs._1password-gui = { enable = true; polkitPolicyOwners = [ "menno" ];