diff --git a/build.sh b/build.sh index 5cca700..e270ef1 100755 --- a/build.sh +++ b/build.sh @@ -34,7 +34,7 @@ SYSTEM_TOOLS=" vim neovim ranger - bashtop + htop " DISPLAY_MANAGER=" @@ -148,23 +148,25 @@ install_system_files() { } apply_gtk_settings() { - log_info "Applying GTK settings..." - export XDG_RUNTIME_DIR="/run/user/$(id -u "$ORIG_USER")" - DBUS_ADDR="unix:path=${XDG_RUNTIME_DIR}/bus" + : + # JUST CHECKING IF .config/gtk4.0/settings.ini ACTUALLY WORKS + # log_info "Applying GTK settings..." + # export XDG_RUNTIME_DIR="/run/user/$(id -u "$ORIG_USER")" + # DBUS_ADDR="unix:path=${XDG_RUNTIME_DIR}/bus" - for setting in \ - "org.gnome.desktop.interface gtk-theme Orchis-Dark-Compact" \ - "org.gnome.desktop.interface icon-theme Orchis-Dark-Compact" \ - "org.gnome.desktop.interface color-scheme prefer-dark" - do - if sudo -u "$ORIG_USER" \ - DBUS_SESSION_BUS_ADDRESS="$DBUS_ADDR" \ - gsettings set $setting; then - log_success "Set $setting" - else - log_warn "Failed to set $setting" - fi - done + # for setting in \ + # "org.gnome.desktop.interface gtk-theme Graphite-Dark-compact" \ + # "org.gnome.desktop.interface icon-theme Tela-grey-dark" \ + # "org.gnome.desktop.interface color-scheme prefer-dark" + # do + # if sudo -u "$ORIG_USER" \ + # DBUS_SESSION_BUS_ADDRESS="$DBUS_ADDR" \ + # gsettings set $setting; then + # log_success "Set $setting" + # else + # log_warn "Failed to set $setting" + # fi + # done } enable_sddm() { @@ -197,6 +199,56 @@ install_sddm_theme() { log_success "SDDM theme installed and repo removed." } +install_gtk_theme() { + log_info "Installing GTK theme..." + + if [ -d "$ORIG_HOME/.themes/Graphite-Dark-compact" ]; then + log_success "GTK theme already installed." + return + fi + + sudo -u "$ORIG_USER" mkdir -p "$ORIG_HOME/Repositories" + cd "$ORIG_HOME/Repositories" || return + + if [ ! -d "graphite-gtk" ]; then + sudo -u "$ORIG_USER" git clone https://github.com/vinceliuice/Graphite-gtk-theme.git graphite-gtk + else + log_warn "Theme repo already exists, skipping clone." + fi + + cd "$ORIG_HOME/Repositories/graphite-gtk" || return + sudo -u "$ORIG_USER" ./install.sh -c dark --tweaks rimless --size compact --round 0px + + log_info "Cleaning up theme repository..." + rm -rf "$ORIG_HOME/Repositories/graphite-gtk" + log_success "GTK theme installed and repo removed." +} + +install_gtk_icons() { + log_info "Installing Tela icons..." + + if [ -d "$ORIG_HOME/.local/share/icons/Tela-grey-dark" ]; then + log_success "GTK theme already installed." + return + fi + + sudo -u "$ORIG_USER" mkdir -p "$ORIG_HOME/Repositories" + cd "$ORIG_HOME/Repositories" || return + + if [ ! -d "tela-icons" ]; then + sudo -u "$ORIG_USER" git clone https://github.com/vinceliuice/Tela-icon-theme.git tela-icons + else + log_warn "Theme repo already exists, skipping clone." + fi + + cd "$ORIG_HOME/Repositories/tela-icons" || return + sudo -u "$ORIG_USER" ./install.sh -c grey + + log_info "Cleaning up icons repository..." + rm -rf "$ORIG_HOME/Repositories/tela-icons" + log_success "Tela icons installed and repo removed." +} + run_dotfiles_setup() { log_info "Running dotfiles setup..." cd "$ORIG_PWD" @@ -244,14 +296,16 @@ run_dotfiles_setup() { } # === Main flow === -update_system -install_packages -install_nvidia_drivers -apply_gtk_settings -install_sddm_theme -install_system_files +# update_system +# install_packages +# install_nvidia_drivers +# install_gtk_theme +# install_gtk_icons +# apply_gtk_settings +# install_sddm_theme +# install_system_files run_dotfiles_setup -enable_sddm +# enable_sddm log_success "Setup completed successfully." diff --git a/home/.config/gtk-3.0/settings.ini b/home/.config/gtk-3.0/settings.ini index 5e26d44..ceebbe9 100644 --- a/home/.config/gtk-3.0/settings.ini +++ b/home/.config/gtk-3.0/settings.ini @@ -1,5 +1,5 @@ [Settings] -gtk-icon-theme-name = Orchis-Dark-Compact -gtk-theme-name = Orchis-Dark-Compact +gtk-icon-theme-name = Graphite-Dark-compact +gtk-theme-name = Tela-grey-dark gtk-font-name = Console Sans 11 gtk-application-prefer-dark-theme = true diff --git a/home/.config/gtk-4.0/settings.ini b/home/.config/gtk-4.0/settings.ini new file mode 100644 index 0000000..ceebbe9 --- /dev/null +++ b/home/.config/gtk-4.0/settings.ini @@ -0,0 +1,5 @@ +[Settings] +gtk-icon-theme-name = Graphite-Dark-compact +gtk-theme-name = Tela-grey-dark +gtk-font-name = Console Sans 11 +gtk-application-prefer-dark-theme = true diff --git a/home/.config/hypr/hyprland.conf b/home/.config/hypr/hyprland.conf index 85b1af0..13b1868 100644 --- a/home/.config/hypr/hyprland.conf +++ b/home/.config/hypr/hyprland.conf @@ -70,8 +70,8 @@ general { border_size = 5 # https://wiki.hyprland.org/Configuring/Variables/#variable-types for info about colors - col.active_border = rgb(4a5a6b) rgb(3a3f45) 45deg - col.inactive_border = rgba(595959aa) + col.active_border = rgb(C4B02F) rgb(1C1E1F) 30deg + col.inactive_border = rgba(aeb3ad66) # Set to true enable resizing windows by clicking and dragging on borders and gaps resize_on_border = false diff --git a/home/.config/hypr/hyprlock.conf b/home/.config/hypr/hyprlock.conf index 863c278..6d956f5 100644 --- a/home/.config/hypr/hyprlock.conf +++ b/home/.config/hypr/hyprlock.conf @@ -1,12 +1,12 @@ # BACKGROUND background { monitor = - color = $background + color = rgb(242425) blur_passes = 2 contrast = 1 brightness = 0.5 - vibrancy = 0.2 - vibrancy_darkness = 0.2 + vibrancy = 0.1696 + vibrancy_darkness = 0.05 } # GENERAL @@ -23,18 +23,32 @@ 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_size = 0.2 + dots_spacing = 0.35 dots_center = true - outer_color = rgba(0, 0, 0, 0) - inner_color = rgba(0, 0, 0, 0.2) - font_color = rgb(255, 255, 255) + outer_color = rgb(1C1E1F) + inner_color = rgb(1C1E1F) + font_color = rgb(E0E6ED) fade_on_empty = false rounding = -1 - check_color = rgb(204, 136, 34) + check_color = rgb(E04040) + fail_color = rgb(E04040) hide_input = false position = 0, -200 halign = center valign = center placeholder_text = + fail_text = +} + +# TIME +label { + monitor = + text = cmd[update:1000] echo " $(date +"%H:%M:%S") " + color = rgb(E0E6ED) + font_size = 94 + font_family = Console + position = 0, 300 + halign = center + valign = center } diff --git a/home/.config/kitty/kitty.conf b/home/.config/kitty/kitty.conf index f1448cb..3525cf7 100644 --- a/home/.config/kitty/kitty.conf +++ b/home/.config/kitty/kitty.conf @@ -1,4 +1,4 @@ -font_family Terminus +font_family family="JetBrains Mono" bold_font auto italic_font auto bold_italic_font auto diff --git a/home/.config/mako/config b/home/.config/mako/config index a656a4f..2b80c71 100644 --- a/home/.config/mako/config +++ b/home/.config/mako/config @@ -12,12 +12,12 @@ max-icon-size=64 default-timeout=5000 ignore-timeout=1 -background-color=#1E2226 -border-size=2 -border-color=#4c5a66 +background-color=#242425 +border-size=3 +border-color=#C4B02F border-radius=0 text-color=#e0e6ed [urgency=high] -border-color=#bf616a +border-color=#E04040 default-timeout=0 diff --git a/home/.config/waybar/config.jsonc b/home/.config/waybar/config.jsonc index 0cf5496..a47875f 100644 --- a/home/.config/waybar/config.jsonc +++ b/home/.config/waybar/config.jsonc @@ -33,10 +33,7 @@ }, "cpu": { "format": "{usage}% ", - "tooltip": false - }, - "memory": { - "format": "{}% " + "tooltip": true }, "battery": { "states": { diff --git a/home/.config/waybar/power_menu.xml b/home/.config/waybar/power_menu.xml index 0b5be54..fb8d591 100644 --- a/home/.config/waybar/power_menu.xml +++ b/home/.config/waybar/power_menu.xml @@ -3,12 +3,14 @@ - Shutdown + Power Off + Terminate all systems and cut power supply Reboot + Reinitialize system components @@ -17,6 +19,7 @@ Lock + Secure session and block access @@ -25,11 +28,7 @@ Suspend - - - - - Hibernate + Pause system operations, maintain minimal power diff --git a/home/.config/waybar/style.css b/home/.config/waybar/style.css index b42d234..b81e57c 100644 --- a/home/.config/waybar/style.css +++ b/home/.config/waybar/style.css @@ -4,9 +4,9 @@ } window#waybar { - background-color: rgba(30, 34, 38, 1); - border-bottom: 2px solid #4c5a66; - color: #e0e6ed; + background-color: rgba(28, 30, 31, 1); + border-bottom: 2px solid rgba(28, 30, 31, 1); + color: rgba(224, 230, 237, 1); transition: background-color 0.5s; } @@ -14,62 +14,17 @@ window#waybar.hidden { opacity: 0.2; } -button { - box-shadow: inset 0 -2px transparent; - border: none; - border-radius: 0; -} - -button:hover { - background: rgba(76, 90, 102, 0.2); - box-shadow: inset 0 -2px #90a4b8; -} - -#workspaces button { - padding: 0 5px; - background-color: transparent; - color: #cbd3db; -} - -#workspaces button:hover { - background: rgba(144, 164, 184, 0.1); -} - -#workspaces button.focused { - background-color: #3b4651; - box-shadow: inset 0 -2px #90a4b8; - color: #ffffff; -} - -#workspaces button.urgent { - background-color: #b03c3c; - color: #ffffff; -} - -#mode { - background-color: #3b4651; - box-shadow: inset 0 -2px #90a4b8; - color: #ffffff; -} - #clock, #battery, #cpu, -#temperature, -#backlight, #network, #pulseaudio, -#custom-media, -#tray, -#mode, -#scratchpad, -#keyboard-state { +#tray{ padding: 0 10px; - color: #e0e6ed; + color: rgba(224, 230, 237, 1); } -#window, -#workspaces { +#window { margin: 0 4px; } @@ -81,42 +36,42 @@ button:hover { } #clock { - background-color: rgba(76, 90, 102, 1); + background-color: rgba(28, 30, 31, 1); } #custom-power { - background-color: rgba(76, 90, 102, 1); + background-color: rgba(224, 64, 64, 1); } #battery { - background-color: rgba(76, 90, 102, 1); + background-color: rgba(28, 30, 31, 1); } #cpu { - background-color: rgba(76, 90, 102, 1); + background-color: rgba(28, 30, 31, 1); } #network { - background-color: rgba(76, 90, 102, 1); + background-color: rgba(28, 30, 31, 1); } #network.disconnected { - background-color: rgba(176, 60, 60, 1); + background-color: rgba(224, 64, 64, 1); } #pulseaudio { - background-color: rgba(76, 90, 102, 1); + background-color: rgba(28, 30, 31, 1); } #pulseaudio.muted { - background-color: rgba(47, 57, 66, 1); - color: #aab4be; + background-color: rgba(28, 30, 31, 1); + color: rgba(174, 179, 173, 1); } #tray { - background-color: rgba(76, 90, 102, 1); + background-color: rgba(28, 30, 31, 1); } #tray > .needs-attention { - background-color: rgba(176, 60, 60, 1); + background-color: rgba(224, 64, 64, 1); } diff --git a/home/.config/wofi/style.css b/home/.config/wofi/style.css index ded3cb0..73260ae 100644 --- a/home/.config/wofi/style.css +++ b/home/.config/wofi/style.css @@ -1,30 +1,33 @@ * { font-family: FontAwesome; font-size: 13px; - color: #e0e6ed; + color: #E0E6ED; + /* border-radius: 0; */ } window { margin: 10px; - border: 2px solid #4c5a66; - background-color: rgba(30, 34, 38, 0.9); + border: 4px solid #1C1E1F; + background-color: #242425; padding: 20px; - border-top-left-radius: 10px; - border-top-right-radius: 10px; } #input { margin: 5px; padding: 1px 5px; - border: 1px solid #90a4b8; - background-color: #2f3942; - color: #e0e6ed; - border-radius: 7px; + /* border: 2px solid #E0E6ED; */ + background-color: #242425; + color: #E0E6ED; + /* border-radius: 7px; */ +} + +#input:focus{ + box-shadow: none; } #inner-box { - margin: 0px; - background-color: rgba(30 34 38, 0.75); + margin: 10px; + /* background-color: rgba(30 34 38, 0.75); */ border: none; } @@ -35,7 +38,6 @@ window { #scroll { display: none; - margin: 5px; background-color: transparent; } @@ -44,9 +46,9 @@ window { } #entry:selected { - background-color: #3b4651; - border-left: 3px solid #90a4b8; - color: #ffffff; + /* background-color: #AEB3AD; */ + border-left: 3px solid #E0E6ED; + color: #E0E6ED; } #entry { @@ -54,4 +56,3 @@ window { margin: 2px 0; background-color: transparent; } - diff --git a/home/Pictures/wallpaper.png b/home/Pictures/wallpaper.png index 9b20f73..c5c2b16 100644 Binary files a/home/Pictures/wallpaper.png and b/home/Pictures/wallpaper.png differ diff --git a/system_files/usr/share/sddm/themes/where_is_my_sddm_theme/theme.conf b/system_files/usr/share/sddm/themes/where_is_my_sddm_theme/theme.conf index 0a442cf..e23433b 100644 --- a/system_files/usr/share/sddm/themes/where_is_my_sddm_theme/theme.conf +++ b/system_files/usr/share/sddm/themes/where_is_my_sddm_theme/theme.conf @@ -6,14 +6,14 @@ passwordMask=true # value "1" is all display width, "0.5" is a half of display width etc. passwordInputWidth=0.33 # Background color of password input -passwordInputBackground=#a0a0a0 +passwordInputBackground=#242425 # Radius of password input corners passwordInputRadius=7 # "true" for visible cursor, "false" for invisible passwordInputCursorVisible=true # Font size of password (in points) passwordFontSize=28 -passwordCursorColor=#ffffff +passwordCursorColor=#E0E6ED passwordTextColor= # Show or not sessions choose label @@ -29,13 +29,13 @@ usersFontSize=32 # Path to background image background= # Or use just one color -backgroundFill=#404040 +backgroundFill=#1C1E1F # Fill mode for image background # Value must be on of: aspect, fill, tile, pad backgroundFillMode=aspect # Default text color for all labels -basicTextColor=#ffffff +basicTextColor=#E0E6ED # Radius of background blur blurRadius= \ No newline at end of file