diff --git a/.config/hypr/config/settings/General.conf b/.config/hypr/config/settings/General.conf index c14ff18..2d93a99 100644 --- a/.config/hypr/config/settings/General.conf +++ b/.config/hypr/config/settings/General.conf @@ -1,5 +1,5 @@ general { resize_on_border = true - layout = dwindle + layout = master } diff --git a/.config/hypr/config/settings/Master.conf b/.config/hypr/config/settings/Master.conf index 39a20c5..5bc59b7 100644 --- a/.config/hypr/config/settings/Master.conf +++ b/.config/hypr/config/settings/Master.conf @@ -1,5 +1,6 @@ master { - new_status = master + new_status = slave new_on_top = 1 - mfact = 0.5 + mfact = 0.7 + orientation = center } diff --git a/.config/hypr/hyprlock.conf b/.config/hypr/hyprlock.conf index d59b9af..7e90b1c 100755 --- a/.config/hypr/hyprlock.conf +++ b/.config/hypr/hyprlock.conf @@ -3,9 +3,11 @@ # Original config submitted by https://github.com/SherLock707 # Sourcing colors generated by wallust -source = $HOME/.config/hypr/wallust/wallust-hyprland.conf +source = $HOME/.cache/wal/hyprland.conf $Scripts = $HOME/.config/hypr/scripts +$foreground = rgb(213,196,161) + general { grace = 1 } @@ -17,10 +19,10 @@ background { blur_passes = 1 # 0 disables blurring noise = 0.0117 contrast = 1.3000 # Vibrant!!! - brightness = 0.8000 vibrancy = 0.2100 vibrancy_darkness = 0.0 - color: $color8 + color = $background + path = $HOME/.cache/wallpaper } @@ -80,7 +82,7 @@ label { label { monitor = text =  $USER - color = $color13 + color = $foreground outline_thickness = 2 dots_size = 0.2 # Scale of input-field height, 0.2 - 0.8 dots_spacing = 0.2 # Scale of dots' absolute size, 0.0 - 1.0 @@ -103,10 +105,10 @@ input-field { dots_center = true outer_color = rgba(0, 0, 0, 0) inner_color = rgba(255, 255, 255, 0.33) - font_color = $color11 + font_color = $foreground fade_on_empty = false font_family = JetBrainsMono Nerd Font ExtraBold - placeholder_text = 🔒 Type Password + placeholder_text = 🔒 Type Password hide_input = false position = 0, -260 halign = center @@ -117,7 +119,7 @@ input-field { label { monitor = text = cmd[update:60000] echo " "$(uptime -p || $Scripts/UptimeNixOS.sh)" " - color = $color13 + color = $foreground font_size = 18 font_family = JetBrainsMono Nerd Font ExtraBold position = -20, 20 @@ -131,7 +133,7 @@ label { label { monitor = text = cmd[update:3600000] [ -f ~/.cache/.weather_cache ] && cat ~/.cache/.weather_cache - color = $color13 + color = $foreground font_size = 18 font_family = JetBrainsMono Nerd Font ExtraBold position = 20, 20 diff --git a/.config/wal/templates/hyprland.conf b/.config/wal/templates/hyprland.conf new file mode 100644 index 0000000..1e16e14 --- /dev/null +++ b/.config/wal/templates/hyprland.conf @@ -0,0 +1,37 @@ +$background = rgb({background.rgb}) +$foreground = rgb({foreground.rgb}) +$color0 = rgb({color0.rgb}) +$color1 = rgb({color1.rgb}) +$color2 = rgb({color2.rgb}) +$color3 = rgb({color3.rgb}) +$color4 = rgb({color4.rgb}) +$color5 = rgb({color5.rgb}) +$color6 = rgb({color6.rgb}) +$color7 = rgb({color7.rgb}) +$color8 = rgb({color8.rgb}) +$color9 = rgb({color9.rgb}) +$color10 = rgb({color10.rgb}) +$color11 = rgb({color11.rgb}) +$color12 = rgb({color12.rgb}) +$color13 = rgb({color13.rgb}) +$color14 = rgb({color14.rgb}) +$color15 = rgb({color15.rgb}) + +$background_rgb = {background.rgb} +$foreground_rgb = {foreground.rgb} +$color0_rgb = {color0.rgb} +$color1_rgb = {color1.rgb} +$color2_rgb = {color2.rgb} +$color3_rgb = {color3.rgb} +$color4_rgb = {color4.rgb} +$color5_rgb = {color5.rgb} +$color6_rgb = {color6.rgb} +$color7_rgb = {color7.rgb} +$color8_rgb = {color8.rgb} +$color9_rgb = {color9.rgb} +$color10_rgb = {color10.rgb} +$color11_rgb = {color11.rgb} +$color12_rgb = {color12.rgb} +$color13_rgb = {color13.rgb} +$color14_rgb = {color14.rgb} +$color15_rgb = {color15.rgb} diff --git a/.config/wal/templates/zathura.conf b/.config/wal/templates/zathura.conf new file mode 100644 index 0000000..d46c35e --- /dev/null +++ b/.config/wal/templates/zathura.conf @@ -0,0 +1,20 @@ +set default-bg \{background} +set default-fg \{foreground} +set completion-bg \{color8} +set completion-fg \{foreground} +set completion-highlight-bg \{color13} +set completion-highlight-fg \{background} +set inputbar-bg \{color8} +set inputbar-fg \{foreground} + +set notification-bg \{foreground} +set notification-fg \{background} +set notification-error-bg \{color1} +set notification-error-fg \{foreground} +set notification-warning-bg \{color3} +set notification-warning-fg \{foreground} + +set statusbar-bg \{color8} +set statusbar-fg \{foreground} + + diff --git a/.config/yadm/_set_class.sh b/.config/yadm/_set_class.sh index d776125..65f55c7 100755 --- a/.config/yadm/_set_class.sh +++ b/.config/yadm/_set_class.sh @@ -2,6 +2,7 @@ class=$(yadm config local.class) if [[ ! -z $class ]]; then + yadm alt exit 0 fi diff --git a/.config/yadm/apply_changes b/.config/yadm/apply_changes new file mode 100755 index 0000000..6673862 --- /dev/null +++ b/.config/yadm/apply_changes @@ -0,0 +1,7 @@ +#!/bin/env sh + +echo "# Refreshing darkman (bruteforce method)" +darkman toggle +darkman toggle + +echo "# Reloading hyprland config (sometimes it gets stuck due to yadms alts)" diff --git a/.config/yadm/bootstrap b/.config/yadm/bootstrap index 4393064..3fd422b 100755 --- a/.config/yadm/bootstrap +++ b/.config/yadm/bootstrap @@ -102,4 +102,7 @@ done < <(find -L "$BOOTSTRAP_D" -type f | sort) for bootstrap in "${bootstraps[@]}"; do runfile "$bootstrap" done + +"$SCRIPTPATH/apply_changes" + display "Bootstrap completed" diff --git a/.config/yadm/bootstrap.d/02-AMDGPUDrivers.sh b/.config/yadm/bootstrap.d/02-AMDGPUDrivers.sh##class.PC similarity index 100% rename from .config/yadm/bootstrap.d/02-AMDGPUDrivers.sh rename to .config/yadm/bootstrap.d/02-AMDGPUDrivers.sh##class.PC diff --git a/.config/yadm/config b/.config/yadm/config index a7587d2..55ae941 100644 --- a/.config/yadm/config +++ b/.config/yadm/config @@ -1,2 +1,2 @@ [yadm] - auto-alt = false + auto-alt = true diff --git a/.config/zathura/zathurarc b/.config/zathura/zathurarc new file mode 100644 index 0000000..edd6b23 --- /dev/null +++ b/.config/zathura/zathurarc @@ -0,0 +1,5 @@ +include ../../.cache/wal/zathura.conf + +set font jetbrainsmono normal 9 +set guioptions sv + diff --git a/.gitignore b/.gitignore index 89a227c..0a0d915 100644 --- a/.gitignore +++ b/.gitignore @@ -32,6 +32,8 @@ !/.config/hyprswitch /.config/hyprswitch/style.css /.config/hyprswitch/style.css.map +!/.config/wal/ +!/.config/zathura/ !/.ssh/ /.ssh/* diff --git a/.local/share/dark-mode.d/themes.sh b/.local/share/dark-mode.d/themes.sh index 0bb98cf..c53d620 100755 --- a/.local/share/dark-mode.d/themes.sh +++ b/.local/share/dark-mode.d/themes.sh @@ -1,5 +1,7 @@ #!/bin/env sh +WALLPAPER_PATH="$HOME/.local/share/dark-mode.d/theme-background.jpg" + gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark' gsettings set org.gnome.desktop.interface gtk-theme "Gruvbox-Orange-Dark" @@ -8,4 +10,5 @@ wal --theme base16-gruvbox-medium $HOME/.config/theming/compile.sh $HOME/.config/theming/update.sh -swww img $HOME/.local/share/dark-mode.d/theme-background.jpg +swww img $WALLPAPER_PATH +ln -s -f $WALLPAPER_PATH $HOME/.cache/wallpaper diff --git a/.local/share/light-mode.d/themes.sh b/.local/share/light-mode.d/themes.sh index f8f0094..d45936d 100755 --- a/.local/share/light-mode.d/themes.sh +++ b/.local/share/light-mode.d/themes.sh @@ -1,11 +1,12 @@ #!/bin/env sh +WALLPAPER_PATH="$HOME/.local/share/light-mode.d/theme-background.png" gsettings set org.gnome.desktop.interface color-scheme 'prefer-light' gsettings set org.gnome.desktop.interface gtk-theme "Gruvbox-Orange-Light" wal -l --theme base16-gruvbox-medium +swww img $WALLPAPER_PATH +ln -s -f $WALLPAPER_PATH $HOME/.cache/wallpaper $HOME/.config/theming/compile.sh $HOME/.config/theming/update.sh - -swww img $HOME/.local/share/light-mode.d/theme-background.png diff --git a/.zshrc b/.zshrc index 879aedf..84b00f9 100644 --- a/.zshrc +++ b/.zshrc @@ -1,6 +1,6 @@ export ZSH="$HOME/.oh-my-zsh" ZSH_THEME="agnoster" -plugins=(git fzf history npm zoxide sudo node colorize) +plugins=(git fzf history npm zoxide sudo node colorize colored-man-pages) source ~/.config/terminal/.setuprc source $ZSH/oh-my-zsh.sh