diff --git a/assets/sound/gitpull.wav b/assets/sound/gitpull.wav new file mode 100644 index 0000000..78628f6 Binary files /dev/null and b/assets/sound/gitpull.wav differ diff --git a/modules/home/environment/zshell.nix b/modules/home/environment/zshell.nix index d793643..1280661 100644 --- a/modules/home/environment/zshell.nix +++ b/modules/home/environment/zshell.nix @@ -57,7 +57,8 @@ #git "ga." = "scheck && runbg aplay ${self}/assets/sound/gitadd.wav; git add ."; gcm = "gitcommit_sfx"; - gp = " git push && scheck && runbg aplay ${self}/assets/sound/gitpush.wav;"; + gpush = " git push && scheck && runbg aplay ${self}/assets/sound/gitpush.wav;"; + gpull = " git pull && scheck && runbg aplay ${self}/assets/sound/gitpull.wav;"; }; initExtra = '' diff --git a/modules/home/scripts/commands/compress.nix b/modules/home/scripts/commands/compress.nix deleted file mode 100644 index 5680319..0000000 --- a/modules/home/scripts/commands/compress.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ - self, - pkgs, -}: -pkgs.writeShellScriptBin "compress" '' - #!/usr/bin/env bash - - if (( $# == 1 )) then - # echo -ne "Archive name: " - # read name - # tar -cvzf "$name.tar.gz" $1 - tar -cvzf "$1.tar.gz" $1 - else - echo "Wrong number of arguments..." - fi -'' diff --git a/modules/home/scripts/commands/crs.nix b/modules/home/scripts/commands/crs.nix deleted file mode 100644 index 0376132..0000000 --- a/modules/home/scripts/commands/crs.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ - self, - pkgs, -}: -pkgs.writeShellScriptBin "crs" '' - #!/run/current-system/sw/bin/bash - - cargo test && \ - cargo run -'' diff --git a/modules/home/scripts/commands/extract.nix b/modules/home/scripts/commands/extract.nix deleted file mode 100644 index f809691..0000000 --- a/modules/home/scripts/commands/extract.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ - self, - pkgs, -}: -pkgs.writeShellScriptBin "extract" '' - #!/usr/bin/env bash - - for i in "$@" ; do - tar -xvzf $i - break - done -'' diff --git a/modules/home/scripts/commands/keybinds.nix b/modules/home/scripts/commands/keybinds.nix deleted file mode 100644 index 950e888..0000000 --- a/modules/home/scripts/commands/keybinds.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ - self, - pkgs, -}: -pkgs.writeShellScriptBin "keybinds" '' - #!/usr/bin/env bash - - config_file=~/.config/hypr/hyprland.conf - keybinds=$(grep -oP '(?<=bind=).*' $config_file) - keybinds=$(echo "$keybinds" | sed 's/,\([^,]*\)$/ = \1/' | sed 's/, exec//g' | sed 's/^,//g') - rofi -dmenu -theme-str 'window {width: 50%;}' <<< "$keybinds" -'' diff --git a/modules/home/scripts/commands/toolbelt.nix b/modules/home/scripts/commands/toolbelt.nix index c9f360a..3bc1546 100644 --- a/modules/home/scripts/commands/toolbelt.nix +++ b/modules/home/scripts/commands/toolbelt.nix @@ -24,8 +24,8 @@ running=true declare -A commands=( ["Change Wallpaper"]="moveonscreen --center && if chpaper; then running=false; else moveonscreen; fi" ["Change System Color Scheme"]="hyprctl dispatch resizeactive 10% 80% && moveonscreen --center && if chscheme; then running=false; else hyprctl dispatch resizeactive exact 40% 25% && moveonscreen; fi" - ["Open System Monitor"]="exec hyprctl dispatch exec '[float;size 50% 70%;move onscreen cursor -50% -50%] kitty btop'" - ["Open Volume Controls"]="exec hyprctl dispatch exec '[float;size 50% 70%;move onscreen cursor -50% -50%] pavucontrol'" + ["Open System Monitor"]="hyprctl dispatch resizeactive 20% 140% && moveonscreen --center && btop && hyprctl dispatch resizeactive exact 40% 25% && moveonscreen" + ["Open Volume Controls"]="hyprctl dispatch resizeactive 10% 80% && moveonscreen --center && alsamixer && hyprctl dispatch resizeactive exact 40% 25% && moveonscreen" ["Open Keyring"]="hyprctl dispatch resizeactive -300 0 && moveonscreen && if keyring; then running=false; else hyprctl dispatch resizeactive exact 40% 25% && moveonscreen; fi" ["Calculator"]="calc" ) diff --git a/modules/home/scripts/default.nix b/modules/home/scripts/default.nix index bdfebac..d1c5375 100644 --- a/modules/home/scripts/default.nix +++ b/modules/home/scripts/default.nix @@ -12,14 +12,6 @@ self = self; pkgs = pkgs; }; - crs = import ./commands/crs.nix { - self = self; - pkgs = pkgs; - }; - extract = import ./commands/extract.nix { - self = self; - pkgs = pkgs; - }; invoke = import ./commands/invoke.nix { self = self; pkgs = pkgs; @@ -49,38 +41,10 @@ pkgs = pkgs; }; hyprland = import ./wm-controls/hyprland.nix {pkgs = pkgs;}; - lofi = import ./wm-controls/lofi.nix { - self = self; - pkgs = pkgs; - }; - music = import ./wm-controls/music.nix { - self = self; - pkgs = pkgs; - }; - shutdown-script = import ./wm-controls/shutdown-script.nix { - self = self; - pkgs = pkgs; - }; switchmon = import ./wm-controls/switchmon.nix { self = self; pkgs = pkgs; }; - toggle_blur = import ./wm-controls/toggle_blur.nix { - self = self; - pkgs = pkgs; - }; - toggle_float = import ./wm-controls/toggle_float.nix { - self = self; - pkgs = pkgs; - }; - toggle_oppacity = import ./wm-controls/toggle_oppacity.nix { - self = self; - pkgs = pkgs; - }; - toggle_waybar = import ./wm-controls/toggle_waybar.nix { - self = self; - pkgs = pkgs; - }; rebuild = import ./nix/rebuild.nix { host = host; self = self; @@ -101,26 +65,17 @@ in { chpaper chscheme keyring - crs - extract garbage-collect hyprland invoke - lofi mcd - music rebuild nsp runbg scheck - shutdown-script splash switchmon - toggle_blur - toggle_float moveonscreen - toggle_oppacity - toggle_waybar toolbelt viconf ]; diff --git a/modules/home/scripts/wm-controls/lofi.nix b/modules/home/scripts/wm-controls/lofi.nix deleted file mode 100644 index d0afe0f..0000000 --- a/modules/home/scripts/wm-controls/lofi.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ - self, - pkgs, -}: -pkgs.writeShellScriptBin "lofi" '' - #!/usr/bin/env bash - - if (ps aux | grep mpv | grep -v grep > /dev/null) then - pkill mpv - else - runbg mpv --no-video https://www.youtube.com/live/jfKfPfyJRdk?si=OF0HKrYFFj33BzMo - fi -'' diff --git a/modules/home/scripts/wm-controls/music.nix b/modules/home/scripts/wm-controls/music.nix deleted file mode 100644 index 468de6d..0000000 --- a/modules/home/scripts/wm-controls/music.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ - self, - pkgs, -}: -pkgs.writeShellScriptBin "music" '' - #!/usr/bin/env bash - - if (ps aux | grep audacious | grep -v grep > /dev/null) then - pkill audacious - else - hyprctl dispatch exec "[workspace 5 silent] audacious -t ~/Music/playlist" - sleep 0.5 - audtool playlist-repeat-status |grep "on" || audtool playlist-repeat-toggle - audtool playlist-shuffle-status|grep "on" || audtool playlist-shuffle-toggle - fi -'' diff --git a/modules/home/scripts/wm-controls/power-menu.nix b/modules/home/scripts/wm-controls/power-menu.nix deleted file mode 100644 index 8c0d9a3..0000000 --- a/modules/home/scripts/wm-controls/power-menu.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ - self, - pkgs, -}: -pkgs.writeShellScriptBin "power-menu" '' - #!/usr/bin/env bash - - rofi -show p -modi p:'rofi-power-menu' -theme-str 'window {width: 10em; height: 15em;} listview {lines: 5;}' -'' diff --git a/modules/home/scripts/wm-controls/shutdown-script.nix b/modules/home/scripts/wm-controls/shutdown-script.nix deleted file mode 100644 index f71f774..0000000 --- a/modules/home/scripts/wm-controls/shutdown-script.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ - self, - pkgs, -}: -pkgs.writeShellScriptBin "shutdown-script" '' - #!/usr/bin/env zsh - - respond="$(echo " Shutdown\n Restart\n Cancel" | rofi -dmenu)" - - if [ $respond = ' Shutdown' ] - then - echo "shutdown" - shutdown now - elif [ $respond = ' Restart' ] - then - echo "restart" - reboot - else - notify-send "cancel shutdown" - fi -'' diff --git a/modules/home/scripts/wm-controls/toggle_blur.nix b/modules/home/scripts/wm-controls/toggle_blur.nix deleted file mode 100644 index d495b8d..0000000 --- a/modules/home/scripts/wm-controls/toggle_blur.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ - self, - pkgs, -}: -pkgs.writeShellScriptBin "toggle_blur" '' - #!/usr/bin/env bash - - if hyprctl getoption decoration:blur:enabled | grep "int: 1" >/dev/null ; then - hyprctl keyword decoration:blur:enabled false >/dev/null - else - hyprctl keyword decoration:blur:enabled true >/dev/null - fi -'' diff --git a/modules/home/scripts/wm-controls/toggle_float.nix b/modules/home/scripts/wm-controls/toggle_float.nix deleted file mode 100644 index 20a06a0..0000000 --- a/modules/home/scripts/wm-controls/toggle_float.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ - self, - pkgs, -}: -pkgs.writeShellScriptBin "toggle_float" '' - #!/usr/bin/env bash - - hyprctl dispatch togglefloating - hyprctl dispatch resizeactive exact 950 600 - hyprctl dispatch centerwindow -'' diff --git a/modules/home/scripts/wm-controls/toggle_oppacity.nix b/modules/home/scripts/wm-controls/toggle_oppacity.nix deleted file mode 100644 index 11370e1..0000000 --- a/modules/home/scripts/wm-controls/toggle_oppacity.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ - self, - pkgs, -}: -pkgs.writeShellScriptBin "toggle_oppacity" '' - #!/usr/bin/env bash - - if hyprctl getoption decoration:active_opacity | grep "float: 1" >/dev/null ; then - hyprctl keyword decoration:active_opacity 0.90 >/dev/null - hyprctl keyword decoration:inactive_opacity 0.90 >/dev/null - else - hyprctl keyword decoration:active_opacity 1 >/dev/null - hyprctl keyword decoration:inactive_opacity 1 >/dev/null - fi -'' diff --git a/modules/home/scripts/wm-controls/toggle_waybar.nix b/modules/home/scripts/wm-controls/toggle_waybar.nix deleted file mode 100644 index e945a03..0000000 --- a/modules/home/scripts/wm-controls/toggle_waybar.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ - self, - pkgs, -}: -pkgs.writeShellScriptBin "toggle_waybar" '' - #!/usr/bin/env bash - - SERVICE=".waybar-wrapped" - - if pgrep -x "$SERVICE" >/dev/null - then - pkill -9 waybar - else - runbg waybar - fi -'' diff --git a/modules/sys/environment/stylix.nix b/modules/sys/environment/stylix.nix index 0ef0fe7..08deb63 100644 --- a/modules/sys/environment/stylix.nix +++ b/modules/sys/environment/stylix.nix @@ -12,7 +12,7 @@ image = wallpaper; polarity = "dark"; autoEnable = true; - opacity.terminal = 0.35; + opacity.terminal = 0.5; targets = { console.enable = true; feh.enable = true;