diff --git a/build.sh b/build.sh index 145f482..5e71d90 100755 --- a/build.sh +++ b/build.sh @@ -41,7 +41,9 @@ DISPLAY_MANAGER=" WAYLAND_ENVIRONMENT=" hyprland - hyprpaper + hyprpaper + hyprlock + brightnessctl waybar kitty wofi @@ -154,13 +156,14 @@ enable_sddm() { install_sddm_theme() { log_info "Installing SDDM theme..." + if pacman -Q where-is-my-sddm-theme-git >/dev/null 2>&1; then log_success "SDDM theme already installed." return fi sudo -u "$ORIG_USER" mkdir -p "$ORIG_HOME/Repositories" - cd "$ORIG_HOME/Repositories" + cd "$ORIG_HOME/Repositories" || return if [ ! -d "where-is-my-sddm-theme" ]; then sudo -u "$ORIG_USER" git clone https://aur.archlinux.org/where-is-my-sddm-theme-git.git where-is-my-sddm-theme @@ -168,8 +171,12 @@ install_sddm_theme() { log_warn "Theme repo already exists, skipping clone." fi - cd "$ORIG_HOME/Repositories/where-is-my-sddm-theme" + cd "$ORIG_HOME/Repositories/where-is-my-sddm-theme" || return sudo -u "$ORIG_USER" makepkg -si --noconfirm + + log_info "Cleaning up theme repository..." + rm -rf "$ORIG_HOME/Repositories/where-is-my-sddm-theme" + log_success "SDDM theme installed and repo removed." } run_dotfiles_setup() { diff --git a/home/.config/hypr/hyprland.conf b/home/.config/hypr/hyprland.conf index 0740b9a..23e20af 100644 --- a/home/.config/hypr/hyprland.conf +++ b/home/.config/hypr/hyprland.conf @@ -262,6 +262,12 @@ bindl = , mouse:281, exec, playerctl previous # Screenshots bind = , Print, exec, $screenshot +# Lock +bind = $mainMod, l, exec, hyprlock + +# Lock lid on close +bindl=,switch:on:Lid Switch, exec, hyprlock --immediate + ############################## ### WINDOWS AND WORKSPACES ### ############################## diff --git a/home/.config/hypr/hyprlock.conf b/home/.config/hypr/hyprlock.conf new file mode 100644 index 0000000..863c278 --- /dev/null +++ b/home/.config/hypr/hyprlock.conf @@ -0,0 +1,40 @@ +# BACKGROUND +background { + monitor = + color = $background + blur_passes = 2 + contrast = 1 + brightness = 0.5 + vibrancy = 0.2 + vibrancy_darkness = 0.2 +} + +# GENERAL +general { + no_fade_in = false + no_fade_out = false + hide_cursor = true + grace = 0 + disable_loading_bar = false +} + +# INPUT FIELD +input-field { + monitor = + size = 250, 60 + outline_thickness = 2 + dots_size = 0.2 # Scale of input-field height, 0.2 - 0.8 + dots_spacing = 0.35 # Scale of dots' absolute size, 0.0 - 1.0 + dots_center = true + outer_color = rgba(0, 0, 0, 0) + inner_color = rgba(0, 0, 0, 0.2) + font_color = rgb(255, 255, 255) + fade_on_empty = false + rounding = -1 + check_color = rgb(204, 136, 34) + hide_input = false + position = 0, -200 + halign = center + valign = center + placeholder_text = +} diff --git a/home/.config/hypr/monitors-1.conf b/home/.config/hypr/monitors-1.conf index 3ff7294..c84dec7 100644 --- a/home/.config/hypr/monitors-1.conf +++ b/home/.config/hypr/monitors-1.conf @@ -1,7 +1,12 @@ $mainMod = SUPER # MONITORS -monitor = , preferred, auto, 1 +monitor = , preferred, auto, 1.5 + +xwayland { + force_zero_scaling = true +} + # Workspaces per monitor workspace=1,persistent:true,default:true @@ -16,4 +21,4 @@ bind=$mainMod,S,workspace,name:S1 bind=$mainMod SHIFT,S,workspace,1 # Secret workspaces -workspace=name:S1 \ No newline at end of file +workspace=name:S1 diff --git a/home/.config/mako/config b/home/.config/mako/config index b96ce70..a656a4f 100644 --- a/home/.config/mako/config +++ b/home/.config/mako/config @@ -1,22 +1,21 @@ -font=FontAwesome 13 -format=%a ⏵ %s\n%b +font=Console 13 +format=%a: %s\n%b sort=-time layer=overlay anchor=top-right width=300 -height=110 -margin=10 -padding=20 +height=220 +margin=30 +padding=10 icons=0 max-icon-size=64 default-timeout=5000 ignore-timeout=1 -# Style background-color=#1E2226 border-size=2 border-color=#4c5a66 -border-radius=10 +border-radius=0 text-color=#e0e6ed [urgency=high] diff --git a/home/.config/mimeapps.list b/home/.config/mimeapps.list index 645af6d..f0c7c73 100644 --- a/home/.config/mimeapps.list +++ b/home/.config/mimeapps.list @@ -3,11 +3,11 @@ text/html=firefox.desktop x-scheme-handler/http=firefox.desktop x-scheme-handler/https=firefox.desktop -image/jpeg=org.gnome.eog.desktop.desktop -image/png=org.gnome.eog.desktop.desktop -image/gif=org.gnome.eog.desktop.desktop -image/webp=org.gnome.eog.desktop.desktop -image/svg+xml=org.gnome.eog.desktop.desktop +image/jpeg=org.gnome.eog.desktop +image/png=org.gnome.eog.desktop +image/gif=org.gnome.eog.desktop +image/webp=org.gnome.eog.desktop +image/svg+xml=org.gnome.eog.desktop video/mp4=mpv.desktop video/x-matroska=mpv.desktop @@ -18,3 +18,17 @@ audio/mpeg=org.gnome.Lollypop.desktop audio/ogg=org.gnome.Lollypop.desktop audio/flac=org.gnome.Lollypop.desktop audio/wav=org.gnome.Lollypop.desktop + +text/plain=nvim.desktop +text/markdown=nvim.desktop +text/x-shellscript=nvim.desktop +text/x-csrc=nvim.desktop +text/x-python=nvim.desktop +text/x-java=nvim.desktop +text/x-lua=nvim.desktop +text/x-rustsrc=nvim.desktop +text/x-go=nvim.desktop +application/json=nvim.desktop +application/xml=nvim.desktop +application/x-yaml=nvim.desktop + diff --git a/home/.config/waybar/config.jsonc b/home/.config/waybar/config.jsonc index c84f490..0cf5496 100644 --- a/home/.config/waybar/config.jsonc +++ b/home/.config/waybar/config.jsonc @@ -20,7 +20,7 @@ ], "tray": { // "icon-size": 21, - "spacing": 10, + "spacing": 10 // "icons": { // "blueman": "bluetooth", // "TelegramDesktop": "$HOME/.local/share/icons/hicolor/16x16/apps/telegram.png" @@ -92,6 +92,7 @@ "menu-actions": { "shutdown": "shutdown -P now", "reboot": "reboot", + "lock": "hyprlock", "suspend": "systemctl suspend", "hibernate": "systemctl hibernate" } diff --git a/home/.config/waybar/power_menu.xml b/home/.config/waybar/power_menu.xml index 6d68e54..0b5be54 100644 --- a/home/.config/waybar/power_menu.xml +++ b/home/.config/waybar/power_menu.xml @@ -14,6 +14,14 @@ + + + Lock + + + + + Suspend @@ -25,4 +33,4 @@ - \ No newline at end of file + diff --git a/home/.config/waybar/style.css b/home/.config/waybar/style.css index da56d5e..b42d234 100644 --- a/home/.config/waybar/style.css +++ b/home/.config/waybar/style.css @@ -88,6 +88,10 @@ button:hover { background-color: rgba(76, 90, 102, 1); } +#battery { + background-color: rgba(76, 90, 102, 1); +} + #cpu { background-color: rgba(76, 90, 102, 1); } diff --git a/system_files/usr/lib/sddm/sddm.conf.d/default.conf b/system_files/usr/lib/sddm/sddm.conf.d/default.conf index 13d51d6..67409e6 100644 --- a/system_files/usr/lib/sddm/sddm.conf.d/default.conf +++ b/system_files/usr/lib/sddm/sddm.conf.d/default.conf @@ -12,7 +12,7 @@ User= [General] # Which display server should be used. # Valid values are: x11, x11-user, wayland. Wayland support is experimental -DisplayServer=x11 +DisplayServer=wayland # Comma-separated list of environment variables to be set GreeterEnvironment=