diff --git a/flake.nix b/flake.nix index 7648721..808d6a1 100644 --- a/flake.nix +++ b/flake.nix @@ -45,6 +45,8 @@ ./modules/services/miniflux.nix ./modules/services/ssh.nix ./modules/services/glance.nix + ./modules/services/media/arr.nix + ./modules/services/media/jellyfin.nix ./modules/network/avahi.nix ./modules/network/vpn/tailscale.nix diff --git a/modules/applications/darwin.nix b/modules/applications/darwin.nix index 8455ac6..5cfd434 100644 --- a/modules/applications/darwin.nix +++ b/modules/applications/darwin.nix @@ -50,6 +50,7 @@ "signal" "soulseek" "whatsapp" + "musicbrainz-picard" "the-unarchiver" "linearmouse" diff --git a/modules/applications/default.nix b/modules/applications/default.nix index 5234ae9..4a0160a 100644 --- a/modules/applications/default.nix +++ b/modules/applications/default.nix @@ -21,6 +21,8 @@ newsflash nicotine-plus zapzap + picard + whipper ]) ++ lib.optionals pkgs.stdenv.isDarwin (with pkgs; [ iina raycast diff --git a/stow/.config/matugen/config.toml b/stow/.config/matugen/config.toml index bf90507..9e3f0cd 100644 --- a/stow/.config/matugen/config.toml +++ b/stow/.config/matugen/config.toml @@ -71,3 +71,4 @@ output_path = '~/.cache/zsh_colours.sh' [templates.fish-pure] input_path = './templates/pure.fish' output_path = '~/.config/fish/pure_colours.fish' +post_hook = 'fish ~/.config/fish/pure_colours.fish' diff --git a/stow/.config/sketchybar/plugins/input-method.sh b/stow/.config/sketchybar/plugins/input-method.sh index ebdf189..291ca22 100755 --- a/stow/.config/sketchybar/plugins/input-method.sh +++ b/stow/.config/sketchybar/plugins/input-method.sh @@ -26,4 +26,4 @@ elif [ "$EASTERN_LANGUAGE" = "$KATANA" ]; then ICON="🈴" fi -sketchybar --set "$NAME" label="$LABEL" icon="$ICON" +sketchybar --set "$NAME" label="$LABEL" icon="" diff --git a/stow/.config/sketchybar/plugins/music.sh b/stow/.config/sketchybar/plugins/music.sh index 0324fb0..d4a0f4b 100755 --- a/stow/.config/sketchybar/plugins/music.sh +++ b/stow/.config/sketchybar/plugins/music.sh @@ -4,7 +4,7 @@ SONG="$(osascript -e 'tell application "Music" to if player state is playing then artist of current track & " - " & name of current track')" if [[ "$(echo $SONG | wc -w | sed 's/ //g')" != "0" ]]; then - sketchybar --set "$NAME" label="${SONG}" background.drawing=true icon.drawing=true + sketchybar --set "$NAME" label="${SONG}" drawing=true else - sketchybar --set "$NAME" label="" background.drawing=false icon.drawing=false + sketchybar --set "$NAME" label="" drawing=false fi diff --git a/stow/.config/sketchybar/plugins/wifi.sh b/stow/.config/sketchybar/plugins/wifi.sh index c886026..06bc0cc 100755 --- a/stow/.config/sketchybar/plugins/wifi.sh +++ b/stow/.config/sketchybar/plugins/wifi.sh @@ -1,8 +1,8 @@ #!/bin/sh -ping -c 1 1.1.1.1 &> /dev/null +ping -c 1 1.1.1.1 -t 15 &> /dev/null if [ "$?" = "0" ]; then - sketchybar --set $NAME icon=󰖩 + sketchybar --set $NAME icon=󰖩 drawing=false else - sketchybar --set $NAME icon=󰖪 + sketchybar --set $NAME icon=󰖪 drawing=true fi diff --git a/stow/.config/sketchybar/sketchybarrc b/stow/.config/sketchybar/sketchybarrc index 6b3ace8..f13c205 100755 --- a/stow/.config/sketchybar/sketchybarrc +++ b/stow/.config/sketchybar/sketchybarrc @@ -79,14 +79,14 @@ sketchybar --add item music left \ click_script="osascript -e 'tell application \"Music\" to playpause'" \ background.padding_right=0 \ background.padding_left=0 \ - background.drawing=false \ + drawing=false \ scroll_texts=1 \ label.max_chars=50 \ label.scroll_duration=500 \ background.color=$PRIMARY_COLOUR \ icon.color=$BACKGROUND_COLOUR \ label.color=$BACKGROUND_COLOUR \ - icon.drawing=false + drawing=false # # Adding Right Items