diff --git a/.bashrc b/.bashrc index a64f43c..14b024a 100644 --- a/.bashrc +++ b/.bashrc @@ -54,7 +54,7 @@ alias gcheck="git checkout" # SCRIPTS # ----------------------------------------------------- -alias w='~/dotfiles/scripts/updatewal.sh' +alias wallp='~/dotfiles/scripts/updatewal.sh' alias gr='python ~/dotfiles/scripts/growthrate.py' alias ChatGPT='python ~/mychatgpt/mychatgpt.py' alias chat='python ~/mychatgpt/mychatgpt.py' diff --git a/1-install.sh b/1-install.sh index 300947f..76b4eb0 100755 --- a/1-install.sh +++ b/1-install.sh @@ -114,6 +114,7 @@ packagesYay=( "pfetch" "bibata-cursor-theme" "trizen" + "kora-icon-theme" ); # ------------------------------------------------------ diff --git a/2-install-hyprland.sh b/2-install-hyprland.sh index f343c00..974cc4a 100755 --- a/2-install-hyprland.sh +++ b/2-install-hyprland.sh @@ -48,11 +48,13 @@ echo "" echo "-> Install main packages" packagesPacman=( "hyprland" - "xdg-desktop-portal-hyprland" + "xdg-desktop-portal-wlr" "waybar" "grim" "slurp" "swayidle" + "swappy" + "cliphist" ); packagesYay=( diff --git a/3-dotfiles.sh b/3-dotfiles.sh index 54df80d..9bbbc6a 100755 --- a/3-dotfiles.sh +++ b/3-dotfiles.sh @@ -110,6 +110,7 @@ _installSymLink hypr ~/.config/hypr ~/dotfiles/hypr/ ~/.config _installSymLink waybar ~/.config/waybar ~/dotfiles/waybar/ ~/.config _installSymLink swaylock ~/.config/swaylock ~/dotfiles/swaylock/ ~/.config _installSymLink wlogout ~/.config/wlogout ~/dotfiles/wlogout/ ~/.config +_installSymLink swappy ~/.config/swappy ~/dotfiles/swappy/ ~/.config # ------------------------------------------------------ # DONE diff --git a/CHANGELOG b/CHANGELOG index 379630f..c9debc9 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,17 @@ +Version 2.3 +https://gitlab.com/stephan-raabe/dotfiles/-/releases/2.3 +-------------------------------------------------------- +- Add clipboard manager cliphist +- Waybar: Add numbers to workspaces +- Waybar: Add icon for wallpaper selection +- Waybar: Add cliphist icon (click = open, right-click = delete item, middle-click = clear data) +- Screenshots: Add swappy +- Icons: Changed to Kora Icon Theme +- Rofi: New Layout featuring current wallpaper as a background for launcher, cliphist and wallpaper selection +- Update Wallpaper: Add random transition effects +- Hyprland: Exclude configurations files into dedicated files in hypr/conf/ directory +- Hyprland: New window animations (in hypr/conf/) + Version 2.2 https://gitlab.com/stephan-raabe/dotfiles/-/releases/2.2 -------------------------------------------------------- diff --git a/README.md b/README.md index 4a6b01f..ff805d2 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,6 @@ # ML4W dotfiles -This is the configuration of my Arch linux based installation. -I'm using the Hyprland (Wayland) and Qtile (Xorg). +This is the configuration of my Arch linux based installation for Hyprland (Wayland) and Qtile (Xorg). ## Common Packages @@ -12,16 +11,19 @@ I'm using the Hyprland (Wayland) and Qtile (Xorg). - Menus: Rofi - Colorscheme: pywal (dynamic) - Browsers: brave, chromium -- Filemanager: ranger, Thunar +- Filemanager: Neutilus, ranger, Thunar - Cursor: Bibata Modern Classic -- Icons: breeze-dark +- Icons: Kora-Icon-Theme - Theme: Breeze-dark - Virtual Machine: qemu (Windows 11 with looking glass and xrdp) ## Hyprland - Status Bar: waybar -- Screenshots: grim +- Screenshots: grim & slurp +- Clipboard Manager: cliphist +- Logout: wlogout +- Screenlock: swaylock-effects ## Qtile @@ -31,11 +33,16 @@ I'm using the Hyprland (Wayland) and Qtile (Xorg). ## Templating -Included is a pywal configuration that changes the color scheme based on a randomly selected wallpaper. Just type w in a terminal (or SuperKey + Shift + w). SuperKey + Ctrl + w opens rofi with a list of installed wallpapers for individual selection. See also the .bashrc for more alias definitions. +Included is a pywal configuration that changes the color scheme based on a randomly selected wallpaper. With the key binding SuperKey + Shift + w you can change the wallpaper. SuperKey + Ctrl + w opens rofi with a list of installed wallpapers for your individual selection. See also the .bashrc and the key bindings on Hyprland and Qtile for more alias definitions. ## Screenshots & Video -Click to watch on YouTube +Click to watch on YouTube + +Click to watch on YouTube + +Click to watch on YouTube + Watch on YouTube You can find more screenshots here. @@ -44,10 +51,17 @@ Included is a pywal configuration that changes the color scheme based on a rando To make it easy for you to get started with my dotfiles, here's a list of recommended next steps. +PLEASE BACKUP YOUR EXISTING .config WITH YOUR DOTFILES BEFORE STARTING THE SCRIPTS. + ``` +# Make sure that you're in your home directory +cd + # Clone the repository from your home directory git clone https://gitlab.com/stephan-raabe/dotfiles.git +# Or download the lastest version and unzip into ~/dotfiles folder + # Change into the new dotfiles folder cd dotfiles @@ -63,5 +77,5 @@ cd dotfiles ./3-install-dotfiles.sh ``` - +Please note that every Arch Linux system is different and I cannot guarantee that everything works fine on your system. diff --git a/gtk/.gtkrc-2.0 b/gtk/.gtkrc-2.0 index d998e26..002f663 100644 --- a/gtk/.gtkrc-2.0 +++ b/gtk/.gtkrc-2.0 @@ -1,9 +1,5 @@ -# DO NOT EDIT! This file will be overwritten by LXAppearance. -# Any customization should be done in ~/.gtkrc-2.0.mine instead. - -include "/home/raabe/.gtkrc-2.0.mine" gtk-theme-name="Breeze-Dark" -gtk-icon-theme-name="breeze-dark" +gtk-icon-theme-name="kora" gtk-font-name="Cantarell 11" gtk-cursor-theme-name="Bibata-Modern-Classic" gtk-cursor-theme-size=0 diff --git a/gtk/gtk-3.0/settings.ini b/gtk/gtk-3.0/settings.ini index 2df19ae..31f643d 100644 --- a/gtk/gtk-3.0/settings.ini +++ b/gtk/gtk-3.0/settings.ini @@ -1,6 +1,6 @@ [Settings] -gtk-theme-name=Breeze-Dark -gtk-icon-theme-name=breeze-dark +gtk-theme-name="Breeze-Dark" +gtk-icon-theme-name="kora" gtk-font-name=Cantarell 11 gtk-cursor-theme-name="Bibata-Modern-Classic" gtk-cursor-theme-size=0 diff --git a/hypr/conf/animations1.conf b/hypr/conf/animations1.conf new file mode 100644 index 0000000..c49406f --- /dev/null +++ b/hypr/conf/animations1.conf @@ -0,0 +1,18 @@ +# ----------------------------------------------------- +# Animations +# ----------------------------------------------------- +animations { + enabled = true + bezier = wind, 0.05, 0.9, 0.1, 1.05 + bezier = winIn, 0.1, 1.1, 0.1, 1.1 + bezier = winOut, 0.3, -0.3, 0, 1 + bezier = liner, 1, 1, 1, 1 + animation = windows, 1, 6, wind, slide + animation = windowsIn, 1, 6, winIn, slide + animation = windowsOut, 1, 5, winOut, slide + animation = windowsMove, 1, 5, wind, slide + animation = border, 1, 1, liner + animation = borderangle, 1, 30, liner, loop + animation = fade, 1, 10, default + animation = workspaces, 1, 5, wind +} diff --git a/hypr/conf/animations2.conf b/hypr/conf/animations2.conf new file mode 100644 index 0000000..61e9d2f --- /dev/null +++ b/hypr/conf/animations2.conf @@ -0,0 +1,13 @@ +# ----------------------------------------------------- +# Animations +# ----------------------------------------------------- +animations { + enabled = true + bezier = myBezier, 0.05, 0.9, 0.1, 1.05 + animation = windows, 1, 7, myBezier + animation = windowsOut, 1, 7, default, popin 80% + animation = border, 1, 10, default + animation = borderangle, 1, 8, default + animation = fade, 1, 7, default + animation = workspaces, 1, 6, default +} diff --git a/hypr/conf/autostart.conf b/hypr/conf/autostart.conf new file mode 100644 index 0000000..9f3ef40 --- /dev/null +++ b/hypr/conf/autostart.conf @@ -0,0 +1,14 @@ +# ----------------------------------------------------- +# Autostart +# ----------------------------------------------------- + +exec-once = swww init +# exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP +# exec-once = systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP +exec-once = dunst +exec-once = ~/dotfiles/scripts/lockscreentime.sh +exec-once = ~/dotfiles/scripts/updatewal-swww.sh +exec-once = ~/dotfiles/hypr/gtk.sh +exec-once = hyprctl setcursor Bibata-Modern-Classic 24 +exec-once = ~/dotfiles/waybar/launch.sh +exec-once = wl-paste --watch cliphist store diff --git a/hypr/conf/decoration.conf b/hypr/conf/decoration.conf new file mode 100644 index 0000000..0c219a4 --- /dev/null +++ b/hypr/conf/decoration.conf @@ -0,0 +1,24 @@ +# ----------------------------------------------------- +# General window decoration +# ----------------------------------------------------- + +decoration { + rounding = 10 + blur { + enabled = true + size = 6 + passes = 2 + new_optimizations = on + ignore_opacity = true + xray = true + # blurls = waybar + } + active_opacity = 1.0 + inactive_opacity = 0.8 + fullscreen_opacity = 1.0 + + drop_shadow = true + shadow_range = 30 + shadow_render_power = 3 + col.shadow = 0x66000000 +} diff --git a/hypr/conf/environment.conf b/hypr/conf/environment.conf new file mode 100644 index 0000000..9109f47 --- /dev/null +++ b/hypr/conf/environment.conf @@ -0,0 +1,7 @@ +# ----------------------------------------------------- +# Environment Variables +# ----------------------------------------------------- + +env = WLR_NO_HARDWARE_CURSORS, 1 +env = WLR_RENDERER_ALLOW_SOFTWARE, 1 +env = XCURSOR_SIZE,24 diff --git a/hypr/conf/keybindings.conf b/hypr/conf/keybindings.conf new file mode 100644 index 0000000..8053da5 --- /dev/null +++ b/hypr/conf/keybindings.conf @@ -0,0 +1,70 @@ +# ----------------------------------------------------- +# Key bindings +# ----------------------------------------------------- + +$mainMod = SUPER + +bind = $mainMod, RETURN, exec, alacritty +bind = $mainMod, Q, killactive +bind = $mainMod, F, fullscreen +bind = $mainMod, E, exec, dolphin +bind = $mainMod, T, togglefloating +bind = $mainMod, B, exec, brave +bind = $mainMod, J, togglesplit +bind = $mainMod, left, movefocus, l +bind = $mainMod, right, movefocus, r +bind = $mainMod, up, movefocus, u +bind = $mainMod, down, movefocus, d + +bind = $mainMod, PRINT, exec, ~/dotfiles/scripts/grim.sh +bind = $mainMod CTRL, Q, exec, wlogout +bind = $mainMod SHIFT, W, exec, ~/dotfiles/scripts/updatewal-swww.sh +bind = $mainMod CTRL, W, exec, ~/dotfiles/scripts/wallpaper-swww.sh +bind = $mainMod CTRL, RETURN, exec, ~/dotfiles/scripts/applauncher.sh +bind = $mainMod SHIFT, B, exec, ~/dotfiles/waybar/launch.sh +bind = $mainMod CTRL, F, exec, ~/dotfiles/scripts/filemanager.sh +bind = $mainMod CTRL, C, exec, ~/dotfiles/scripts/cliphist.sh + +bind = $mainMod, 1, workspace, 1 +bind = $mainMod, 2, workspace, 2 +bind = $mainMod, 3, workspace, 3 +bind = $mainMod, 4, workspace, 4 +bind = $mainMod, 5, workspace, 5 +bind = $mainMod, 6, workspace, 6 +bind = $mainMod, 7, workspace, 7 +bind = $mainMod, 8, workspace, 8 +bind = $mainMod, 9, workspace, 9 +bind = $mainMod, 0, workspace, 10 + +bind = $mainMod SHIFT, 1, movetoworkspace, 1 +bind = $mainMod SHIFT, 2, movetoworkspace, 2 +bind = $mainMod SHIFT, 3, movetoworkspace, 3 +bind = $mainMod SHIFT, 4, movetoworkspace, 4 +bind = $mainMod SHIFT, 5, movetoworkspace, 5 +bind = $mainMod SHIFT, 6, movetoworkspace, 6 +bind = $mainMod SHIFT, 7, movetoworkspace, 7 +bind = $mainMod SHIFT, 8, movetoworkspace, 8 +bind = $mainMod SHIFT, 9, movetoworkspace, 9 +bind = $mainMod SHIFT, 0, movetoworkspace, 10 + +bind = $mainMod, mouse_down, workspace, e+1 +bind = $mainMod, mouse_up, workspace, e-1 + +bindm = $mainMod, mouse:272, movewindow +bindm = $mainMod, mouse:273, resizewindow + +bind = $mainMod SHIFT, right, resizeactive, 100 0 +bind = $mainMod SHIFT, left, resizeactive, -100 0 +bind = $mainMod SHIFT, up, resizeactive, 0 -100 +bind = $mainMod SHIFT, down, resizeactive, 0 100 + +binde = , XF86MonBrightnessUp, exec, brightnessctl set 100% +binde = , XF86MonBrightnessDown, exec, brightnessctl set 70% + +# ----------------------------------------------------- +# Passthrough SUPER KEY to Virtual Machine +# ----------------------------------------------------- +bind = $mainMod, P, submap, passthru +submap = passthru +bind = SUPER, Escape, submap, reset +submap = reset diff --git a/hypr/conf/keyboard.conf b/hypr/conf/keyboard.conf new file mode 100644 index 0000000..7d23688 --- /dev/null +++ b/hypr/conf/keyboard.conf @@ -0,0 +1,16 @@ +# ----------------------------------------------------- +# Keyboard layout and mouse +# ----------------------------------------------------- + +input { + kb_layout = $keyboardlayout + kb_variant = + kb_model = + kb_options = + kb_rules = + follow_mouse = 1 + touchpad { + natural_scroll = false + } + sensitivity = 0 # -1.0 - 1.0, 0 means no modification. +} diff --git a/hypr/conf/layouts.conf b/hypr/conf/layouts.conf new file mode 100644 index 0000000..0ebf764 --- /dev/null +++ b/hypr/conf/layouts.conf @@ -0,0 +1,20 @@ +# ----------------------------------------------------- +# Layouts +# ----------------------------------------------------- + +dwindle { + pseudotile = true + preserve_split = true +} + +master { + new_is_master = true +} + +gestures { + workspace_swipe = false +} + +device:epic-mouse-v1 { + sensitivity = -0.5 +} diff --git a/hypr/conf/misc.conf b/hypr/conf/misc.conf new file mode 100644 index 0000000..50b28d5 --- /dev/null +++ b/hypr/conf/misc.conf @@ -0,0 +1,8 @@ +# ----------------------------------------------------- +# Misc settings +# ----------------------------------------------------- + +misc { + disable_hyprland_logo = true + disable_splash_rendering = true +} diff --git a/hypr/conf/window.conf b/hypr/conf/window.conf new file mode 100644 index 0000000..084cd09 --- /dev/null +++ b/hypr/conf/window.conf @@ -0,0 +1,12 @@ +# ----------------------------------------------------- +# General window layout and colors +# ----------------------------------------------------- + +general { + gaps_in = 10 + gaps_out = 14 + border_size = 3 + col.active_border = $color11 + col.inactive_border = rgba(ffffffff) + layout = dwindle +} diff --git a/hypr/conf/windowrules.conf b/hypr/conf/windowrules.conf new file mode 100644 index 0000000..c576abf --- /dev/null +++ b/hypr/conf/windowrules.conf @@ -0,0 +1,8 @@ +# ----------------------------------------------------- +# Window rules +# ----------------------------------------------------- + +windowrule = tile,^(Brave-browser)$ +windowrule = tile,^(Chromium)$ +windowrule = float,^(pavucontrol)$ +windowrule = float,^(blueman-manager)$ diff --git a/hypr/gtk.sh b/hypr/gtk.sh index 735fcc1..372ab62 100755 --- a/hypr/gtk.sh +++ b/hypr/gtk.sh @@ -1,18 +1,10 @@ #!/bin/sh -# usage: import-gsettings -config="${XDG_CONFIG_HOME:-$HOME/.config}/gtk-3.0/settings.ini" -if [ ! -f "$config" ]; then exit 1; fi - gnome_schema="org.gnome.desktop.interface" -gtk_theme="$(grep 'gtk-theme-name' "$config" | sed 's/.*\s*=\s*//')" -icon_theme="$(grep 'gtk-icon-theme-name' "$config" | sed 's/.*\s*=\s*//')" -cursor_theme="$(grep 'gtk-cursor-theme-name' "$config" | sed 's/.*\s*=\s*//')" -font_name="$(grep 'gtk-font-name' "$config" | sed 's/.*\s*=\s*//')" -gsettings set "$gnome_schema" gtk-theme "$gtk_theme" -gsettings set "$gnome_schema" icon-theme "$icon_theme" -gsettings set "$gnome_schema" cursor-theme "$cursor_theme" -gsettings set "$gnome_schema" font-name "$font_name" +gsettings set "$gnome_schema" gtk-theme "Breeze-Dark" +gsettings set "$gnome_schema" icon-theme "kora" +gsettings set "$gnome_schema" cursor-theme "Bibata-Modern-Classic" +gsettings set "$gnome_schema" font-name "Cantarell 11" gsettings set org.gnome.desktop.interface color-scheme prefer-dark diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index d5e4e93..238836d 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -9,30 +9,24 @@ # ----------------------------------------------------- # ----------------------------------------------------- -# Environment Variables +# Keyboard Layout # ----------------------------------------------------- -env = WLR_NO_HARDWARE_CURSORS, 1 -env = WLR_RENDERER_ALLOW_SOFTWARE, 1 +$keyboardlayout=de +# $keyboardlayout = us # ----------------------------------------------------- # Monitor Setup # See https://wiki.hyprland.org/Configuring/Monitors/ # ----------------------------------------------------- -# monitor=,2560x1440@120,auto,1 monitor=,preferred,auto,1 -# monitor=,1920x1080,auto,1 +# monitor=,2560x1440@120,auto,1 +# monitor=,1920x1080@120,auto,1 # ----------------------------------------------------- -# Autostart +# Autostart & Environment # ----------------------------------------------------- -exec-once = swww init -exec-once = dunst -exec-once = ~/dotfiles/scripts/lockscreentime.sh -exec-once = ~/dotfiles/scripts/updatewal-swww.sh -exec-once = ~/dotfiles/hypr/gtk.sh -exec-once = ~/dotfiles/waybar/launch.sh -exec-once = hyprctl setcursor Bibata-Modern-Classic 24 -exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP +source = ~/dotfiles/hypr/conf/environment.conf +source = ~/dotfiles/hypr/conf/autostart.conf # ----------------------------------------------------- # Load pywal color file @@ -40,176 +34,13 @@ exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CUR source = ~/.cache/wal/colors-hyprland.conf # ----------------------------------------------------- -# Env vars +# Load configuration files # ----------------------------------------------------- -env = XCURSOR_SIZE,24 - -# ----------------------------------------------------- -# Keyboard layout and mouse -# ----------------------------------------------------- -input { - kb_layout = us - kb_variant = - kb_model = - kb_options = - kb_rules = - follow_mouse = 1 - touchpad { - natural_scroll = false - } - sensitivity = 0 # -1.0 - 1.0, 0 means no modification. -} - -# ----------------------------------------------------- -# General window layout and colors -# ----------------------------------------------------- -general { - gaps_in = 10 - gaps_out = 14 - border_size = 3 - col.active_border = $color11 - col.inactive_border = rgba(ffffffff) - layout = dwindle -} - -# ----------------------------------------------------- -# General window decoration -# ----------------------------------------------------- -decoration { - rounding = 10 - blur { - enabled = true - size = 6 - passes = 2 - new_optimizations = on - ignore_opacity = true - xray = true - # blurls = waybar - } - active_opacity = 1.0 - inactive_opacity = 0.8 - fullscreen_opacity = 1.0 - - drop_shadow = true - shadow_range = 30 - shadow_render_power = 3 - col.shadow = 0x66000000 -} - -# ----------------------------------------------------- -# Animations -# ----------------------------------------------------- -animations { - enabled = true - bezier = myBezier, 0.05, 0.9, 0.1, 1.05 - animation = windows, 1, 7, myBezier - animation = windowsOut, 1, 7, default, popin 80% - animation = border, 1, 10, default - animation = borderangle, 1, 8, default - animation = fade, 1, 7, default - animation = workspaces, 1, 6, default -} - -# ----------------------------------------------------- -# Layouts -# ----------------------------------------------------- -dwindle { - pseudotile = true - preserve_split = true -} - -master { - new_is_master = true -} - -gestures { - workspace_swipe = false -} - -device:epic-mouse-v1 { - sensitivity = -0.5 -} - -# ----------------------------------------------------- -# Window rules -# ----------------------------------------------------- -windowrule = tile,^(Brave-browser)$ -windowrule = tile,^(Chromium)$ -windowrule = float,^(pavucontrol)$ -windowrule = float,^(blueman-manager)$ - - -# ----------------------------------------------------- -# Key bindings -# ----------------------------------------------------- -$mainMod = SUPER - -bind = $mainMod, RETURN, exec, alacritty -bind = $mainMod, Q, killactive -bind = $mainMod, F, fullscreen -bind = $mainMod, E, exec, dolphin -bind = $mainMod, T, togglefloating -bind = $mainMod, B, exec, brave -bind = $mainMod, J, togglesplit -bind = $mainMod, left, movefocus, l -bind = $mainMod, right, movefocus, r -bind = $mainMod, up, movefocus, u -bind = $mainMod, down, movefocus, d - -bind = $mainMod, PRINT, exec, ~/dotfiles/scripts/grim.sh -bind = $mainMod CTRL, Q, exec, wlogout -bind = $mainMod SHIFT, W, exec, ~/dotfiles/scripts/updatewal-swww.sh -bind = $mainMod CTRL, W, exec, ~/dotfiles/scripts/wallpaper-swww.sh -bind = $mainMod CTRL, RETURN, exec, ~/dotfiles/scripts/applauncher.sh -bind = $mainMod SHIFT, B, exec, ~/dotfiles/waybar/launch.sh -bind = $mainMod CTRL, F, exec, ~/dotfiles/scripts/filemanager.sh - -bind = $mainMod, 1, workspace, 1 -bind = $mainMod, 2, workspace, 2 -bind = $mainMod, 3, workspace, 3 -bind = $mainMod, 4, workspace, 4 -bind = $mainMod, 5, workspace, 5 -bind = $mainMod, 6, workspace, 6 -bind = $mainMod, 7, workspace, 7 -bind = $mainMod, 8, workspace, 8 -bind = $mainMod, 9, workspace, 9 -bind = $mainMod, 0, workspace, 10 - -bind = $mainMod SHIFT, 1, movetoworkspace, 1 -bind = $mainMod SHIFT, 2, movetoworkspace, 2 -bind = $mainMod SHIFT, 3, movetoworkspace, 3 -bind = $mainMod SHIFT, 4, movetoworkspace, 4 -bind = $mainMod SHIFT, 5, movetoworkspace, 5 -bind = $mainMod SHIFT, 6, movetoworkspace, 6 -bind = $mainMod SHIFT, 7, movetoworkspace, 7 -bind = $mainMod SHIFT, 8, movetoworkspace, 8 -bind = $mainMod SHIFT, 9, movetoworkspace, 9 -bind = $mainMod SHIFT, 0, movetoworkspace, 10 - -bind = $mainMod, mouse_down, workspace, e+1 -bind = $mainMod, mouse_up, workspace, e-1 - -bindm = $mainMod, mouse:272, movewindow -bindm = $mainMod, mouse:273, resizewindow - -bind = $mainMod SHIFT, right, resizeactive, 100 0 -bind = $mainMod SHIFT, left, resizeactive, -100 0 -bind = $mainMod SHIFT, up, resizeactive, 0 -100 -bind = $mainMod SHIFT, down, resizeactive, 0 100 - -# ----------------------------------------------------- -# Passthrough SUPER KEY to Virtual Machine -# ----------------------------------------------------- -bind = $mainMod, P, submap, passthru -submap = passthru -bind = SUPER, Escape, submap, reset -submap = reset - -# ----------------------------------------------------- -# Misc settings -# ----------------------------------------------------- -misc { - disable_hyprland_logo = true - disable_splash_rendering = true -} - +source = ~/dotfiles/hypr/conf/keyboard.conf +source = ~/dotfiles/hypr/conf/window.conf +source = ~/dotfiles/hypr/conf/decoration.conf +source = ~/dotfiles/hypr/conf/layouts.conf +source = ~/dotfiles/hypr/conf/misc.conf +source = ~/dotfiles/hypr/conf/keybindings.conf +source = ~/dotfiles/hypr/conf/windowrules.conf +source = ~/dotfiles/hypr/conf/animations1.conf diff --git a/qtile/config.py b/qtile/config.py index 703f0fe..dcacd02 100644 --- a/qtile/config.py +++ b/qtile/config.py @@ -177,8 +177,8 @@ ColorI=(colordict['colors']['color9']) layout_theme = { "border_width": 3, "margin": 15, - "border_focus": "FFFFFF", - "border_normal": ColorC, + "border_focus": ColorC, + "border_normal": "FFFFFF", "single_border_width": 3 } diff --git a/rofi/config-cliphist.rasi b/rofi/config-cliphist.rasi new file mode 100644 index 0000000..17e2b85 --- /dev/null +++ b/rofi/config-cliphist.rasi @@ -0,0 +1,252 @@ +/* +# ____ __ _ +# | _ \ ___ / _(_) +# | |_) / _ \| |_| | +# | _ < (_) | _| | +# |_| \_\___/|_| |_| +# +# by Stephan Raabe (2023) +# ----------------------------------------------------- +*/ + +/* ---- Configuration ---- */ +configuration { + modi: "drun,run"; + font: "Fira Sans Bold 10"; + show-icons: false; + icon-theme: "kora"; + display-drun: "APPS"; + display-run: "RUN"; + display-filebrowser: "FILES"; + display-window: "WINDOW"; + hover-select: true; + me-select-entry: ""; + me-accept-entry: "MousePrimary"; + drun-display-format: "{name}"; + window-format: "{w} · {c} · {t}"; + +} + +/* ---- Load pywal colors (custom wal template) ---- */ +@import "~/.cache/wal/colors-rofi-pywal" + +/* ---- Window ---- */ +window { + width: 400px; + x-offset: -15px; + y-offset: 62px; + spacing: 0px; + padding: 0px; + margin: 0px; + color: #FFFFFF; + border: 3px; + border-color: #FFFFFF; + cursor: "default"; + transparency: "real"; + location: northeast; + anchor: northeast; + fullscreen: false; + enabled: true; + border-radius: 10px; + background-color: transparent; +} + +/* ---- Mainbox ---- */ +mainbox { + enabled: true; + orientation: horizontal; + spacing: 0px; + margin: 0px; + background-color: @background; + background-image: url("~/.cache/current_wallpaper.jpg", height); + children: ["listbox"]; +} + +/* ---- Imagebox ---- */ +imagebox { + padding: 18px; + background-color: transparent; + orientation: vertical; + children: [ "inputbar", "dummy", "mode-switcher" ]; +} + +/* ---- Listbox ---- */ +listbox { + spacing: 20px; + background-color: transparent; + orientation: vertical; + children: [ "inputbar", "message", "listview" ]; +} + +/* ---- Dummy ---- */ +dummy { + background-color: transparent; +} + +/* ---- Inputbar ---- */ +inputbar { + enabled: true; + text-color: @foreground; + spacing: 10px; + padding: 15px; + border-radius: 0px; + border-color: @foreground; + background-color: @background; + children: [ "textbox-prompt-colon", "entry" ]; +} + +textbox-prompt-colon { + enabled: true; + expand: false; + str: ""; + background-color: transparent; + text-color: inherit; +} + +entry { + enabled: true; + background-color: transparent; + text-color: inherit; + cursor: text; + placeholder: "Search"; + placeholder-color: inherit; +} + +/* ---- Mode Switcher ---- */ +mode-switcher{ + enabled: true; + spacing: 20px; + background-color: transparent; + text-color: @foreground; +} + +button { + padding: 10px; + border-radius: 10px; + background-color: @background; + text-color: inherit; + cursor: pointer; + border: 0px; +} + +button selected { + background-color: @color11; + text-color: @foreground; +} + +/* ---- Listview ---- */ +listview { + enabled: true; + columns: 1; + lines: 8; + cycle: true; + dynamic: true; + scrollbar: false; + layout: vertical; + reverse: false; + fixed-height: true; + fixed-columns: true; + spacing: 0px; + padding: 10px; + margin: 0px; + background-color: @background; + border:0px; +} + +/* ---- Element ---- */ +element { + enabled: true; + padding: 10px; + margin: 5px; + cursor: pointer; + background-color: @background; + border-radius: 10px; + border: 2px; +} + +element normal.normal { + background-color: inherit; + text-color: @foreground; +} + +element normal.urgent { + background-color: inherit; + text-color: @foreground; +} + +element normal.active { + background-color: inherit; + text-color: @foreground; +} + +element selected.normal { + background-color: @color11; + text-color: @foreground; +} + +element selected.urgent { + background-color: inherit; + text-color: @foreground; +} + +element selected.active { + background-color: inherit; + text-color: @foreground; +} + +element alternate.normal { + background-color: inherit; + text-color: @foreground; +} + +element alternate.urgent { + background-color: inherit; + text-color: @foreground; +} + +element alternate.active { + background-color: inherit; + text-color: @foreground; +} + +element-icon { + background-color: transparent; + text-color: inherit; + size: 32px; + cursor: inherit; +} + +element-text { + background-color: transparent; + text-color: inherit; + cursor: inherit; + vertical-align: 0.5; + horizontal-align: 0.0; +} + +/*****----- Message -----*****/ +message { + background-color: transparent; + border:0px; + margin:20px 0px 0px 0px; + padding:0px; + spacing:0px; + border-radius: 10px; +} + +textbox { + padding: 15px; + margin: 0px; + border-radius: 0px; + background-color: @background; + text-color: @foreground; + vertical-align: 0.5; + horizontal-align: 0.0; +} + +error-message { + padding: 15px; + border-radius: 20px; + background-color: @background; + text-color: @foreground; +} diff --git a/rofi/config-power.rasi b/rofi/config-power.rasi new file mode 100644 index 0000000..258a8c9 --- /dev/null +++ b/rofi/config-power.rasi @@ -0,0 +1,252 @@ +/* +# ____ __ _ +# | _ \ ___ / _(_) +# | |_) / _ \| |_| | +# | _ < (_) | _| | +# |_| \_\___/|_| |_| +# +# by Stephan Raabe (2023) +# ----------------------------------------------------- +*/ + +/* ---- Configuration ---- */ +configuration { + modi: "drun,run"; + font: "Fira Sans Bold 10"; + show-icons: false; + icon-theme: "kora"; + display-drun: "APPS"; + display-run: "RUN"; + display-filebrowser: "FILES"; + display-window: "WINDOW"; + hover-select: true; + me-select-entry: ""; + me-accept-entry: "MousePrimary"; + drun-display-format: "{name}"; + window-format: "{w} · {c} · {t}"; + +} + +/* ---- Load pywal colors (custom wal template) ---- */ +@import "~/.cache/wal/colors-rofi-pywal" + +/* ---- Window ---- */ +window { + width: 400px; + x-offset: -15px; + y-offset: 62px; + spacing: 0px; + padding: 0px; + margin: 0px; + color: #FFFFFF; + border: 3px; + border-color: #FFFFFF; + cursor: "default"; + transparency: "real"; + location: northeast; + anchor: northeast; + fullscreen: false; + enabled: true; + border-radius: 10px; + background-color: transparent; +} + +/* ---- Mainbox ---- */ +mainbox { + enabled: true; + orientation: horizontal; + spacing: 0px; + margin: 0px; + background-color: @background; + background-image: url("~/.cache/current_wallpaper.jpg", height); + children: ["listbox"]; +} + +/* ---- Imagebox ---- */ +imagebox { + padding: 18px; + background-color: transparent; + orientation: vertical; + children: [ "inputbar", "dummy", "mode-switcher" ]; +} + +/* ---- Listbox ---- */ +listbox { + spacing: 20px; + background-color: transparent; + orientation: vertical; + children: [ "listview" ]; +} + +/* ---- Dummy ---- */ +dummy { + background-color: transparent; +} + +/* ---- Inputbar ---- */ +inputbar { + enabled: true; + text-color: @foreground; + spacing: 10px; + padding: 15px; + border-radius: 0px; + border-color: @foreground; + background-color: @background; + children: [ "textbox-prompt-colon", "entry" ]; +} + +textbox-prompt-colon { + enabled: true; + expand: false; + str: ""; + background-color: transparent; + text-color: inherit; +} + +entry { + enabled: true; + background-color: transparent; + text-color: inherit; + cursor: text; + placeholder: "Search"; + placeholder-color: inherit; +} + +/* ---- Mode Switcher ---- */ +mode-switcher{ + enabled: true; + spacing: 20px; + background-color: transparent; + text-color: @foreground; +} + +button { + padding: 10px; + border-radius: 10px; + background-color: @background; + text-color: inherit; + cursor: pointer; + border: 0px; +} + +button selected { + background-color: @color11; + text-color: @foreground; +} + +/* ---- Listview ---- */ +listview { + enabled: true; + columns: 1; + lines: 2; + cycle: true; + dynamic: true; + scrollbar: false; + layout: vertical; + reverse: false; + fixed-height: true; + fixed-columns: true; + spacing: 0px; + padding: 10px; + margin: 0px; + background-color: @background; + border:0px; +} + +/* ---- Element ---- */ +element { + enabled: true; + padding: 10px; + margin: 5px; + cursor: pointer; + background-color: @background; + border-radius: 10px; + border: 2px; +} + +element normal.normal { + background-color: inherit; + text-color: @foreground; +} + +element normal.urgent { + background-color: inherit; + text-color: @foreground; +} + +element normal.active { + background-color: inherit; + text-color: @foreground; +} + +element selected.normal { + background-color: @color11; + text-color: @foreground; +} + +element selected.urgent { + background-color: inherit; + text-color: @foreground; +} + +element selected.active { + background-color: inherit; + text-color: @foreground; +} + +element alternate.normal { + background-color: inherit; + text-color: @foreground; +} + +element alternate.urgent { + background-color: inherit; + text-color: @foreground; +} + +element alternate.active { + background-color: inherit; + text-color: @foreground; +} + +element-icon { + background-color: transparent; + text-color: inherit; + size: 32px; + cursor: inherit; +} + +element-text { + background-color: transparent; + text-color: inherit; + cursor: inherit; + vertical-align: 0.5; + horizontal-align: 0.0; +} + +/*****----- Message -----*****/ +message { + background-color: transparent; + border:0px; + margin:20px 0px 0px 0px; + padding:0px; + spacing:0px; + border-radius: 10px; +} + +textbox { + padding: 15px; + margin: 0px; + border-radius: 0px; + background-color: @background; + text-color: @foreground; + vertical-align: 0.5; + horizontal-align: 0.0; +} + +error-message { + padding: 15px; + border-radius: 20px; + background-color: @background; + text-color: @foreground; +} diff --git a/rofi/config-screenshot.rasi b/rofi/config-screenshot.rasi new file mode 100644 index 0000000..de72c20 --- /dev/null +++ b/rofi/config-screenshot.rasi @@ -0,0 +1,253 @@ +/* +# ____ __ _ +# | _ \ ___ / _(_) +# | |_) / _ \| |_| | +# | _ < (_) | _| | +# |_| \_\___/|_| |_| +# +# by Stephan Raabe (2023) +# ----------------------------------------------------- +*/ + +/* ---- Configuration ---- */ +configuration { + modi: "drun,run"; + font: "Fira Sans Bold 10"; + show-icons: false; + icon-theme: "kora"; + display-drun: "APPS"; + display-run: "RUN"; + display-filebrowser: "FILES"; + display-window: "WINDOW"; + hover-select: true; + me-select-entry: ""; + me-accept-entry: "MousePrimary"; + drun-display-format: "{name}"; + window-format: "{w} · {c} · {t}"; + +} + +/* ---- Load pywal colors (custom wal template) ---- */ +@import "~/.cache/wal/colors-rofi-pywal" + +/* ---- Window ---- */ +window { + width: 400px; + height: 130px; + x-offset: -15px; + y-offset: 62px; + spacing: 0px; + padding: 0px; + margin: 0px; + color: #FFFFFF; + border: 3px; + border-color: #FFFFFF; + cursor: "default"; + transparency: "real"; + location: northeast; + anchor: northeast; + fullscreen: false; + enabled: true; + border-radius: 10px; + background-color: transparent; +} + +/* ---- Mainbox ---- */ +mainbox { + enabled: true; + orientation: horizontal; + spacing: 0px; + margin: 0px; + background-color: @background; + background-image: url("~/.cache/current_wallpaper.jpg", height); + children: ["listbox"]; +} + +/* ---- Imagebox ---- */ +imagebox { + padding: 18px; + background-color: transparent; + orientation: vertical; + children: [ "inputbar", "dummy", "mode-switcher" ]; +} + +/* ---- Listbox ---- */ +listbox { + spacing: 20px; + background-color: transparent; + orientation: vertical; + children: [ "listview" ]; +} + +/* ---- Dummy ---- */ +dummy { + background-color: transparent; +} + +/* ---- Inputbar ---- */ +inputbar { + enabled: true; + text-color: @foreground; + spacing: 10px; + padding: 15px; + border-radius: 0px; + border-color: @foreground; + background-color: @background; + children: [ "textbox-prompt-colon", "entry" ]; +} + +textbox-prompt-colon { + enabled: true; + expand: false; + str: ""; + background-color: transparent; + text-color: inherit; +} + +entry { + enabled: true; + background-color: transparent; + text-color: inherit; + cursor: text; + placeholder: "Search"; + placeholder-color: inherit; +} + +/* ---- Mode Switcher ---- */ +mode-switcher{ + enabled: true; + spacing: 20px; + background-color: transparent; + text-color: @foreground; +} + +button { + padding: 10px; + border-radius: 10px; + background-color: @background; + text-color: inherit; + cursor: pointer; + border: 0px; +} + +button selected { + background-color: @color11; + text-color: @foreground; +} + +/* ---- Listview ---- */ +listview { + enabled: true; + columns: 1; + lines: 2; + cycle: true; + dynamic: true; + scrollbar: false; + layout: vertical; + reverse: false; + fixed-height: true; + fixed-columns: true; + spacing: 0px; + padding: 10px; + margin: 0px; + background-color: @background; + border:0px; +} + +/* ---- Element ---- */ +element { + enabled: true; + padding: 10px; + margin: 5px; + cursor: pointer; + background-color: @background; + border-radius: 10px; + border: 2px; +} + +element normal.normal { + background-color: inherit; + text-color: @foreground; +} + +element normal.urgent { + background-color: inherit; + text-color: @foreground; +} + +element normal.active { + background-color: inherit; + text-color: @foreground; +} + +element selected.normal { + background-color: @color11; + text-color: @foreground; +} + +element selected.urgent { + background-color: inherit; + text-color: @foreground; +} + +element selected.active { + background-color: inherit; + text-color: @foreground; +} + +element alternate.normal { + background-color: inherit; + text-color: @foreground; +} + +element alternate.urgent { + background-color: inherit; + text-color: @foreground; +} + +element alternate.active { + background-color: inherit; + text-color: @foreground; +} + +element-icon { + background-color: transparent; + text-color: inherit; + size: 32px; + cursor: inherit; +} + +element-text { + background-color: transparent; + text-color: inherit; + cursor: inherit; + vertical-align: 0.5; + horizontal-align: 0.0; +} + +/*****----- Message -----*****/ +message { + background-color: transparent; + border:0px; + margin:20px 0px 0px 0px; + padding:0px; + spacing:0px; + border-radius: 10px; +} + +textbox { + padding: 15px; + margin: 0px; + border-radius: 0px; + background-color: @background; + text-color: @foreground; + vertical-align: 0.5; + horizontal-align: 0.0; +} + +error-message { + padding: 15px; + border-radius: 20px; + background-color: @background; + text-color: @foreground; +} diff --git a/rofi/config-short.rasi b/rofi/config-short.rasi new file mode 100644 index 0000000..a46a995 --- /dev/null +++ b/rofi/config-short.rasi @@ -0,0 +1,253 @@ +/* +# ____ __ _ +# | _ \ ___ / _(_) +# | |_) / _ \| |_| | +# | _ < (_) | _| | +# |_| \_\___/|_| |_| +# +# by Stephan Raabe (2023) +# ----------------------------------------------------- +*/ + +/* ---- Configuration ---- */ +configuration { + modi: "drun,run"; + font: "Fira Sans Bold 10"; + show-icons: false; + icon-theme: "kora"; + display-drun: "APPS"; + display-run: "RUN"; + display-filebrowser: "FILES"; + display-window: "WINDOW"; + hover-select: true; + me-select-entry: ""; + me-accept-entry: "MousePrimary"; + drun-display-format: "{name}"; + window-format: "{w} · {c} · {t}"; + +} + +/* ---- Load pywal colors (custom wal template) ---- */ +@import "~/.cache/wal/colors-rofi-pywal" + +/* ---- Window ---- */ +window { + width: 200px; + height: 130px; + x-offset: -15px; + y-offset: 62px; + spacing: 0px; + padding: 0px; + margin: 0px; + color: #FFFFFF; + border: 3px; + border-color: #FFFFFF; + cursor: "default"; + transparency: "real"; + location: northeast; + anchor: northeast; + fullscreen: false; + enabled: true; + border-radius: 10px; + background-color: transparent; +} + +/* ---- Mainbox ---- */ +mainbox { + enabled: true; + orientation: horizontal; + spacing: 0px; + margin: 0px; + background-color: @background; + background-image: url("~/.cache/current_wallpaper.jpg", height); + children: ["listbox"]; +} + +/* ---- Imagebox ---- */ +imagebox { + padding: 18px; + background-color: transparent; + orientation: vertical; + children: [ "inputbar", "dummy", "mode-switcher" ]; +} + +/* ---- Listbox ---- */ +listbox { + spacing: 20px; + background-color: transparent; + orientation: vertical; + children: [ "listview" ]; +} + +/* ---- Dummy ---- */ +dummy { + background-color: transparent; +} + +/* ---- Inputbar ---- */ +inputbar { + enabled: true; + text-color: @foreground; + spacing: 10px; + padding: 15px; + border-radius: 0px; + border-color: @foreground; + background-color: @background; + children: [ "textbox-prompt-colon", "entry" ]; +} + +textbox-prompt-colon { + enabled: true; + expand: false; + str: ""; + background-color: transparent; + text-color: inherit; +} + +entry { + enabled: true; + background-color: transparent; + text-color: inherit; + cursor: text; + placeholder: "Search"; + placeholder-color: inherit; +} + +/* ---- Mode Switcher ---- */ +mode-switcher{ + enabled: true; + spacing: 20px; + background-color: transparent; + text-color: @foreground; +} + +button { + padding: 10px; + border-radius: 10px; + background-color: @background; + text-color: inherit; + cursor: pointer; + border: 0px; +} + +button selected { + background-color: @color11; + text-color: @foreground; +} + +/* ---- Listview ---- */ +listview { + enabled: true; + columns: 1; + lines: 2; + cycle: true; + dynamic: true; + scrollbar: false; + layout: vertical; + reverse: false; + fixed-height: true; + fixed-columns: true; + spacing: 0px; + padding: 10px; + margin: 0px; + background-color: @background; + border:0px; +} + +/* ---- Element ---- */ +element { + enabled: true; + padding: 10px; + margin: 5px; + cursor: pointer; + background-color: @background; + border-radius: 10px; + border: 2px; +} + +element normal.normal { + background-color: inherit; + text-color: @foreground; +} + +element normal.urgent { + background-color: inherit; + text-color: @foreground; +} + +element normal.active { + background-color: inherit; + text-color: @foreground; +} + +element selected.normal { + background-color: @color11; + text-color: @foreground; +} + +element selected.urgent { + background-color: inherit; + text-color: @foreground; +} + +element selected.active { + background-color: inherit; + text-color: @foreground; +} + +element alternate.normal { + background-color: inherit; + text-color: @foreground; +} + +element alternate.urgent { + background-color: inherit; + text-color: @foreground; +} + +element alternate.active { + background-color: inherit; + text-color: @foreground; +} + +element-icon { + background-color: transparent; + text-color: inherit; + size: 32px; + cursor: inherit; +} + +element-text { + background-color: transparent; + text-color: inherit; + cursor: inherit; + vertical-align: 0.5; + horizontal-align: 0.0; +} + +/*****----- Message -----*****/ +message { + background-color: transparent; + border:0px; + margin:20px 0px 0px 0px; + padding:0px; + spacing:0px; + border-radius: 10px; +} + +textbox { + padding: 15px; + margin: 0px; + border-radius: 0px; + background-color: @background; + text-color: @foreground; + vertical-align: 0.5; + horizontal-align: 0.0; +} + +error-message { + padding: 15px; + border-radius: 20px; + background-color: @background; + text-color: @foreground; +} diff --git a/rofi/config-wallpaper.rasi b/rofi/config-wallpaper.rasi new file mode 100644 index 0000000..a6311ac --- /dev/null +++ b/rofi/config-wallpaper.rasi @@ -0,0 +1,252 @@ +/* +# ____ __ _ +# | _ \ ___ / _(_) +# | |_) / _ \| |_| | +# | _ < (_) | _| | +# |_| \_\___/|_| |_| +# +# by Stephan Raabe (2023) +# ----------------------------------------------------- +*/ + +/* ---- Configuration ---- */ +configuration { + modi: "drun,run"; + font: "Fira Sans Bold 10"; + show-icons: false; + icon-theme: "kora"; + display-drun: "APPS"; + display-run: "RUN"; + display-filebrowser: "FILES"; + display-window: "WINDOW"; + hover-select: true; + me-select-entry: ""; + me-accept-entry: "MousePrimary"; + drun-display-format: "{name}"; + window-format: "{w} · {c} · {t}"; + +} + +/* ---- Load pywal colors (custom wal template) ---- */ +@import "~/.cache/wal/colors-rofi-pywal" + +/* ---- Window ---- */ +window { + width: 400px; + x-offset: 0px; + y-offset: 62px; + spacing: 0px; + padding: 0px; + margin: 0px; + color: #FFFFFF; + border: 3px; + border-color: #FFFFFF; + cursor: "default"; + transparency: "real"; + location: north; + anchor: north; + fullscreen: false; + enabled: true; + border-radius: 10px; + background-color: transparent; +} + +/* ---- Mainbox ---- */ +mainbox { + enabled: true; + orientation: horizontal; + spacing: 0px; + margin: 0px; + background-color: @background; + background-image: url("~/.cache/current_wallpaper.jpg", height); + children: ["listbox"]; +} + +/* ---- Imagebox ---- */ +imagebox { + padding: 18px; + background-color: transparent; + orientation: vertical; + children: [ "inputbar", "dummy", "mode-switcher" ]; +} + +/* ---- Listbox ---- */ +listbox { + spacing: 20px; + background-color: transparent; + orientation: vertical; + children: [ "inputbar", "message", "listview" ]; +} + +/* ---- Dummy ---- */ +dummy { + background-color: transparent; +} + +/* ---- Inputbar ---- */ +inputbar { + enabled: true; + text-color: @foreground; + spacing: 10px; + padding: 15px; + border-radius: 0px; + border-color: @foreground; + background-color: @background; + children: [ "textbox-prompt-colon", "entry" ]; +} + +textbox-prompt-colon { + enabled: true; + expand: false; + str: ""; + background-color: transparent; + text-color: inherit; +} + +entry { + enabled: true; + background-color: transparent; + text-color: inherit; + cursor: text; + placeholder: "Search"; + placeholder-color: inherit; +} + +/* ---- Mode Switcher ---- */ +mode-switcher{ + enabled: true; + spacing: 20px; + background-color: transparent; + text-color: @foreground; +} + +button { + padding: 10px; + border-radius: 10px; + background-color: @background; + text-color: inherit; + cursor: pointer; + border: 0px; +} + +button selected { + background-color: @color11; + text-color: @foreground; +} + +/* ---- Listview ---- */ +listview { + enabled: true; + columns: 1; + lines: 8; + cycle: true; + dynamic: true; + scrollbar: false; + layout: vertical; + reverse: false; + fixed-height: true; + fixed-columns: true; + spacing: 0px; + padding: 10px; + margin: 0px; + background-color: @background; + border:0px; +} + +/* ---- Element ---- */ +element { + enabled: true; + padding: 10px; + margin: 5px; + cursor: pointer; + background-color: @background; + border-radius: 10px; + border: 2px; +} + +element normal.normal { + background-color: inherit; + text-color: @foreground; +} + +element normal.urgent { + background-color: inherit; + text-color: @foreground; +} + +element normal.active { + background-color: inherit; + text-color: @foreground; +} + +element selected.normal { + background-color: @color11; + text-color: @foreground; +} + +element selected.urgent { + background-color: inherit; + text-color: @foreground; +} + +element selected.active { + background-color: inherit; + text-color: @foreground; +} + +element alternate.normal { + background-color: inherit; + text-color: @foreground; +} + +element alternate.urgent { + background-color: inherit; + text-color: @foreground; +} + +element alternate.active { + background-color: inherit; + text-color: @foreground; +} + +element-icon { + background-color: transparent; + text-color: inherit; + size: 32px; + cursor: inherit; +} + +element-text { + background-color: transparent; + text-color: inherit; + cursor: inherit; + vertical-align: 0.5; + horizontal-align: 0.0; +} + +/*****----- Message -----*****/ +message { + background-color: transparent; + border:0px; + margin:20px 0px 0px 0px; + padding:0px; + spacing:0px; + border-radius: 10px; +} + +textbox { + padding: 15px; + margin: 0px; + border-radius: 0px; + background-color: @background; + text-color: @foreground; + vertical-align: 0.5; + horizontal-align: 0.0; +} + +error-message { + padding: 15px; + border-radius: 20px; + background-color: @background; + text-color: @foreground; +} diff --git a/rofi/config.rasi b/rofi/config.rasi index f5f634a..b9f7655 100644 --- a/rofi/config.rasi +++ b/rofi/config.rasi @@ -9,36 +9,244 @@ # ----------------------------------------------------- */ +/* ---- Configuration ---- */ configuration { - display-drun: "Applications"; - display-window: "Windows"; - drun-display-format: "{name}"; - font: "Fira Sans SemiBold 11"; - modi: "window,run,drun"; - /* show-icons: true; */ + modi: "drun,run"; + font: "Fira Sans Bold 12"; + show-icons: true; + icon-theme: "kora"; + display-drun: "APPS"; + display-run: "RUN"; + display-filebrowser: "FILES"; + display-window: "WINDOW"; + drun-display-format: "{name}"; + hover-select: true; + me-select-entry: ""; + me-accept-entry: "MousePrimary"; + window-format: "{w} · {c} · {t}"; + } -/* Dark theme. */ -@import "~/.cache/wal/colors-rofi-dark" +/* ---- Load pywal colors (custom wal template) ---- */ +@import "~/.cache/wal/colors-rofi-pywal" +/* ---- Window ---- */ window { - width:700px; + width: 900px; + x-offset: 0px; + y-offset: 0px; + spacing: 0px; + padding: 0px; + margin: 0px; + color: #FFFFFF; + border: 3px; + border-color: #FFFFFF; + cursor: "default"; + transparency: "real"; + location: center; + anchor: center; + fullscreen: false; + enabled: true; + border-radius: 10px; + background-color: transparent; } -element { - padding:6; +/* ---- Mainbox ---- */ +mainbox { + enabled: true; + orientation: horizontal; + spacing: 0px; + margin: 0px; + background-color: @background; + background-image: url("~/.cache/current_wallpaper.jpg", height); + children: ["imagebox","listbox"]; } -element-text selected { - text-color:@background; +/* ---- Imagebox ---- */ +imagebox { + padding: 18px; + background-color: transparent; + orientation: vertical; + children: [ "inputbar", "dummy", "mode-switcher" ]; } -prompt { - text-color:#ffffff; +/* ---- Listbox ---- */ +listbox { + spacing: 20px; + background-color: transparent; + orientation: vertical; + children: [ "message", "listview" ]; +} + +/* ---- Dummy ---- */ +dummy { + background-color: transparent; +} + +/* ---- Inputbar ---- */ +inputbar { + enabled: true; + text-color: @foreground; + spacing: 10px; + padding: 15px; + border-radius: 10px; + border-color: @foreground; + background-color: @background; + children: [ "textbox-prompt-colon", "entry" ]; +} + +textbox-prompt-colon { + enabled: true; + expand: false; + str: ""; + background-color: transparent; + text-color: inherit; } entry { - text-color:#ffffff; + enabled: true; + background-color: transparent; + text-color: inherit; + cursor: text; + placeholder: "Search"; + placeholder-color: inherit; } -/* vim: ft=sass +/* ---- Mode Switcher ---- */ +mode-switcher{ + enabled: true; + spacing: 20px; + background-color: transparent; + text-color: @foreground; +} + +button { + padding: 10px; + border-radius: 10px; + background-color: @background; + text-color: inherit; + cursor: pointer; + border: 0px; +} + +button selected { + background-color: @color11; + text-color: @foreground; +} + +/* ---- Listview ---- */ +listview { + enabled: true; + columns: 1; + lines: 8; + cycle: true; + dynamic: true; + scrollbar: false; + layout: vertical; + reverse: false; + fixed-height: true; + fixed-columns: true; + spacing: 0px; + padding: 10px; + margin: 0px; + background-color: @background; + border:0px; +} + +/* ---- Element ---- */ +element { + enabled: true; + padding: 10px; + margin: 5px; + cursor: pointer; + background-color: @background; + border-radius: 10px; + border: 2px; +} + +element normal.normal { + background-color: inherit; + text-color: @foreground; +} + +element normal.urgent { + background-color: inherit; + text-color: @foreground; +} + +element normal.active { + background-color: inherit; + text-color: @foreground; +} + +element selected.normal { + background-color: @color11; + text-color: @foreground; +} + +element selected.urgent { + background-color: inherit; + text-color: @foreground; +} + +element selected.active { + background-color: inherit; + text-color: @foreground; +} + +element alternate.normal { + background-color: inherit; + text-color: @foreground; +} + +element alternate.urgent { + background-color: inherit; + text-color: @foreground; +} + +element alternate.active { + background-color: inherit; + text-color: @foreground; +} + +element-icon { + background-color: transparent; + text-color: inherit; + size: 32px; + cursor: inherit; +} + +element-text { + background-color: transparent; + text-color: inherit; + cursor: inherit; + vertical-align: 0.5; + horizontal-align: 0.0; +} + +/*****----- Message -----*****/ +message { + background-color: transparent; + border:0px; + margin:20px 0px 0px 0px; + padding:0px; + spacing:0px; + border-radius: 10px; +} + +textbox { + padding: 15px; + margin: 0px; + border-radius: 0px; + background-color: @background; + text-color: @foreground; + vertical-align: 0.5; + horizontal-align: 0.0; +} + +error-message { + padding: 15px; + border-radius: 20px; + background-color: @background; + text-color: @foreground; +} diff --git a/screenshots/screenshot-23-1.png b/screenshots/screenshot-23-1.png new file mode 100644 index 0000000..40cda95 Binary files /dev/null and b/screenshots/screenshot-23-1.png differ diff --git a/screenshots/screenshot-23-2.png b/screenshots/screenshot-23-2.png new file mode 100644 index 0000000..d6139ec Binary files /dev/null and b/screenshots/screenshot-23-2.png differ diff --git a/screenshots/screenshot-23-3.png b/screenshots/screenshot-23-3.png new file mode 100644 index 0000000..5ed50c8 Binary files /dev/null and b/screenshots/screenshot-23-3.png differ diff --git a/scripts/applauncher.sh b/scripts/applauncher.sh index 076dcd2..14e25c8 100755 --- a/scripts/applauncher.sh +++ b/scripts/applauncher.sh @@ -9,4 +9,4 @@ # by Stephan Raabe (2023) # ----------------------------------------------------- -rofi -show drun -l 10 +rofi -show drun diff --git a/scripts/cliphist.sh b/scripts/cliphist.sh new file mode 100755 index 0000000..1a40ec9 --- /dev/null +++ b/scripts/cliphist.sh @@ -0,0 +1,23 @@ +#!/bin/bash +# ____ _ _ _ _ _ +# / ___| (_)_ __ | |__ (_)___| |_ +# | | | | | '_ \| '_ \| / __| __| +# | |___| | | |_) | | | | \__ \ |_ +# \____|_|_| .__/|_| |_|_|___/\__| +# |_| +# +# by Stephan Raabe (2023) +# ----------------------------------------------------- + +case $1 in + d) cliphist list | rofi -dmenu -config ~/dotfiles/rofi/config-cliphist.rasi | cliphist delete + ;; + + w) if [ `echo -e "Clear\nCancel" | rofi -dmenu -config ~/dotfiles/rofi/config-short.rasi` == "Clear" ] ; then + cliphist wipe + fi + ;; + + *) cliphist list | rofi -dmenu -config ~/dotfiles/rofi/config-cliphist.rasi | cliphist decode | wl-copy + ;; +esac diff --git a/scripts/figlet.sh b/scripts/figlet.sh index 6554786..1d74fd7 100755 --- a/scripts/figlet.sh +++ b/scripts/figlet.sh @@ -18,7 +18,8 @@ echo "" >> ~/figlet.txt echo "by Stephan Raabe (2023)" >> ~/figlet.txt echo "-----------------------------------------------------" >> ~/figlet.txt sed -i 's/^/# /; s/$/ /' ~/figlet.txt - +lines=$( cat ~/figlet.txt ) +wl-copy "$lines" xclip -sel clip ~/figlet.txt echo "Text copied to clipboard!" diff --git a/scripts/grim.sh b/scripts/grim.sh index 7f98d5e..9337f7b 100755 --- a/scripts/grim.sh +++ b/scripts/grim.sh @@ -17,16 +17,18 @@ option3="Fullscreen (delay 3 sec)" options="$option2\n$option3" -choice=$(echo -e "$options" | rofi -dmenu -i -no-show-icons -l 4 -width 30 -p "Take Screenshot") +choice=$(echo -e "$options" | rofi -dmenu -config ~/dotfiles/rofi/config-screenshot.rasi -i -no-show-icons -l 4 -width 30 -p "Take Screenshot") case $choice in $option2) - grim -g "$(slurp)" $(xdg-user-dir PICTURES)/screenshots/$(date +'%s_grim.png') + grim -g "$(slurp)" - | swappy -f - + # grim -g "$(slurp)" $(xdg-user-dir PICTURES)/screenshots/$(date +'%s_grim.png') notify-send "Screenshot created" "Mode: Selected area" ;; $option3) sleep 3 - grim $(xdg-user-dir PICTURES)/screenshots/$(date +'%s_grim.png') + grim - | swappy -f - + # grim $(xdg-user-dir PICTURES)/screenshots/$(date +'%s_grim.png') notify-send "Screenshot created" "Mode: Fullscreen" ;; esac diff --git a/scripts/installupdates.sh b/scripts/installupdates.sh index 1006c0d..045c1f5 100755 --- a/scripts/installupdates.sh +++ b/scripts/installupdates.sh @@ -14,36 +14,6 @@ sleep 1 source ~/dotfiles/scripts/library.sh clear -echo "-----------------------------------------------------" -echo "Check for updates" -echo "-----------------------------------------------------" -echo "" - -if ! updates_arch=$(checkupdates 2> /dev/null | wc -l ); then - updates_arch=0 -fi - -if ! updates_aur=$(trizen -Su --aur --quiet | wc -l); then - updates_aur=0 -fi - -updates=$(("$updates_arch" + "$updates_aur")) - -if [ "$updates" -gt 0 ]; then - - echo "-> Pacman:" - checkupdates - echo "" - echo "-> AUR" - trizen -Su --aur - echo "" - echo "-> $updates updates available." - echo "" -else - echo "-> NO updates available" - exit -fi - # ------------------------------------------------------ # Confirm Start # ------------------------------------------------------ @@ -52,7 +22,7 @@ while true; do read -p "DO YOU WANT TO START THE UPDATE NOW? (Yy/Nn): " yn case $yn in [Yy]* ) - echo "Update process started." + echo "" break;; [Nn]* ) exit; @@ -63,19 +33,23 @@ done if [[ $(_isInstalledYay "Timeshift") == 1 ]]; then - - echo "" - echo "-----------------------------------------------------" - echo "Create a snapshot" - echo "-----------------------------------------------------" - echo "" - read -p "Enter a comment for the snapshot: " c - sudo timeshift --create --comments "$c" - sudo timeshift --list - sudo grub-mkconfig -o /boot/grub/grub.cfg - echo "DONE. Snapshot $c created!" - echo "" - + while true; do + read -p "DO YOU WANT TO CREATE A SNAPSHOT? (Yy/Nn): " yn + case $yn in + [Yy]* ) + echo "" + read -p "Enter a comment for the snapshot: " c + sudo timeshift --create --comments "$c" + sudo timeshift --list + sudo grub-mkconfig -o /boot/grub/grub.cfg + echo "DONE. Snapshot $c created!" + echo "" + break;; + [Nn]* ) + break;; + * ) echo "Please answer yes or no.";; + esac + done fi echo "-----------------------------------------------------" @@ -85,4 +59,4 @@ echo "" yay -notify-send "Update complete" "$updates packages updated successfully" +notify-send "Update complete" diff --git a/scripts/powermenu.sh b/scripts/powermenu.sh index 38fb314..e19e387 100755 --- a/scripts/powermenu.sh +++ b/scripts/powermenu.sh @@ -18,7 +18,7 @@ options="$option1\n" options="$options$option2\n" options="$options$option3\n$option4" -choice=$(echo -e "$options" | rofi -dmenu -i -no-show-icons -l 4 -width 30 -p "Powermenu") +choice=$(echo -e "$options" | rofi -dmenu -config ~/dotfiles/rofi/config-power.rasi -i -no-show-icons -l 4 -width 30 -p "Powermenu") case $choice in $option1) diff --git a/scripts/scrot.sh b/scripts/scrot.sh index 2588bf7..f160bc0 100755 --- a/scripts/scrot.sh +++ b/scripts/scrot.sh @@ -16,9 +16,9 @@ option1="Selected window (delay 3 sec)" option2="Selected area" option3="Fullscreen (delay 3 sec)" -options="$option1\n$option2\n$option3" +options="$option2\n$option3\n$option1" -choice=$(echo -e "$options" | rofi -i -dmenu -lines 4 -width 30 -p "Take Screenshot") +choice=$(echo -e "$options" | rofi -i -dmenu -config ~/dotfiles/rofi/config-screenshot.rasi -width 30 -p "Take Screenshot") case $choice in $option1) diff --git a/scripts/updatewal-swww.sh b/scripts/updatewal-swww.sh index c42d063..f7b814a 100755 --- a/scripts/updatewal-swww.sh +++ b/scripts/updatewal-swww.sh @@ -32,7 +32,13 @@ newwall=$(echo $wallpaper | sed "s|$HOME/wallpaper/||g") # ----------------------------------------------------- # Set the new wallpaper # ----------------------------------------------------- -swww img $wallpaper --transition-step 20 --transition-fps=20 +swww img $wallpaper \ + --transition-bezier .43,1.19,1,.4 \ + --transition-fps=60 \ + --transition-type="random" \ + --transition-duration=0.7 \ + --transition-pos "$( hyprctl cursorpos )" + ~/dotfiles/waybar/launch.sh sleep 1 diff --git a/scripts/updatewal.sh b/scripts/updatewal.sh index 4c8e670..2f79c4d 100755 --- a/scripts/updatewal.sh +++ b/scripts/updatewal.sh @@ -31,6 +31,12 @@ qtile cmd-obj -o cmd -f reload_config # ----------------------------------------------------- source "$HOME/.cache/wal/colors.sh" newwall=$(echo $wallpaper | sed "s|$HOME/wallpaper/||g") + +# ----------------------------------------------------- +# Copy selected wallpaper into .cache folder +# ----------------------------------------------------- +cp $wallpaper ~/.cache/current_wallpaper.jpg + sleep 1 # ----------------------------------------------------- diff --git a/scripts/wallpaper-swww.sh b/scripts/wallpaper-swww.sh index 83b20ac..5f0b7dd 100755 --- a/scripts/wallpaper-swww.sh +++ b/scripts/wallpaper-swww.sh @@ -12,7 +12,7 @@ # ----------------------------------------------------- # Select wallpaper # ----------------------------------------------------- -selected=$(ls -1 ~/wallpaper | grep "jpg" | rofi -dmenu -p "Wallpapers") +selected=$(ls -1 ~/wallpaper | grep "jpg" | rofi -dmenu -config ~/dotfiles/rofi/config-wallpaper.rasi -p "Wallpapers") if [ "$selected" ]; then @@ -37,7 +37,13 @@ if [ "$selected" ]; then # ----------------------------------------------------- # Set the new wallpaper # ----------------------------------------------------- - swww img $wallpaper --transition-step 20 --transition-fps=20 + swww img $wallpaper \ + --transition-bezier .43,1.19,1,.4 \ + --transition-fps=60 \ + --transition-type="random" \ + --transition-duration=0.7 \ + --transition-pos "$( hyprctl cursorpos )" + ~/dotfiles/waybar/launch.sh sleep 1 diff --git a/scripts/wallpaper.sh b/scripts/wallpaper.sh index 2dc5477..84704d3 100755 --- a/scripts/wallpaper.sh +++ b/scripts/wallpaper.sh @@ -10,7 +10,7 @@ # ----------------------------------------------------- # Select wallpaper -selected=$(ls -1 ~/wallpaper | grep "jpg" | rofi -dmenu -p "Wallpapers") +selected=$(ls -1 ~/wallpaper | grep "jpg" | rofi -dmenu -config ~/dotfiles/rofi/config-wallpaper.rasi -p "Wallpapers") if [ "$selected" ]; then @@ -28,6 +28,12 @@ if [ "$selected" ]; then source "$HOME/.cache/wal/colors.sh" newwall=$(echo $wallpaper | sed "s|$HOME/wallpaper/||g") + + # ----------------------------------------------------- + # Copy selected wallpaper into .cache folder + # ----------------------------------------------------- + cp $wallpaper ~/.cache/current_wallpaper.jpg + sleep 1 # Send notification diff --git a/swappy/config b/swappy/config new file mode 100644 index 0000000..5739db6 --- /dev/null +++ b/swappy/config @@ -0,0 +1,10 @@ +[Default] +save_dir=$HOME/Pictures/screenshots +save_filename_format=screenshot-%Y%m%d-%H%M%S.png +show_panel=false +line_size=5 +text_size=20 +text_font=sans-serif +paint_mode=brush +early_exit=false +fill_shape=false diff --git a/wal/templates/colors-rofi-pywal.rasi b/wal/templates/colors-rofi-pywal.rasi new file mode 100644 index 0000000..f0b1665 --- /dev/null +++ b/wal/templates/colors-rofi-pywal.rasi @@ -0,0 +1,20 @@ +* {{ + background: rgba(0,0,1,0.5); + foreground: #FFFFFF; + color0: {color0}; + color1: {color1}; + color2: {color2}; + color3: {color3}; + color4: {color4}; + color5: {color5}; + color6: {color6}; + color7: {color7}; + color8: {color8}; + color9: {color9}; + color10: {color10}; + color11: {color11}; + color12: {color12}; + color13: {color13}; + color14: {color14}; + color15: {color15}; +}} diff --git a/waybar/config b/waybar/config index c7b880f..8617d3b 100644 --- a/waybar/config +++ b/waybar/config @@ -33,6 +33,7 @@ // Modules Left "modules-left": [ "custom/appmenu", + "custom/wallpaper", "wlr/taskbar", "group/quicklinks", "hyprland/window" @@ -50,8 +51,9 @@ "bluetooth", "battery", "group/hardware", - "custom/exit", + "custom/cliphist", "network", + "custom/exit", "clock" ], diff --git a/waybar/modules.json b/waybar/modules.json index ccf9380..0c57ca4 100644 --- a/waybar/modules.json +++ b/waybar/modules.json @@ -14,7 +14,7 @@ "on-click": "activate", "active-only": false, "all-outputs": true, - "format": "{icon}", + "format": "{}", "format-icons": { "urgent": "", "active": "", @@ -64,6 +64,15 @@ "on-click": "brave https://studio.youtube.com", "tooltip": false }, + + // Cliphist + "custom/cliphist": { + "format": "", + "on-click": "sleep 0.1 && ~/dotfiles/scripts/cliphist.sh", + "on-click-right": "sleep 0.1 && ~/dotfiles/scripts/cliphist.sh d", + "on-click-middle": "sleep 0.1 && ~/dotfiles/scripts/cliphist.sh w", + "tooltip": false + }, // Updates Count "custom/updates": { @@ -76,6 +85,14 @@ "on-click": "alacritty -e ~/dotfiles/scripts/installupdates.sh", "tooltip": false }, + + // Wallpaper + "custom/wallpaper": { + "format": "", + "on-click-right": "~/dotfiles/scripts/wallpaper-swww.sh", + "on-click": "~/dotfiles/scripts/updatewal-swww.sh", + "tooltip": false + }, // Filemanager Launcher "custom/filemanager": { @@ -166,19 +183,22 @@ // CPU "cpu": { - "format": "/ C {usage}% " + "format": "/ C {usage}% ", + "on-click": "alacritty -e htop" }, // Memory "memory": { - "format": "/ M {}% " + "format": "/ M {}% ", + "on-click": "alacritty -e htop" }, // Harddisc space used "disk": { "interval": 30, "format": " {percentage_used}% ", - "path": "/" + "path": "/", + "on-click": "alacritty -e htop" }, // Network diff --git a/waybar/myconfig b/waybar/myconfig index 29fe7c8..bec1f17 100644 --- a/waybar/myconfig +++ b/waybar/myconfig @@ -32,6 +32,7 @@ // Modules Left "modules-left": [ "custom/appmenu", + "custom/wallpaper", "wlr/taskbar", "group/quicklinks", "hyprland/window" @@ -48,10 +49,11 @@ "custom/updates", "pulseaudio", "bluetooth", - "battery", + "battery", "group/hardware", - "custom/exit", + "custom/cliphist", "network", + "custom/exit", "clock" ], diff --git a/waybar/style.css b/waybar/style.css index dda6cf4..f2e3c91 100644 --- a/waybar/style.css +++ b/waybar/style.css @@ -40,41 +40,42 @@ window#waybar { #workspaces { background: #FFFFFF; - margin: 5px 5px 5px 5px; - padding: 4px 1px; - border-radius: 12px; - font-weight: normal; + margin: 2px 1px 3px 1px; + padding: 0px 1px; + border-radius: 15px; + border:0px; + font-weight: bold; font-style: normal; opacity:0.8; + font-size:16px; + color:#FFFFFF; } #workspaces button { - padding: 0px 10px; - margin: 0px 3px; - border-radius: 12px; - color: @color11; + padding: 1px 9px; + margin: 3px 3px; + border-radius: 15px; + border:0px; + color: #FFFFFF; background-color: @color11; transition: all 0.3s ease-in-out; opacity:0.4; - font-size:13px; } #workspaces button.active { - color: #cdd6f4; - background-color: @color11; - border-radius: 10px; - min-width: 30px; - background-size: 400% 400%; + color: #FFFFFF; + background: @color11; + border-radius: 15px; + min-width: 40px; transition: all 0.3s ease-in-out; opacity:1.0; } #workspaces button:hover { - background-color: @color1; - color: #cdd6f4; - border-radius: 10px; - min-width: 30px; - background-size: 400% 400%; + color: #FFFFFF; + background: @color11; + border-radius: 15px; + opacity:0.7; } /* ----------------------------------------------------- @@ -120,8 +121,9 @@ window#waybar.empty #window { /* background: @color11; */ background: #FFFFFF; margin: 3px 15px 3px 0px; - padding: 2px 3px 1px 3px; - border-radius: 14px; + padding:0px; + /*padding: 2px 3px 1px 3px;*/ + border-radius: 15px; font-weight: normal; font-style: normal; opacity:0.8; @@ -149,11 +151,16 @@ window#waybar.empty #window { * Custom Quicklinks * ----------------------------------------------------- */ -#custom-brave, #custom-outlook, #custom-filemanager, #custom-teams, #custom-chatgpt, #custom-calculator, #custom-windowsvm { +#custom-brave, #custom-outlook, #custom-filemanager, #custom-teams, #custom-chatgpt, #custom-calculator, #custom-windowsvm, #custom-cliphist, #custom-wallpaper { margin-right:20px; font-size:20px; font-weight:bold; opacity:0.8; + color:#FFFFFF; +} + +#custom-wallpaper { + margin-right:23px; } /* ----------------------------------------------------- @@ -164,7 +171,7 @@ window#waybar.empty #window { background-color: @color11; font-size: 16px; color: #FFFFFF; - border-radius: 14px; + border-radius: 15px; padding: 0px 10px 0px 10px; margin: 3px 15px 3px 14px; opacity:0.8; @@ -176,8 +183,10 @@ window#waybar.empty #window { * ----------------------------------------------------- */ #custom-exit { - margin: 0px 20px 0px 0px; + margin: 0px 15px 0px 0px; + padding:0px; font-size:20px; + color:#FFFFFF; } /* ----------------------------------------------------- @@ -188,7 +197,7 @@ window#waybar.empty #window { background-color: #FFFFFF; font-size: 16px; color: @background; - border-radius: 12px; + border-radius: 15px; padding: 2px 10px 0px 10px; margin: 5px 15px 5px 0px; opacity:0.8; @@ -216,7 +225,7 @@ window#waybar.empty #window { background-color: #FFFFFF; font-size: 16px; color: @background; - border-radius: 12px; + border-radius: 15px; padding: 2px 10px 0px 10px; margin: 5px 15px 5px 0px; opacity:0.8; @@ -230,6 +239,7 @@ window#waybar.empty #window { margin:0px; padding:0px; font-size:16px; + color:#FFFFFF; } #memory { @@ -244,7 +254,7 @@ window#waybar.empty #window { background-color: @color11; font-size: 16px; color: #FFFFFF; - border-radius: 14px; + border-radius: 15px; padding: 1px 10px 0px 10px; margin: 3px 15px 3px 0px; opacity:0.8; @@ -259,7 +269,7 @@ window#waybar.empty #window { background-color: #FFFFFF; font-size: 16px; color: @background; - border-radius: 12px; + border-radius: 15px; padding: 2px 10px 0px 10px; margin: 5px 15px 5px 0px; opacity:0.8; @@ -278,9 +288,9 @@ window#waybar.empty #window { background-color: #FFFFFF; font-size: 16px; color: @background; - border-radius: 14px; + border-radius: 15px; padding: 2px 10px 0px 10px; - margin: 3px 15px 3px 0px; + margin: 3px 10px 3px 0px; opacity:0.8; border: 3px solid #FFFFFF } @@ -303,7 +313,7 @@ window#waybar.empty #window { background-color: #FFFFFF; font-size: 16px; color: @background; - border-radius: 12px; + border-radius: 15px; padding: 2px 10px 0px 10px; margin: 5px 15px 5px 0px; opacity:0.8; @@ -323,7 +333,7 @@ window#waybar.empty #window { background-color: #FFFFFF; font-size: 16px; color: @background; - border-radius: 12px; + border-radius: 15px; padding: 2px 15px 0px 10px; margin: 5px 15px 5px 0px; opacity:0.8; diff --git a/wlogout/layout b/wlogout/layout index 488aa5b..568bc3d 100644 --- a/wlogout/layout +++ b/wlogout/layout @@ -1,36 +1,36 @@ { "label" : "lock", - "action" : "swaylock", + "action" : "sleep 1; swaylock", "text" : "Lock", "keybind" : "l" } { "label" : "hibernate", - "action" : "systemctl hibernate", + "action" : "sleep 1; systemctl hibernate", "text" : "Hibernate", "keybind" : "h" } { "label" : "logout", - "action" : "loginctl terminate-user $USER", + "action" : "sleep 1; hyprctl dispatch exit", "text" : "Logout", "keybind" : "e" } { "label" : "shutdown", - "action" : "systemctl poweroff", + "action" : "sleep 1; systemctl poweroff", "text" : "Shutdown", "keybind" : "s" } { "label" : "suspend", - "action" : "systemctl suspend", + "action" : "sleep 1; systemctl suspend", "text" : "Suspend", "keybind" : "u" } { "label" : "reboot", - "action" : "systemctl reboot", + "action" : "sleep 1; systemctl reboot", "text" : "Reboot", "keybind" : "r" }