diff --git a/configs/hyprland/MacAir7,2/hypridle.conf b/configs/hyprland/MacAir7,2/hypridle.conf new file mode 100644 index 0000000..6f97c44 --- /dev/null +++ b/configs/hyprland/MacAir7,2/hypridle.conf @@ -0,0 +1,49 @@ +# _ _ _ _ +# | |__ _ _ _ __ _ __(_) __| | | ___ +# | '_ \| | | | '_ \| '__| |/ _` | |/ _ \ +# | | | | |_| | |_) | | | | (_| | | __/ +# |_| |_|\__, | .__/|_| |_|\__,_|_|\___| +# |___/|_| +# +# Version 2.8.3 +# DO NOT REMOVE THE REPLACEMENT COMMENTS +# REQUIRED BY THE ML4W SETTINGS APP +# https://wiki.hyprland.org/Hypr-Ecosystem/hypridle/ + +# general { +# ignore_dbus_inhibit = false +# } + +general { + lock_cmd = pidof hyprlock || hyprlock # avoid starting multiple hyprlock instances. + before_sleep_cmd = loginctl lock-session # lock before suspend. + after_sleep_cmd = hyprctl dispatch dpms on # to avoid having to press a key twice to turn on the display. +} + +# Screenlock +listener { + # HYPRLOCK TIMEOUT + timeout = 300 + # HYPRLOCK ONTIMEOUT + on-timeout = loginctl lock-session +} + +# dpms +listener { + # DPMS TIMEOUT + timeout = 360 + # DPMS ONTIMEOUT + on-timeout = hyprctl dispatch dpms off + # DPMS ONRESUME + on-resume = hyprctl dispatch dpms on +} + +# Suspend +listener { + # SUSPEND TIMEOUT + timeout = 800 + #SUSPEND ONTIMEOUT + on-timeout = systemctl suspend +} + + diff --git a/configs/hyprland/MacAir7,2/hyprland.conf b/configs/hyprland/MacAir7,2/hyprland.conf index 5b8b1b2..9ee36a1 100644 --- a/configs/hyprland/MacAir7,2/hyprland.conf +++ b/configs/hyprland/MacAir7,2/hyprland.conf @@ -1,79 +1,57 @@ -# ####################################################################################### -# AUTOGENERATED HYPR CONFIG. -# PLEASE USE THE CONFIG PROVIDED IN THE GIT REPO /examples/hypr.conf AND EDIT IT, -# OR EDIT THIS ONE ACCORDING TO THE WIKI INSTRUCTIONS. -# ####################################################################################### +# Monitors 󰍺 +monitor = eDP-1,1440x900@60,auto,1 # Laptop Display +monitor = DP-1,3840x2160@60,3840x0,auto # Mini display port 4k Dell Monitor, Location = Left -# -# Please note not all available settings / options are set here. -# For a full list, see the wiki -# +# StartUp  +source = ~/.config/hypr/startup.conf -# See https://wiki.hyprland.org/Configuring/Keywords/ for more -# Leave this Variable on top -$mainMod = SUPER - - - -# See https://wiki.hyprland.org/Configuring/Monitors/ -monitor=,preferred,auto,auto - - -# See https://wiki.hyprland.org/Configuring/Keywords/ for more - -# Execute your favorite apps at launch -# exec-once = waybar & hyprpaper & firefox - -# Source a file (multi-file configs) -# source = ~/.config/hypr/myColors.conf - -# Some default env vars. +# ENV Variables env = XCURSOR_SIZE,24 env = QT_QPA_PLATFORMTHEME,qt5ct # change to qt6ct if you have that -# For all categories, see https://wiki.hyprland.org/Configuring/Variables/ + +# Input 󱡫 input { kb_layout = us kb_variant = kb_model = kb_options = kb_rules = - follow_mouse = 1 - touchpad { natural_scroll = no + tap-to-click = true + scroll_factor = 0.4 } - sensitivity = 0 # -1.0 to 1.0, 0 means no modification. } -general { - # See https://wiki.hyprland.org/Configuring/Variables/ for more +# Styles 󰃐 +gestures { + workspace_swipe = on + workspace_swipe_fingers = 4 + workspace_swipe_invert = false +} +general { gaps_in = 5 gaps_out = 10 border_size = 2 - col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg - col.inactive_border = rgba(595959aa) - +# col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg +# col.inactive_border = rgba(595959aa) + col.active_border = rgb(EBDBB2) + col.inactive_border = rgba(31313600) layout = dwindle - - # Please see https://wiki.hyprland.org/Configuring/Tearing/ before you turn this on allow_tearing = false } decoration { - # See https://wiki.hyprland.org/Configuring/Variables/ for more - rounding = 10 - blur { - enabled = false + enabled = true size = 3 passes = 1 } - drop_shadow = false shadow_range = 4 shadow_render_power = 3 @@ -81,10 +59,7 @@ decoration { } animations { - enabled = yes - - # Some default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more - + enabled = no bezier = myBezier, 0.05, 0.9, 0.1, 1.05 animation = windows, 1, 7, myBezier @@ -96,48 +71,52 @@ animations { } dwindle { - # See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more pseudotile = yes # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below preserve_split = yes # you probably want this } master { - # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more new_is_master = true } -gestures { - # See https://wiki.hyprland.org/Configuring/Variables/ for more - workspace_swipe = off -} - misc { - # See https://wiki.hyprland.org/Configuring/Variables/ for more force_default_wallpaper = 0 # Set to 0 or 1 to disable the anime mascot wallpapers + disable_hyprland_logo = true } -# Example per-device config -# See https://wiki.hyprland.org/Configuring/Keywords/#per-device-input-configs for more device { name = epic-mouse-v1 sensitivity = -0.5 } -# Example windowrule v1 -# windowrule = float, ^(kitty)$ -# Example windowrule v2 -# windowrulev2 = float,class:^(kitty)$,title:^(kitty)$ -# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more +# Rules & Binds  + +$mainMod = SUPER +$terminal = kitty # alacritty, foot, wezterm +$fileManager = thunar # dolphin, nautilus +$menu = wofi --show drun +$lock = hyprlock + +bind = $mainMod, M, exit, +bind = $mainMod, E, exec, $fileManager +bind = $mainMod, P, pseudo, # dwindle +bind = $mainMod, J, togglesplit, # dwindle +bind = $mainMod, F, fullscreen +bind = $mainMod SHIFT, R, exec, hyprctl reload +bind = $mainMod, Return, exec, $terminal +bind = $mainMod, Q, killactive, +bind = $mainMod, D, exec, wofi --show drun +bind = $mainMod SHIFT, F, togglefloating +bind = SUPER, L, exec, $lock +bind = $CONTROL, ESCAPE, exec, killall waybar || waybar + windowrulev2 = suppressevent maximize, class:.* # You'll probably like this. - -# Move focus with mainMod + arrow keys bind = $mainMod, left, movefocus, l bind = $mainMod, right, movefocus, r bind = $mainMod, up, movefocus, u bind = $mainMod, down, movefocus, d -# Switch workspaces with mainMod + [0-9] bind = $mainMod, 1, workspace, 1 bind = $mainMod, 2, workspace, 2 bind = $mainMod, 3, workspace, 3 @@ -149,7 +128,6 @@ bind = $mainMod, 8, workspace, 8 bind = $mainMod, 9, workspace, 9 bind = $mainMod, 0, workspace, 10 -# Move active window to a workspace with mainMod + SHIFT + [0-9] bind = $mainMod SHIFT, 1, movetoworkspace, 1 bind = $mainMod SHIFT, 2, movetoworkspace, 2 bind = $mainMod SHIFT, 3, movetoworkspace, 3 @@ -173,45 +151,6 @@ bind = $mainMod, mouse_up, workspace, e-1 bindm = $mainMod, mouse:272, movewindow bindm = $mainMod, mouse:273, resizewindow -# Set programs that you use -$terminal = alacritty -$fileManager = thunar -$menu = wofi --show drun - -# Personal config, learning as I go - -# Start apps on logon -exec-once=waybar - -# Enable wifi manager indicator on waybar -exec-once=nm-applet --indicator & disown - -exec-once=/usr/lib/polkit-kde-authentication-agent-1 - -# Wallpaper -exec-once = hyprpaper - -# Binds -# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more -bind = $mainMod, M, exit, -bind = $mainMod, E, exec, $fileManager -bind = $mainMod, P, pseudo, # dwindle -bind = $mainMod, J, togglesplit, # dwindle -bind = $mainMod, F, fullscreen -bind = $mainMod SHIFT, R, exec, hyprctl reload -bind = $mainMod, Return, exec, alacritty -bind = $mainMod, Q, killactive, -bind = $mainMod, D, exec, wofi --show drun -bind = $mainMod SHIFT, F, togglefloating - -# Enable waybar while pressing $mod -# bindit = $mainMod, SUPER_L, exec, pkill -SIGUSR1 waybar -# bindirt = $mainMod, SUPER_L, exec, pkill -SIGUSR1 waybar -# bind = $mainMod, B, exec, pkill -SIGUSR1 waybar - -# Hide waybar with key combination -bind = $CONTROL, ESCAPE, exec, killall waybar || waybar - # Volume Keys bind =, xf86audioraisevolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+ bind =, xf86audiolowervolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%- @@ -222,19 +161,7 @@ bind = , xf86monbrightnessup, exec, brightnessctl set 10%+ bind = , xf86monbrightnessdown, exec, brightnessctl set 10%- # Keyboard Backlight -bind = , xf86KbdBrightnessUp, exec, brightnessctl -d *::kbd_backlight set +33% -bind = , xf86KbdBrightnessDown, exec, brightnessctl -d *::kbd_backlight set 33%- +bind = , xf86KbdBrightnessUp, exec, brightnessctl -d *kbd_backlight set +33% +bind = , xf86KbdBrightnessDown, exec, brightnessctl -d *kbd_backlight set 33%- -# Idle and Locking Screen -# Screensaver and lock screen -$lock = swaylock -f --color 1e1e2eFF -exec-once = swayidle -w timeout 300 '$lock' timeout 300 'hyprctl dispatch dpms off' resume 'hyprctl dispatch dpms on' before-sleep '$lock' - -# Screenlock -bind = SUPER, L, exec, $lock - -# Trackpad Gestures -gestures { - workspace_swipe = true - workspace_swipe_fingers = 3 -} +windowrulev2 = suppressevent maximize, class:.* # You'll probably like this. diff --git a/configs/hyprland/MacAir7,2/hyprlock.conf b/configs/hyprland/MacAir7,2/hyprlock.conf new file mode 100644 index 0000000..fa71c27 --- /dev/null +++ b/configs/hyprland/MacAir7,2/hyprlock.conf @@ -0,0 +1,68 @@ +background { + monitor = + path = ~/Pictures/Wallpapers/fish.png # PNG images only + blur_passes = 3 +} + +general { + no_fade_in = false + grace = 0 + disable_loading_bar = true +} + +input-field { + monitor = + size = 200, 50 + outline_thickness = 3 + dots_size = 0.33 # Scale of input-field height, 0.2 - 0.8 + dots_spacing = 0.15 # Scale of dots' absolute size, 0.0 - 1.0 + dots_center = false + dots_rounding = -1 # -1 default circle, -2 follow input-field rounding + outer_color = rgb(151515) + inner_color = rgb(200, 200, 200) + font_color = rgb(10, 10, 10) + fade_on_empty = true + fade_timeout = 1000 # Milliseconds before fade_on_empty is triggered. + placeholder_text = Input Password... # Text rendered in the input box when it's empty. + hide_input = false + rounding = -1 # -1 means complete rounding (circle/oval) + check_color = rgb(204, 136, 34) + fail_color = rgb(204, 34, 34) # if authentication failed, changes outer_color and fail message color + fail_text = $FAIL ($ATTEMPTS) # can be set to empty + fail_transition = 300 # transition time in ms between normal outer_color and fail_color + capslock_color = -1 + numlock_color = -1 + bothlock_color = -1 # when both locks are active. -1 means don't change outer color (same for above) + invert_numlock = false # change color if numlock is off + swap_font_color = false # see below + + position = 0, -20 + halign = center + valign = center +} + +label { + monitor = + text = cmd[update:1000] echo "$TIME" + color = rgba(200, 200, 200, 1.0) + font_size = 55 + font_family = Iosevka Nerd Font + position = -100, -40 + halign = right + valign = bottom + shadow_passes = 5 + shadow_size = 10 +} + +label { + monitor = + text = $USER + color = rgba(200, 200, 200, 1.0) + font_size = 20 + font_family = Iosevka Nerd Font + position = -100, 160 + halign = right + valign = bottom + shadow_passes = 5 + shadow_size = 10 +} diff --git a/configs/hyprland/MacAir7,2/hyprpaper.conf b/configs/hyprland/MacAir7,2/hyprpaper.conf index 18b2558..eceacbf 100644 --- a/configs/hyprland/MacAir7,2/hyprpaper.conf +++ b/configs/hyprland/MacAir7,2/hyprpaper.conf @@ -1,18 +1,3 @@ -preload = /home/doku/Pictures/desktop/minimal_squares.png -#if more than one preload is desired then continue to preload other backgrounds -# preload = /path/to/next_image.png -# .. more preloads - -#set the default wallpaper(s) seen on initial workspace(s) --depending on the number of monitors used -wallpaper = ,/home/doku/Pictures/desktop/minimal_squares.png -#if more than one monitor in use, can load a 2nd image -# wallpaper = monitor2,/path/to/next_image.png -# .. more monitors - -#enable splash text rendering over the wallpaper -splash = true - -#fully disable ipc -# ipc = off - - +preload = $HOME/Pictures/to_the_sky.png +wallpaper = ,$HOME/Pictures/to_the_sky.png +splash = false diff --git a/configs/hyprland/MacAir7,2/startup.conf b/configs/hyprland/MacAir7,2/startup.conf new file mode 100644 index 0000000..dbe4acf --- /dev/null +++ b/configs/hyprland/MacAir7,2/startup.conf @@ -0,0 +1,9 @@ +exec-once=waybar +exec-once=nm-applet --indicator & disown +exec-once=/usr/lib/polkit-kde-authentication-agent-1 +exec-once = hyprpaper +exec-once = hypridle +exec-once = wl-clipboard # Needed for Neovim `Yank` to work + +exec = brightnessctl s 75% # Screen brightness +exec = brightnessctl --device=':white:kbd_backlight' set 0% # Keyboard backlight, start at off diff --git a/configs/waybar_l/M1Pro/shvedes/Scale1.6x/config b/configs/waybar_l/M1Pro/shvedes/Scale1.6x/config index 5d57f7f..d7e94b9 100644 --- a/configs/waybar_l/M1Pro/shvedes/Scale1.6x/config +++ b/configs/waybar_l/M1Pro/shvedes/Scale1.6x/config @@ -4,10 +4,13 @@ "position": "top", "height": 28, "reload_style_on_change": true, - - "modules-left": [ "custom/spotify", "custom/cpu", "memory", "disk", "battery" ], + "height": 4, + "margin-top": 4, + "margin-left": 10, + "margin-right": 10, + "modules-left": [ "custom/spotify", "custom/cpu", "memory", "disk" ], "modules-center": [ "hyprland/workspaces" ], - "modules-right": [ "network", "clock#time", "tray", "idle_inhibitor" ], + "modules-right": [ "battery", "clock#time", "tray", "idle_inhibitor" ], "custom/spotify": { "exec": "$HOME/.config/waybar/scripts/spotify.py --player spotify", @@ -51,7 +54,7 @@ } }, - "network": { + /* "network": { "interval": 1, "format-wifi": "{icon} {essid}{bandwidthUpBytes}{bandwidthDownBytes} ", "format-disconnected": "", @@ -66,7 +69,7 @@ "󰤨 " ] }, - +*/ "clock#time": { "interval": 1, "format": "{:%I:%M %p} ", diff --git a/configs/waybar_l/M1Pro/shvedes/Scale1.6x/style.css b/configs/waybar_l/M1Pro/shvedes/Scale1.6x/style.css index a59609e..3780b5a 100644 --- a/configs/waybar_l/M1Pro/shvedes/Scale1.6x/style.css +++ b/configs/waybar_l/M1Pro/shvedes/Scale1.6x/style.css @@ -2,14 +2,17 @@ border: none; font-family: JetBrainsMono Nerd Font; font-weight: bold; - font-size: 11px; + font-size: 12px; min-height: 0; + border-radius: 20; + padding-right: 4px; + padding-left: 4px; } tooltip { background: #282828; border: 0px solid; - border-radius: 0px; + border-radius: 18px; } window#waybar { @@ -45,7 +48,7 @@ window#waybar { #disk, #clock, #memory, -#network, +/*#network,*/ #workspaces, #battery, #idle_inhibitor, @@ -59,6 +62,6 @@ window#waybar { margin-left: 2px; margin-top: 4px; margin-bottom: 4px; - border-radius: 0px; + border-radius: 18px; } diff --git a/configs/waybar_l/MacAir7,2/shvedes/README.md b/configs/waybar_l/MacAir7,2/shvedes/README.md new file mode 100644 index 0000000..e29b3c3 --- /dev/null +++ b/configs/waybar_l/MacAir7,2/shvedes/README.md @@ -0,0 +1,3 @@ +## [shvedes's github](https://github.com/shvedes/dotfiles) + +### 6/10/24 - Unable to make the `spotify.py` script to work, everything else works, except for `cpu-temp` as well diff --git a/configs/waybar_l/MacAir7,2/shvedes/Scale1x/config.jsonc b/configs/waybar_l/MacAir7,2/shvedes/Scale1x/config.jsonc new file mode 100644 index 0000000..0352691 --- /dev/null +++ b/configs/waybar_l/MacAir7,2/shvedes/Scale1x/config.jsonc @@ -0,0 +1,77 @@ +{ + "layer": "bottom", + "position": "top", + "height": 28, + "reload_style_on_change": true, + "height": 4, + "margin-top": 4, + "margin-left": 10, + "margin-right": 10, + "modules-left": [ + "hyprland/workspaces", + "memory", + "disk"], + "modules-center": [ + "clock"], + "modules-right": [ + "battery", + "idle_inhibitor", + "tray" ], + + "battery": { + "states": { + "good": 95, + "warning": 30, + "critical": 20 + }, + "format": "{icon} {capacity}%", + "format-charging": "\udb80\udc84 {capacity}%", + "format-plugged": "\udb81\udea5 {capacity}%", + "format-alt": "{time} {icon}", + "format-icons": ["\udb80\udc7a", "\udb80\udc7b", "\udb80\udc7c", "\udb80\udc7d", "\udb80\udc7e", "\udb80\udc7f", "\udb80\udc80", "\udb80\udc81", "\udb80\udc82", "\udb80\udc79"] + }, + + "idle_inhibitor": { + "format": "{icon}", + "format-icons": { + "activated": "󰆪 ", + "deactivated": "󰗥 " + } + }, + "memory": { + "interval": 1, + "format": "{used:0.1f}GiB" + }, + + "disk": { + "interval": 60, + "format": "{used}", + "tooltip": false + }, + + "hyprland/workspaces": { + "format": "{icon}", + "on-click-release": "activate", + "sort-by-numbers": false, + "on-scroll-up": "hyprctl dispatch workspace e+1", + "on-scroll-down": "hyprctl dispatch workspace e-1", + "format-icons": { + "1": "I", + "2": "II", + "3": "III", + "4": "IV", + "5": "V", + "6": "VI", + "7": "VII", + "8": "VIII", + "9": "IX", + "10": "X" + } + }, + "tray": { + "icon-size": 14, + "spacing": 10, + "show-passive-items": true + } +} + diff --git a/configs/waybar_l/MacAir7,2/shvedes/Scale1x/style.css b/configs/waybar_l/MacAir7,2/shvedes/Scale1x/style.css new file mode 100644 index 0000000..3581b89 --- /dev/null +++ b/configs/waybar_l/MacAir7,2/shvedes/Scale1x/style.css @@ -0,0 +1,64 @@ +* { + border: none; + font-family: JetBrainsMono Nerd Font; + font-weight: bold; + font-size: 12px; + min-height: 0; + border-radius: 20; + padding-right: 4px; + padding-left: 4px; +} + +tooltip { + background: #282828; + border: 0px solid; + border-radius: 18px; +} + +window#waybar { + background: #282828; + color: #ebdbb2; +} + +#workspaces button { + padding: 0 0.6em; + color: #a89984; + background: #504945; + border-radius: 0px; + margin-right: 4px; + margin-left: 4px; + margin-top: 2px; + margin-bottom: 2px; +} + +#workspaces button.active { + color: #ebdbb2; + background: #665c54; +} + +#workspaces button.urgent { + color: #1d2021; + background: #fb4934; +} + +#workspaces button:hover { + background: #665c54; +} + +#disk, +#clock, +#memory, +#workspaces, +#battery, +#idle_inhibitor, +#custom-cpu +#tray { + color: #d5c4a1; + background: #433e3c; + padding: 0 0.6em; + margin-right: 4px; + margin-left: 2px; + margin-top: 4px; + margin-bottom: 4px; + border-radius: 18px; +}