From 894c6c2a9a3f4306a1b25257c9f97184c5bba047 Mon Sep 17 00:00:00 2001 From: Trimutex Date: Thu, 25 Jan 2024 02:04:27 -0600 Subject: [PATCH] Updated hyprland and alacritty --- alacritty/alacritty.toml | 44 +++++++++++++++++++-- hypr/frappe.conf | 61 ++++++++++++++++++++++++++++ hypr/hyprland.conf | 52 ++++-------------------- hypr/theme.conf | 85 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 193 insertions(+), 49 deletions(-) create mode 100644 hypr/frappe.conf create mode 100644 hypr/theme.conf diff --git a/alacritty/alacritty.toml b/alacritty/alacritty.toml index b5fbd2f..0a13a57 100644 --- a/alacritty/alacritty.toml +++ b/alacritty/alacritty.toml @@ -1,13 +1,49 @@ -import = ["~/.config/alacritty/catppuccin/catppuccin-frappe.toml"] +import = ["/home/trianta/.config/alacritty/catppuccin/catppuccin-frappe.toml"] [cursor.style] shape = "Underline" +[env] +TERM = "xterm-256color" + [font] -size = 23 +size = 10 + +[colors] +footer_bar = { foreground = "#181818", background = "#d8d8d8" } [font.normal] -family = "Hack Nerd Font" +family = "HackNerdFont" + +[[keyboard.bindings]] +action = "ScrollPageUp" +key = "PageUp" +mode = "~Alt" +mods = "Shift" + +[[keyboard.bindings]] +action = "ScrollPageDown" +key = "PageDown" +mode = "~Alt" +mods = "Shift" + +[[keyboard.bindings]] +action = "ScrollToTop" +key = "Home" +mode = "~Alt" +mods = "Shift" + +[[keyboard.bindings]] +action = "ScrollToBottom" +key = "End" +mode = "~Alt" +mods = "Shift" + +[shell] +args = ["--login"] +program = "/bin/zsh" [window] -opacity = 0.2 +opacity = 0.5 +padding = {x = 25, y = 25} + diff --git a/hypr/frappe.conf b/hypr/frappe.conf new file mode 100644 index 0000000..97dff8e --- /dev/null +++ b/hypr/frappe.conf @@ -0,0 +1,61 @@ +$rosewaterAlpha = f2d5cf +$flamingoAlpha = eebebe +$pinkAlpha = f4b8e4 +$mauveAlpha = ca9ee6 +$redAlpha = e78284 +$maroonAlpha = ea999c +$peachAlpha = ef9f76 +$yellowAlpha = e5c890 +$greenAlpha = a6d189 +$tealAlpha = 81c8be +$skyAlpha = 99d1db +$sapphireAlpha = 85c1dc +$blueAlpha = 8caaee +$lavenderAlpha = babbf1 + +$textAlpha = c6d0f5 +$subtext1Alpha = b5bfe2 +$subtext0Alpha = a5adce + +$overlay2Alpha = 949cbb +$overlay1Alpha = 838ba7 +$overlay0Alpha = 737994 + +$surface2Alpha = 626880 +$surface1Alpha = 51576d +$surface0Alpha = 414559 + +$baseAlpha = 303446 +$mantleAlpha = 292c3c +$crustAlpha = 232634 + +$rosewater = 0xfff2d5cf +$flamingo = 0xffeebebe +$pink = 0xfff4b8e4 +$mauve = 0xffca9ee6 +$red = 0xffe78284 +$maroon = 0xffea999c +$peach = 0xffef9f76 +$yellow = 0xffe5c890 +$green = 0xffa6d189 +$teal = 0xff81c8be +$sky = 0xff99d1db +$sapphire = 0xff85c1dc +$blue = 0xff8caaee +$lavender = 0xffbabbf1 + +$text = 0xffc6d0f5 +$subtext1 = 0xffb5bfe2 +$subtext0 = 0xffa5adce + +$overlay2 = 0xff949cbb +$overlay1 = 0xff838ba7 +$overlay0 = 0xff737994 + +$surface2 = 0xff626880 +$surface1 = 0xff51576d +$surface0 = 0xff414559 + +$base = 0xff303446 +$mantle = 0xff292c3c +$crust = 0xff232634 diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index 1aa01b0..561c047 100755 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -2,11 +2,12 @@ monitor=,highrr,auto,1.00 # Startup -exec-once = hyprpaper exec-once = waybar -c ~/.config/waybar/config.json exec-once = pulseaudio exec-once = linux-discord-rich-presence --config ~/.config/linux-discord-rich-presencerc exec-once = syncthing --no-browser +exec-once = dunst +exec-once = swww init # Settings input { @@ -25,37 +26,6 @@ input { sensitivity = 0 } -general { - gaps_in = 5 - gaps_out = 10 - border_size = 0 - layout = dwindle -} - -decoration { - rounding = 10 - blur { - enabled = false - size = 3 - passes = 1 - } - drop_shadow = false - shadow_range = 4 - shadow_render_power = 3 - col.shadow = rgba(1a1a1aee) - active_opacity = 0.75 - inactive_opacity = 0.75 -} - -animations { - enabled = yes - animation = windows, 1, 8, default - animation = windowsOut, 1, 8, default - animation = border, 1, 8, default - animation = borderangle, 1, 8, default - animation = fade, 1, 8, default - animation = workspaces, 1, 8, default, slidefade 80% -} dwindle { pseudotile = yes @@ -70,31 +40,21 @@ gestures { workspace_swipe = off } -misc { - vfr = true - disable_hyprland_logo = true - disable_splash_rendering = true - force_default_wallpaper = 0 -} - -device:epic-mouse-v1 { - sensitivity = -0.5 -} - # Window rules windowrule = float, ^(SnakePlusPlus)$ windowrule = center, ^(SnakePlusPlus)$ +windowrulev2 = opacity 1.0 override, class:(steam_app.*)$ # General binds $mainMod = SUPER bind = $mainMod, RETURN, exec, alacritty bind = $mainMod SHIFT, P, pseudo bind = $mainMod SHIFT, Q, killactive -bind = $mainMod SHIFT, L, exec, swaylock -e -c 000000 +bind = $mainMod SHIFT, L, exec, swaylock bind = $mainMod, M, exit, bind = $mainMod, F, fullscreen bind = $mainMod, SPACE, togglefloating -bind = $mainMod, S, exec, wofi --show drun +bind = $mainMod, S, exec, pkill -x rofi || rofi -show drun bind = $mainMod SHIFT, S, exec, hyprshot -m region --clipboard-only # Laptop binds @@ -135,3 +95,5 @@ binde = $mainMod, left, resizeactive, -10 0 binde = $mainMod, up, resizeactive, 0 -10 binde = $mainMod, down, resizeactive, 0 10 +# Sources +source = ~/.config/hypr/theme.conf diff --git a/hypr/theme.conf b/hypr/theme.conf new file mode 100644 index 0000000..a72a6f0 --- /dev/null +++ b/hypr/theme.conf @@ -0,0 +1,85 @@ +# Cursor + +exec = hyprctl setcursor Catppuccin-Mocha-Lavender 24 +exec = gsettings set org.gnome.desktop.interface cursor-theme 'Bibata-Modern-Ice' +exec = gsettings set org.gnome.desktop.interface cursor-size 24 + + +# Font + +exec = gsettings set org.gnome.desktop.interface font-name 'Cantarell 10' +exec = gsettings set org.gnome.desktop.interface document-font-name 'Cantarell 10' +exec = gsettings set org.gnome.desktop.interface monospace-font-name 'CaskaydiaCove Nerd Font Mono 9' +exec = gsettings set org.gnome.desktop.interface font-antialiasing 'rgba' +exec = gsettings set org.gnome.desktop.interface font-hinting 'full' + +# Theme +exec = gsettings set org.gnome.desktop.interface icon-theme 'Tela-circle-dracula' +exec = gsettings set org.gnome.desktop.interface gtk-theme 'Catppuccin-Mocha' +exec = gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark' +layerrule = blur,waybar + + +# Window Customization +source = ~/.config/hypr/frappe.conf + +general { + gaps_in = 3 + gaps_out = 8 + border_size = 3 + col.active_border = rgba(ca9ee6ff) rgba(f2d5cfff) 45deg + col.inactive_border = rgba(b4befecc) rgba(6c7086cc) 45deg + layout = dwindle + resize_on_border = true +} + +group { + col.border_active = rgba(ca9ee6ff) rgba(f2d5cfff) 45deg + col.border_inactive = rgba(b4befecc) rgba(6c7086cc) 45deg + col.border_locked_active = rgba(ca9ee6ff) rgba(f2d5cfff) 45deg + col.border_locked_inactive = rgba(b4befecc) rgba(6c7086cc) 45deg +} + +decoration { + rounding = 10 + drop_shadow = false + dim_special = 0.3 + #active_opacity = 1.0 + #inactive_opacity = 0.9 + + blur { + enabled = yes + special = true + size = 6 + passes = 3 + new_optimizations = on + ignore_opacity = on + xray = false + } +} + +animations { + enabled = yes + + # Hyprdots + 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 +} + +misc { + disable_hyprland_logo = true + disable_splash_rendering = true + force_default_wallpaper = 0 + vrr = 1 +} +