diff --git a/.zshrc b/.zshrc
index f35d655..32d696c 100644
--- a/.zshrc
+++ b/.zshrc
@@ -66,8 +66,7 @@ source $ZSH/oh-my-zsh.sh
# HIST_STAMPS="mm/dd/yyyy"
#-------Hypr-------#
-alias hypr-update='yay -S hyprland-git hyprlock-git hypridle-git hyprutils-git hyprgraphics-git hyprcursor-git hyprland-qt-support-git hyprwayland-scanner-git hyprpicker-git xdg-desktop-portal-hyprland-git hyprland-qtutils-git hyprland-protocols-git hyprsunset-git aquamarine-git hyprsysteminfo-git hyprpolkitagent-git'
-alias hyprfix-lock='hyprctl --instance 0 'dispatch exec hyprlock''
+alias hyprfix-lock='hyprctl --instance 0 "dispatch exec hyprlock"'
alias hyprfix-paper='pkill hyprpaper; sleep 2; hyprpaper > /dev/null 2>&1 & disown'
alias hyprfix-idle='pkill hypridle; sleep 2; hypridle > /dev/null 2>&1 & disown'
alias hyprfix-polkit='systemctl --user restart hyprpolkitagent'
@@ -87,6 +86,7 @@ bindkey "^[[57438;5u" backward-word
#-------My cute lil random alias-------#
+alias update-mirror='sudo reflector --verbose -c NO -c SE -c DK --protocol https --sort rate --latest 20 --download-timeout 5 --save /etc/pacman.d/mirrorlist'
alias ai='sh ~/.sh/ai.sh' # Start and stop ai
alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'
alias ffshare='~/.dotfiles/scripts/Random/ffshare.sh'
diff --git a/config/hypr/hyprland/execs.conf b/config/hypr/hyprland/execs.conf
index 4ad18f7..7ee4a95 100644
--- a/config/hypr/hyprland/execs.conf
+++ b/config/hypr/hyprland/execs.conf
@@ -33,3 +33,4 @@ exec-once = $hyprland/scripts/wallpaper/startup.sh
# I use this fr
exec-once = [workspace 20 silent] sleep 4; signal-desktop --use-tray-icon --enable-features=UseOzonePlatform --ozone-platform=wayland
exec-once = [workspace special:abd silent] /opt/abdownloadmanager/bin/ABDownloadManager
+exec-once = syncthing
\ No newline at end of file
diff --git a/config/hypr/hyprland/keybinds.conf b/config/hypr/hyprland/keybinds.conf
index 62d42da..195a59c 100644
--- a/config/hypr/hyprland/keybinds.conf
+++ b/config/hypr/hyprland/keybinds.conf
@@ -9,9 +9,7 @@ $fileManager = pcmanfm-qt
$menu = pkill rofi || rofi -show drun
$lock = playerctl pause -a | hyprlock
$wallpapers = hyprctl dispatch exec '[size 750 500; float; tag:wall-gui]' $terminal $hyprland/scripts/wallpaper/mpvpaper-sww.sh
-$signal-theme = $HOME/.dotfiles/scripts/theme/signal-matugen/signal-theme-updater.sh
-
-
+$signal-theme = $HOME/.config/matugen/signal-matugen.sh
##################
# Scripts & apps #
diff --git a/config/matugen/matugen.toml b/config/matugen/matugen.toml
index 1e0d263..78c6da2 100644
--- a/config/matugen/matugen.toml
+++ b/config/matugen/matugen.toml
@@ -48,6 +48,7 @@ output_path = '~/.config/heroic/themes/matugen-dark.css'
[templates.steam]
input_path = '~/.config/matugen/templates/steam-colors.css'
output_path = '~/.config/matugen/output/steam-colors.css'
+post_hook = '$HOME/.config/matugen/steam-theme.sh'
[templates.signal]
input_path = '~/.config/matugen/templates/signal-colors.css'
diff --git a/scripts/theme/signal-matugen/signal-theme-updater.sh b/config/matugen/signal-matugen.sh
similarity index 70%
rename from scripts/theme/signal-matugen/signal-theme-updater.sh
rename to config/matugen/signal-matugen.sh
index cc9e9ad..d396d83 100755
--- a/scripts/theme/signal-matugen/signal-theme-updater.sh
+++ b/config/matugen/signal-matugen.sh
@@ -1,6 +1,4 @@
#!/usr/bin/env bash
-# Update signal theme (After changing matugen style)
-
TEMP=$(mktemp -d --suffix=_SIGNAL)
SIGNAL_DIR="/usr/lib/signal-desktop/resources"
@@ -9,6 +7,12 @@ asar e "${SIGNAL_DIR}/app.asar" ${TEMP}
cp "$HOME/.config/matugen/output/signal-colors.css" "${TEMP}/stylesheets/matugen.css"
+# Check if the CSS exists in the manifest
+if ! grep -Fxq "@import \"matugen.css\";" "${TEMP}/stylesheets/manifest.css"; then
+ # CSS does not exist, so add it at the beginning of the manifest
+ sed -i "1i @import \"matugen.css\";" "${TEMP}/stylesheets/manifest.css"
+fi
+
if pkexec asar p ${TEMP} "${SIGNAL_DIR}/app.asar"; then
# Check if Signal is running and kill it if necessary
if pgrep -f "signal-desktop"; then
diff --git a/scripts/theme/steam-matugen/steam-theme.sh b/config/matugen/steam-theme.sh
similarity index 82%
rename from scripts/theme/steam-matugen/steam-theme.sh
rename to config/matugen/steam-theme.sh
index 2470340..7a8d74a 100755
--- a/scripts/theme/steam-matugen/steam-theme.sh
+++ b/config/matugen/steam-theme.sh
@@ -13,4 +13,8 @@
cp ~/.config/matugen/output/steam-colors.css ${STEAM_TEMP}/adwaita/colorthemes/matugen/matugen.css
cd ${STEAM_TEMP}
- "./install.py" ${STEAM_FLAVOR}
\ No newline at end of file
+ "./install.py" ${STEAM_FLAVOR}
+
+ if pgrep -f "steam"; then
+ pkill steam
+ fi
\ No newline at end of file
diff --git a/config/waybar/DP-1&2.jsonc b/config/waybar/DP-1&2.jsonc
index 578ea16..37f9cde 100644
--- a/config/waybar/DP-1&2.jsonc
+++ b/config/waybar/DP-1&2.jsonc
@@ -86,7 +86,7 @@
"tooltip": false,
"format-muted": " Muted",
"on-click": "$HOME/.config/hypr/hyprland/scripts/volume/mako-volume.sh mute",
- "on-click-right": "better-control -m -V",
+ "on-click-right": "pkill better-control || better-control -m -V",
"format-icons": {
"headphone": "",
"hands-free": "",
@@ -102,7 +102,7 @@
"tooltip": true,
"format": " ",
"format-wifi": " ",
- "on-click-right": "better-control -m -w",
+ "on-click-right": "pkill better-control || better-control -m -w",
"format-ethernet": " ",
"tooltip-format-wifi": "Network: {essid}\nSignal strength: {signaldBm}dBm ({signalStrength}%)\nFrequency: {frequency}MHz\nInterface: {ifname}\nIP: {ipaddr}\nGateway: {gwaddr}\nNetmask: {netmask} \n {bandwidthDownBytes} \n {bandwidthUpBytes}",
"tooltip-format-ethernet": "Interface: {ifname}\nLocal ip: {ipaddr} \n {bandwidthDownBytes} \n {bandwidthUpBytes}",
@@ -122,7 +122,7 @@
"tooltip-format-connected": " {device_enumerate}",
"tooltip-format-enumerate-connected": "{device_alias}",
"tooltip": false,
- "on-click-right": "better-control -m -b"
+ "on-click-right": "pkill better-control || better-control -m -b"
},
},
diff --git a/scripts/theme/signal-matugen/matugen.css b/scripts/theme/signal-matugen/matugen.css
deleted file mode 100644
index 9d7d2e0..0000000
--- a/scripts/theme/signal-matugen/matugen.css
+++ /dev/null
@@ -1,326 +0,0 @@
-/*
- _ _ ____
-| \ | | __ ___ __ | __ ) __ _ _ __ ___
-| \| |/ _` \ \ / / | _ \ / _` | '__/ __|
-| |\ | (_| |\ V / | |_) | (_| | | \__ \
-|_| \_|\__,_| \_/ |____/ \__,_|_| |___/
-*/
-
-/* left most bar */
-.NavTabs {
- background-color: {{colors.background.default.hex}} !important;
- }
-
- .NavTabs__ItemButton:hover {
- background-color: {{colors.surface_container_high.default.hex}} !important;
- }
-
- .NavTabs__Item[aria-selected="true"] > span > .NavTabs__ItemButton {
- background-color: {{colors.surface_bright.default.hex}} !important;
- }
-
- /* buttons in qr and link section of personal user profile */
- .UsernameLinkModalBody__actions__save,
- .UsernameLinkModalBody__actions__color {
- background-color: {{colors.surface_bright.default.hex}} !important;
- }
-
- /* second to left bar */
- .NavSidebar {
- background-color: {{colors.background.default.hex}} !important;
- }
-
- /* view archive button when clicking on ... */
- .ContextMenu__popper--single-item {
- background-color: {{colors.surface_container.default.hex}} !important;
- }
-
- .module-conversation-list__item--contact-or-conversation--is-selected {
- background-color: {{colors.surface_bright.default.hex}} !important;
- }
-
- /* no archived chat text */
- .module-left-pane__archive-helper-text {
- background-color: {{colors.surface_container.default.hex}} !important;
- }
-
- .module-conversation-list__item--contact-or-conversation:hover,
- .module-conversation-list__item--contact-or-conversation:focus,
- .module-conversation-list__item--archive-button:hover,
- .module-conversation-list__item--archive-button:focus {
- background-color: {{colors.surface_container.default.hex}} !important;
- }
-
- /*
- _ _ ____
- | | | | ___ _ __ ___ ___ | _ \ __ _ __ _ ___
- | |_| |/ _ \| '_ ` _ \ / _ \ | |_) / _` |/ _` |/ _ \
- | _ | (_) | | | | | | __/ | __/ (_| | (_| | __/
- |_| |_|\___/|_| |_| |_|\___| |_| \__,_|\__, |\___|
- |___/
- */
-
- .Inbox__no-conversation-open {
- background-color: {{colors.surface.default.hex}} !important;
- }
-
- /*
- _____ _ _ _
- |_ _|____ _| |_(_)_ __ __ _ / \ _ __ ___ __ _
- | |/ _ \ \/ / __| | '_ \ / _` | / _ \ | '__/ _ \/ _` |
- | | __/> <| |_| | | | | (_| | / ___ \| | | __/ (_| |
- |_|\___/_/\_\\__|_|_| |_|\__, | /_/ \_\_| \___|\__,_|
- |___/
- */
-
- /* the bar at the top containing your contact name */
- .module-ConversationHeader {
- background-color: {{colors.shadow.default.hex}} !important;
- }
-
- /* call, search, etc button present at conversation header */
- .module-ConversationHeader__button:hover,
- .module-ConversationHeader__button:focus {
- background-color: {{colors.surface_container.default.hex}} !important;
- }
-
- /* ... menu at conversation header */
- .react-contextmenu {
- background-color: {{colors.surface_container.default.hex}} !important;
- }
-
- /* ... menu hover */
- .react-contextmenu-item--selected {
- background-color: {{colors.surface_bright.default.hex}} !important;
- }
-
- /* the vm player that appears at top */
- .MiniPlayer {
- background-color: {{colors.surface_bright.default.hex}} !important;
- }
-
- /* conversation area */
- .module-timeline {
- background-color: {{colors.surface.default.hex}} !important;
- }
-
- /* messages */
- .module-message__container--incoming {
- background-color: {{colors.surface_container.default.hex}} !important;
- }
-
- /* replying box */
- .module-quote--incoming > .module-quote__primary,
- .module-quote--incoming > .module-quote__icon-container {
- background-color: {{colors.surface_bright.default.hex}} !important;
- border: 0px !important;
- }
-
- /* call again button */
- .module-Button--system-message {
- background-color: {{colors.surface_bright.default.hex}} !important;
- }
-
- /* the area where you write message, attach file, send vm, etc. */
- .CompositionArea {
- background-color: {{colors.shadow.default.hex}} !important;
- }
-
- /* the actual typing box */
- .module-composition-input__input {
- background-color: {{colors.surface_container.default.hex}} !important;
- }
-
- /* the today or yesterday thing that appears when you scroll up */
- .TimelineDateHeader--floating {
- background-color: {{colors.surface_container.default.hex}} !important;
- }
-
- .TimelineFloatingHeader__spinner-container {
- background-color: {{colors.surface_container.default.hex}} !important;
- }
-
- .ScrollDownButton {
- background-color: {{colors.surface_container.default.hex}} !important;
- }
-
- /*
- ____ _ _ _ _
- / ___|__ _| | (_)_ __ __ _ / \ _ __ ___ __ _
- | | / _` | | | | '_ \ / _` | / _ \ | '__/ _ \/ _` |
- | |__| (_| | | | | | | | (_| | / ___ \| | | __/ (_| |
- \____\__,_|_|_|_|_| |_|\__, | /_/ \_\_| \___|\__,_|
- |___/
- */
-
- /* background when contact isn't selected */
- .CallsTab__EmptyState {
- background-color: {{colors.surface.default.hex}} !important;
- }
-
- /* background when contact is selected */
- .CallsTab__ConversationCallDetails {
- background-color: {{colors.surface.default.hex}} !important;
- }
-
- /* contact list sidebar item */
- .CallsList__ItemTile:hover {
- background-color: {{colors.surface_container.default.hex}} !important;
- }
-
- .CallsList__ItemTile[aria-selected="true"] {
- background-color: {{colors.surface_bright.default.hex}} !important;
- }
-
- .CallsNewCall_ItemActionButton {
- background-color: {{colors.surface_bright.default.hex}} !important;
- }
-
- /*
- ____ _ _
- / ___|| |_ ___ _ __ _ _ / \ _ __ ___ __ _
- \___ \| __/ _ \| '__| | | | / _ \ | '__/ _ \/ _` |
- ___) | || (_) | | | |_| | / ___ \| | | __/ (_| |
- |____/ \__\___/|_| \__, | /_/ \_\_| \___|\__,_|
- |___/
- */
-
- .Stories__placeholder {
- background-color: {{colors.surface.default.hex}} !important;
- }
-
- /*
- _ _ ____ __ _ _
- | | | |___ ___ _ __ | _ \ _ __ ___ / _(_) | ___
- | | | / __|/ _ \ '__| | |_) | '__/ _ \| |_| | |/ _ \
- | |_| \__ \ __/ | | __/| | | (_) | _| | | __/
- \___/|___/\___|_| |_| |_| \___/|_| |_|_|\___|
- */
-
- /* background of user details panel */
- .ConversationPanel,
- .ConversationPanel__header {
- background-color: {{colors.surface.default.hex}} !important;
- }
-
- /* disappering message timer */
- .module-select > select {
- background-color: {{colors.surface_container.default.hex}} !important;
- }
-
- /* nickname, chatcolor, add to group and other button */
- .ConversationDetails-panel-row__root--button:hover {
- background-color: {{colors.surface_container.default.hex}} !important;
- }
-
- /* nickname edit menu*/
- .Input__container {
- background-color: {{colors.surface_container.default.hex}} !important;
- border-color: {{colors.surface_container_highest.default.hex}} !important;
- }
-
- /* add to group button background color */
- .ConversationDetails-groups__add-to-group-icon {
- background-color: {{colors.surface_container.default.hex}} !important;
- }
-
- /* the user profile, signal connection and safety number popup */
- .module-Modal {
- background-color: {{colors.surface.default.hex}} !important;
- }
-
- /* mark as varified or clear verification button */
- .module-SafetyNumberViewer__button > button {
- background-color: {{colors.surface_bright.default.hex}} !important;
- }
-
- /*
- _
- _ __ ___ (_)___ ___
- | '_ ` _ \| / __|/ __|
- | | | | | | \__ \ (__
- |_| |_| |_|_|___/\___|
- */
-
- /* background when viewing image */
- .Lightbox__animated {
- background-color: {{colors.surface.default.hex}} !important;
- }
-
- /* many of the buttons */
- .module-Button {
- background-color: {{colors.surface_bright.default.hex}} !important;
- }
-
- .module-Button:hover {
- background-color: {{colors.surface_container.default.hex}} !important;
- }
-
- /*
- ____ _ _ _
- / ___| ___| |_| |_(_)_ __ __ _ ___
- \___ \ / _ \ __| __| | '_ \ / _` / __|
- ___) | __/ |_| |_| | | | | (_| \__ \
- |____/ \___|\__|\__|_|_| |_|\__, |___/
- |___/
- */
-
- /* side pannel of settings */
- .Preferences__page-selector {
- background-color: {{colors.shadow.default.hex}} !important;
- }
-
- /* main settings pannel */
- .Preferences__settings-pane {
- background-color: {{colors.surface.default.hex}} !important;
- }
-
- /* page selector selected background */
- .Preferences__button--selected {
- background-color: {{colors.outline.default.hex}} !important;
- }
-
- .Preferences__button:focus {
- background-color: {{colors.surface_container.default.hex}} !important;
- }
-
- /* language and chat color button */
- .Preferences__control--clickable:hover {
- background-color: {{colors.surface_container.default.hex}} !important;
- }
-
- .module-Button--secondary--destructive {
- color: {{colors.primary.default.hex}} !important;
- }
-
- /*
- ____ _ _
- / ___|__ _| | |
- | | / _` | | |
- | |__| (_| | | |
- \____\__,_|_|_|
- */
-
- .module-calling__container {
- background-color: {{colors.surface.default.hex}} !important;
- }
-
- /* cancel and settings button */
- .CallSettingsButton__Button {
- background-color: {{colors.surface_container.default.hex}} !important;
- }
-
- /* the bar at the bottom during calls */
- .CallControls {
- background-color: {{colors.surface_container.default.hex}} !important;
- }
-
- /* mike and camera button */
- .CallingButton__icon {
- background-color: {{colors.surface_bright.default.hex}} !important;
- }
-
- /* your pfp box during call */
- .module-calling__background {
- background-color: {{colors.surface_container.default.hex}} !important;
- }
\ No newline at end of file
diff --git a/scripts/theme/signal-matugen/signal-theme-enabler.sh b/scripts/theme/signal-matugen/signal-theme-enabler.sh
deleted file mode 100755
index 27267a4..0000000
--- a/scripts/theme/signal-matugen/signal-theme-enabler.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env bash
-# Install signal theme
-
-
-TEMP=$(mktemp -d --suffix=_SIGNAL)
-SIGNAL_DIR="/usr/lib/signal-desktop/resources"
-
-# Check if Signal is running and kill it if necessary
-if pgrep -f "signal-desktop"; then
- echo "Signal is running, killing process..."
- pkill signal-desktop
-fi
-
-asar e "${SIGNAL_DIR}/app.asar" ${TEMP}
-
-cp "$HOME/.config/matugen/output/signal-colors.css" "${TEMP}/stylesheets/matugen.css"
-
-sed -i "1i @import \"matugen.css\";" "${TEMP}/stylesheets/manifest.css"
-
-sudo asar p ${TEMP} "${SIGNAL_DIR}/app.asar"
-
-hyprctl dispatch exec [workspace 20 silent]; signal-desktop --use-tray-icon --enable-features=UseOzonePlatform --ozone-platform=wayland > /dev/null 2>&1 & exit