From 9f0d8dadffee512ca7d559033bce29efc078426d Mon Sep 17 00:00:00 2001 From: Michel Fedde Date: Fri, 28 Feb 2025 15:43:53 +0100 Subject: [PATCH] Adds pywal and adjusted styling --- .config/hypr/config/Startup_Apps.conf | 1 + .config/hypr/config/WindowRules.conf | 3 +++ .config/terminal/.setuprc | 6 +++++ .config/waybar/ModulesCustom.json | 4 ++-- .config/waybar/config | 5 +--- .config/waybar/style.css | 23 ++++++++++--------- .config/yadm/bootstrap.d/20-Wal.sh | 5 ++++ .config/yadm/bootstrap.d/21-SASSThemes.sh | 8 +++++++ .../yadm/bootstrap.d/30-GeneralPrograms.sh | 3 ++- .gitignore | 6 +++++ .ssh/config | 5 ++++ .ssh/pandorasboxserver.key.pub | 1 + 12 files changed, 52 insertions(+), 18 deletions(-) create mode 100755 .config/yadm/bootstrap.d/20-Wal.sh create mode 100755 .config/yadm/bootstrap.d/21-SASSThemes.sh create mode 100644 .ssh/pandorasboxserver.key.pub diff --git a/.config/hypr/config/Startup_Apps.conf b/.config/hypr/config/Startup_Apps.conf index d8a8c91..70b3eee 100644 --- a/.config/hypr/config/Startup_Apps.conf +++ b/.config/hypr/config/Startup_Apps.conf @@ -23,6 +23,7 @@ exec-once = blueman-applet & exec-once = kdeconnect-indicator & exec-once = beeper --hidden --default-frame & # exec-once = sleep 5 && nwg-dock-hyprland -a start -f -nolauncher -x -i 30 -o "DP-4" & +exec-once = wal -R # Starting hypridle to start hyprlock exec-once = hypridle & diff --git a/.config/hypr/config/WindowRules.conf b/.config/hypr/config/WindowRules.conf index 8b66b1d..dcd3bbc 100644 --- a/.config/hypr/config/WindowRules.conf +++ b/.config/hypr/config/WindowRules.conf @@ -20,6 +20,7 @@ windowrulev2 = center, title:^(Keybindings)$ windowrulev2 = move 72% 7%,title:^(Picture-in-Picture)$ #windowrulev2 = move 72% 7%,title:^(Firefox)$ windowrulev2 = move cursor -50% -50%, class:blobdrop +windowrulev2 = move cursor -50% -25%, class:Bitwarden # windowrule v2 to avoid idle for fullscreen apps windowrulev2 = idleinhibit fullscreen, class:^(*)$ @@ -80,6 +81,7 @@ windowrulev2 = float, class:^(io.ente.auth)$ windowrulev2 = float, class:^(org.rncbc.qjackctl)$ windowrulev2 = float, class:^(blobdrop)$ windowrulev2 = float, title:Yazi-STANDALONE +windowrulev2 = float, class:Bitwarden # windowrule v2 - size windowrulev2 = size 70% 70%, class:^(gnome-system-monitor|org.gnome.SystemMonitor|io.missioncenter.MissionCenter)$ @@ -97,6 +99,7 @@ windowrulev2 = size 60% 70%, title:^(hyprgui)$ windowrulev2 = size 240px 450px, class:^(libresplit)$ windowrulev2 = size 500px 1000px, class:^(io.ente.auth)$ windowrulev2 = size 60% 70%, title:Yazi-STANDALONE +windowrulev2 = size 40% 70%, class:Bitwarden # windowrule v2 - pinning windowrulev2 = pin,title:^(Picture-in-Picture)$ diff --git a/.config/terminal/.setuprc b/.config/terminal/.setuprc index 826351c..4448929 100644 --- a/.config/terminal/.setuprc +++ b/.config/terminal/.setuprc @@ -1,6 +1,12 @@ # If not running interactively, don't do anything [[ $- != *i* ]] && return +export PATH=$PATH:$HOME/.local/share/scripts + +# Adds wal colors +(cat ~/.cache/wal/sequences &) +source ~/.cache/wal/colors-tty.sh + export VISUAL='nvim' export EDITOR="$VISUAL" diff --git a/.config/waybar/ModulesCustom.json b/.config/waybar/ModulesCustom.json index e763dc1..3dab603 100644 --- a/.config/waybar/ModulesCustom.json +++ b/.config/waybar/ModulesCustom.json @@ -136,10 +136,10 @@ "custom/swaync": { "tooltip": true, "tooltip-format": "Left Click: Launch Notification Center\nRight Click: Do not Disturb", - "format": "{} {icon} ", + "format": "{icon} ", "format-icons": { "notification": "", - "none": "", + "none": "", "dnd-notification": "", "dnd-none": "", "inhibited-notification": "", diff --git a/.config/waybar/config b/.config/waybar/config index 2afed00..5ea1c59 100644 --- a/.config/waybar/config +++ b/.config/waybar/config @@ -26,9 +26,6 @@ ], "modules-center": [ - "custom/swaync", - "custom/cava_mviz", - "custom/separator#dot-line", "clock", "custom/separator#line", "hyprland/workspaces#rw", @@ -39,9 +36,9 @@ "group/laptop", "custom/separator#line", "tray", - "mpris", "group/audio#pulsecontrol", "custom/separator#dot-line", "group/status", + "custom/swaync", ], } diff --git a/.config/waybar/style.css b/.config/waybar/style.css index 1285537..dd74ea6 100644 --- a/.config/waybar/style.css +++ b/.config/waybar/style.css @@ -1,12 +1,7 @@ /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ /* Simple Style */ -@define-color background #1d2021; -@define-color foreground #ebdbb2; -@define-color dim #928374; -@define-color yellow #fabd2f; -@define-color red #fb4934; -@define-color green #b8bb26; +@import "../../.cache/wal/colors-waybar.css"; * { font-family: "JetBrainsMono Nerd Font"; @@ -66,8 +61,7 @@ window#waybar { #tray, #window, #wireplumber, -#workspaces, -#custom-backlight, +#workspaces, #custom-backlight, #custom-browser, #custom-cava_mviz, #custom-cycle_wall, @@ -168,7 +162,7 @@ window#waybar { #pulseaudio-slider highlight { min-height: 10px; border-radius: 5px; - background-color: @green; + background-color: @color3; } #backlight-slider slider { @@ -184,12 +178,19 @@ window#waybar { min-width: 80px; min-height: 10px; border-radius: 5px; - background-color: @dim; + background-color: @cursor; } #backlight-slider highlight { min-width: 10px; border-radius: 5px; - background-color: @green; + background-color: @color3; } +#custom-swaync { + min-width: 1px; + border-right: 1px solid @cursor; +} +#custom-swaync:hover { + background-color: @cursor; +} diff --git a/.config/yadm/bootstrap.d/20-Wal.sh b/.config/yadm/bootstrap.d/20-Wal.sh new file mode 100755 index 0000000..8aae567 --- /dev/null +++ b/.config/yadm/bootstrap.d/20-Wal.sh @@ -0,0 +1,5 @@ +#!/bin/env sh + +yay -S --needed python-pywal + +wal --theme base16-gruvbox-medium diff --git a/.config/yadm/bootstrap.d/21-SASSThemes.sh b/.config/yadm/bootstrap.d/21-SASSThemes.sh new file mode 100755 index 0000000..c2ceb13 --- /dev/null +++ b/.config/yadm/bootstrap.d/21-SASSThemes.sh @@ -0,0 +1,8 @@ +#!/bin/env sh + +yay -S --needed sass + +sass \ + $HOME/.config/swaync/style/style.scss:$HOME/.config/swaync/style.css + +swaync-client --reload-css diff --git a/.config/yadm/bootstrap.d/30-GeneralPrograms.sh b/.config/yadm/bootstrap.d/30-GeneralPrograms.sh index 9ea869a..5cec5f4 100755 --- a/.config/yadm/bootstrap.d/30-GeneralPrograms.sh +++ b/.config/yadm/bootstrap.d/30-GeneralPrograms.sh @@ -2,4 +2,5 @@ yay -S --needed zen-browser-bin \ okular \ - onlyoffice-bin + onlyoffice-bin \ + bitwarden diff --git a/.gitignore b/.gitignore index 4058311..001a7f8 100644 --- a/.gitignore +++ b/.gitignore @@ -21,6 +21,12 @@ !/.ssh/config !/.ssh/*.pub +!/.local/ +/.local/* +!/.local/share/ +/.local/share/ +!/.local/share/scripts/ + # DO NOT EDIT ANYTHING PAST HERE! # Scripts automatically add entries here .config/hypr/config/Monitors.conf diff --git a/.ssh/config b/.ssh/config index 106d14f..b19760d 100644 --- a/.ssh/config +++ b/.ssh/config @@ -18,3 +18,8 @@ Host github.com HostName github.com IdentityFile ~/.ssh/github.key User git + +Host pandorasboxserver + HostName 85.215.131.106 + IdentityFile ~/.ssh/pandorasboxserver.key + User fedde diff --git a/.ssh/pandorasboxserver.key.pub b/.ssh/pandorasboxserver.key.pub new file mode 100644 index 0000000..cd85f2f --- /dev/null +++ b/.ssh/pandorasboxserver.key.pub @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCtnWs7SRAPLDa+xYgextYlnd7tTA0S9CHzUNMStBF833RhQw3oiEAyhEcWM8kBwQEeOnL4hL1hCDSu/NMOTs6hFHUihhWFJsEyUjn6+E6Dez1kkST+9MsDD9vJYFJwLu4YIz9PuhGuHWKEpedCbZN7WtpwXx6maGw0il6icLhNQYzxO7Gd5vk1lZYL0Ko1MGjZEBuxiDnyWY9Mm1Qf0D10W/Bux5YJutx+FhdNFvQktGO9X+s29BfKgmvqnIG4vBKiX44kk88jdhOg43+Uy6tOYvb/Sza1OGVw+qG/+RLxWlcxzuYSYpUTyan7mRS8QUG7rRmxNWo4yaVSyVMPvD33go8pDvs1Vrz3RPX1YJzt0/SYokH6eGirF68zxwOKhOxJSwZT+Xo68ek5vSrthrDLOMbnnU2wDGFn7YzvHnXhJ1r3piv9GOpI5bqaPeiwc2lydfxlOOkqAFVPHNUGHTXwxaPxnzTrer4KnU4EDVpE618Fw0MpBqG7KWdPbiidC3E= michel@michel-b660mgamingxaxddr4