From 07919bd38b53b957567f47d22c0656d830905d74 Mon Sep 17 00:00:00 2001 From: Kyler Clay Date: Wed, 2 Oct 2024 02:05:26 -0400 Subject: [PATCH] Commit for generation 148 --- .../dotfiles/packages/hyprland/hyprland.conf | 4 ++-- glasshouse-desktop/modules/zshell.nix | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/glasshouse-desktop/dotfiles/packages/hyprland/hyprland.conf b/glasshouse-desktop/dotfiles/packages/hyprland/hyprland.conf index f4a7bf8..19cd110 100644 --- a/glasshouse-desktop/dotfiles/packages/hyprland/hyprland.conf +++ b/glasshouse-desktop/dotfiles/packages/hyprland/hyprland.conf @@ -23,7 +23,7 @@ exec-once=[floating;size 504 330;move 25 60] kitty exec-once=[floating;size 504 660; move 25 400] kitty zsh -e 'nvim -c "source scripts/events.lua" -c "silent! r \!python scripts/schedule.py"' exec-once=/sbin/pypr - exec-once=hyprctl setcursor rose-pine-hyprcursor 24 + exec-once=aplay /home/pagedmov/sound/sys/login.wav # window rules windowrule = noshadow, ^(.*)$ windowrule = opacity 1 0.9, ^(kitty)$ @@ -32,7 +32,7 @@ $terminal = kitty $filemanager = kitty ranger $menu = rofi -show drun - $screenshot = grimblast copy area + $screenshot = grimblast copy area && check_sounds && aplay /home/pagedmov/sound/sys/screenshot.wav $browser = firefox env = qt_qpa_platformtheme,qt6ct env = XDG_CURRENT_DESKTOP,hyprland diff --git a/glasshouse-desktop/modules/zshell.nix b/glasshouse-desktop/modules/zshell.nix index 13dc666..94a54ce 100644 --- a/glasshouse-desktop/modules/zshell.nix +++ b/glasshouse-desktop/modules/zshell.nix @@ -3,6 +3,7 @@ enable = true; sessionVariables = { + SOUNDS_ENABLED = "1"; EDITOR = "/nixbin/nvim"; SUDO_EDITOR = "/nixbin/nvim"; VISUAL = "/nixbin/nvim"; @@ -11,6 +12,7 @@ STARSHIP_CONFIG = /home/pagedmov/.config/starship/starship.toml; FZF_DEFAULT_COMMAND = "find $HOME \( -path \"$HOME/.steam\" -o -path \"$HOME/.mozilla\" -o -path \"$HOME/go\" \) -prune -o -type f -print"; GIT_TOKEN = "$(cat supersecret/git-token)"; + PROMPT_COMMAND = "if [[ $? != 0 ]]; then check_sounds && aplay ~/sound/sys/error.wav; fi"; }; shellAliases = { @@ -71,6 +73,9 @@ else mkdir -p "$comppath" fi +sounds_enabled() {[ "$SOUNDS_ENABLED" -eq "1" ]} + + preexec() { cmdcounter="/tmp/cmdcounter_$(whoami)" @@ -121,11 +126,13 @@ wiki_update() { # Functions ls() { command ls --group-directories-first --color=always -F1 "$@" | sort -f -k1 + checksound && aplay ~/sound/sys/ls.wav } # cd and ls after cd() { builtin cd "$@" && ls + checksound && aplay ~/sound/sys/cd.wav } src() { autoload -U zrecompile @@ -178,6 +185,7 @@ safe_rm() { # Perform the removal if no checks or confirmation is "y" if [ "$check" = false ] || [ "$confirm" = "y" ]; then + check_sounds && aplay ~/sound/sys/rm.wav /run/current-system/sw/bin/rm -rfv "$dir" else echo "Operation cancelled for '$dir'." @@ -190,6 +198,7 @@ safe_rm() { nixswitch() { + checksounds && aplay ~/sound/sys/nixswitch-start.wav builtin cd "$HOME/sysflakes" nix flake update @@ -203,6 +212,7 @@ nixswitch() { fi sudo nixos-rebuild switch --flake "$HOME/sysflakes#glasshouse" builtin cd $OLDPWD + checksounds && aplay ~/sound/sys/update.wav } journal() { # journal for keeping track of stuff I do that isn't declared in my nix config