diff --git a/gtk/.gtkrc-2.0 b/gtk/.gtkrc-2.0 index 6aa4128..002f663 100644 --- a/gtk/.gtkrc-2.0 +++ b/gtk/.gtkrc-2.0 @@ -1,7 +1,3 @@ -# DO NOT EDIT! This file will be overwritten by LXAppearance. -# Any customization should be done in ~/.gtkrc-2.0.mine instead. - -include "/home/raabe/.gtkrc-2.0.mine" gtk-theme-name="Breeze-Dark" gtk-icon-theme-name="kora" gtk-font-name="Cantarell 11" diff --git a/hypr/conf/autostart.conf b/hypr/conf/autostart.conf new file mode 100644 index 0000000..9f3ef40 --- /dev/null +++ b/hypr/conf/autostart.conf @@ -0,0 +1,14 @@ +# ----------------------------------------------------- +# Autostart +# ----------------------------------------------------- + +exec-once = swww init +# exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP +# exec-once = systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP +exec-once = dunst +exec-once = ~/dotfiles/scripts/lockscreentime.sh +exec-once = ~/dotfiles/scripts/updatewal-swww.sh +exec-once = ~/dotfiles/hypr/gtk.sh +exec-once = hyprctl setcursor Bibata-Modern-Classic 24 +exec-once = ~/dotfiles/waybar/launch.sh +exec-once = wl-paste --watch cliphist store diff --git a/hypr/conf/decoration.conf b/hypr/conf/decoration.conf new file mode 100644 index 0000000..0c219a4 --- /dev/null +++ b/hypr/conf/decoration.conf @@ -0,0 +1,24 @@ +# ----------------------------------------------------- +# General window decoration +# ----------------------------------------------------- + +decoration { + rounding = 10 + blur { + enabled = true + size = 6 + passes = 2 + new_optimizations = on + ignore_opacity = true + xray = true + # blurls = waybar + } + active_opacity = 1.0 + inactive_opacity = 0.8 + fullscreen_opacity = 1.0 + + drop_shadow = true + shadow_range = 30 + shadow_render_power = 3 + col.shadow = 0x66000000 +} diff --git a/hypr/conf/environment.conf b/hypr/conf/environment.conf new file mode 100644 index 0000000..9109f47 --- /dev/null +++ b/hypr/conf/environment.conf @@ -0,0 +1,7 @@ +# ----------------------------------------------------- +# Environment Variables +# ----------------------------------------------------- + +env = WLR_NO_HARDWARE_CURSORS, 1 +env = WLR_RENDERER_ALLOW_SOFTWARE, 1 +env = XCURSOR_SIZE,24 diff --git a/hypr/conf/keyboard.conf b/hypr/conf/keyboard.conf new file mode 100644 index 0000000..7d23688 --- /dev/null +++ b/hypr/conf/keyboard.conf @@ -0,0 +1,16 @@ +# ----------------------------------------------------- +# Keyboard layout and mouse +# ----------------------------------------------------- + +input { + kb_layout = $keyboardlayout + kb_variant = + kb_model = + kb_options = + kb_rules = + follow_mouse = 1 + touchpad { + natural_scroll = false + } + sensitivity = 0 # -1.0 - 1.0, 0 means no modification. +} diff --git a/hypr/conf/layouts.conf b/hypr/conf/layouts.conf new file mode 100644 index 0000000..0ebf764 --- /dev/null +++ b/hypr/conf/layouts.conf @@ -0,0 +1,20 @@ +# ----------------------------------------------------- +# Layouts +# ----------------------------------------------------- + +dwindle { + pseudotile = true + preserve_split = true +} + +master { + new_is_master = true +} + +gestures { + workspace_swipe = false +} + +device:epic-mouse-v1 { + sensitivity = -0.5 +} diff --git a/hypr/conf/misc.conf b/hypr/conf/misc.conf new file mode 100644 index 0000000..50b28d5 --- /dev/null +++ b/hypr/conf/misc.conf @@ -0,0 +1,8 @@ +# ----------------------------------------------------- +# Misc settings +# ----------------------------------------------------- + +misc { + disable_hyprland_logo = true + disable_splash_rendering = true +} diff --git a/hypr/conf/window.conf b/hypr/conf/window.conf new file mode 100644 index 0000000..084cd09 --- /dev/null +++ b/hypr/conf/window.conf @@ -0,0 +1,12 @@ +# ----------------------------------------------------- +# General window layout and colors +# ----------------------------------------------------- + +general { + gaps_in = 10 + gaps_out = 14 + border_size = 3 + col.active_border = $color11 + col.inactive_border = rgba(ffffffff) + layout = dwindle +} diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index a42ea0b..91e4a86 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -9,128 +9,38 @@ # ----------------------------------------------------- # ----------------------------------------------------- -# Environment Variables +# Keyboard Layout # ----------------------------------------------------- -env = WLR_NO_HARDWARE_CURSORS, 1 -env = WLR_RENDERER_ALLOW_SOFTWARE, 1 +$keyboardlayout=de +# $keyboardlayout = us # ----------------------------------------------------- # Monitor Setup # See https://wiki.hyprland.org/Configuring/Monitors/ # ----------------------------------------------------- -# monitor=,2560x1440@120,auto,1 +monitor=,2560x1440@120,auto,1 # monitor=,preferred,auto,1 -monitor=,1920x1080,auto,1 +# monitor=,1920x1080,auto,1 # ----------------------------------------------------- -# Autostart +# Autostart & Environment # ----------------------------------------------------- -exec-once = swww init -# exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP -# exec-once = systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP -exec-once = dunst -exec-once = ~/dotfiles/scripts/lockscreentime.sh -exec-once = ~/dotfiles/scripts/updatewal-swww.sh -exec-once = ~/dotfiles/hypr/gtk.sh -exec-once = hyprctl setcursor Bibata-Modern-Classic 24 -exec-once = ~/dotfiles/waybar/launch.sh -exec-once = wl-paste --watch cliphist store +source = ~/dotfiles/hypr/conf/environment.conf +source = ~/dotfiles/hypr/conf/autostart.conf # ----------------------------------------------------- # Load pywal color file # ----------------------------------------------------- source = ~/.cache/wal/colors-hyprland.conf -# ----------------------------------------------------- -# Env vars -# ----------------------------------------------------- -env = XCURSOR_SIZE,24 - -# ----------------------------------------------------- -# Keyboard layout and mouse -# ----------------------------------------------------- -input { - kb_layout = de - kb_variant = - kb_model = - kb_options = - kb_rules = - follow_mouse = 1 - touchpad { - natural_scroll = false - } - sensitivity = 0 # -1.0 - 1.0, 0 means no modification. -} - -# ----------------------------------------------------- -# General window layout and colors -# ----------------------------------------------------- -general { - gaps_in = 10 - gaps_out = 14 - border_size = 3 - col.active_border = $color11 - col.inactive_border = rgba(ffffffff) - layout = dwindle -} - -# ----------------------------------------------------- -# General window decoration -# ----------------------------------------------------- -decoration { - rounding = 10 - blur { - enabled = true - size = 6 - passes = 2 - new_optimizations = on - ignore_opacity = true - xray = true - # blurls = waybar - } - active_opacity = 1.0 - inactive_opacity = 0.8 - fullscreen_opacity = 1.0 - - drop_shadow = true - shadow_range = 30 - shadow_render_power = 3 - col.shadow = 0x66000000 -} - -# ----------------------------------------------------- -# Layouts -# ----------------------------------------------------- -dwindle { - pseudotile = true - preserve_split = true -} - -master { - new_is_master = true -} - -gestures { - workspace_swipe = false -} - -device:epic-mouse-v1 { - sensitivity = -0.5 -} - - - -# ----------------------------------------------------- -# Misc settings -# ----------------------------------------------------- -misc { - disable_hyprland_logo = true - disable_splash_rendering = true -} - # ----------------------------------------------------- # Load configuration files # ----------------------------------------------------- +source = ~/dotfiles/hypr/conf/keyboard.conf +source = ~/dotfiles/hypr/conf/window.conf +source = ~/dotfiles/hypr/conf/decoration.conf +source = ~/dotfiles/hypr/conf/layouts.conf +source = ~/dotfiles/hypr/conf/misc.conf source = ~/dotfiles/hypr/conf/keybindings.conf source = ~/dotfiles/hypr/conf/windowrules.conf source = ~/dotfiles/hypr/conf/animations1.conf diff --git a/rofi/config-cliphist.rasi b/rofi/config-cliphist.rasi index 9aafe95..17e2b85 100644 --- a/rofi/config-cliphist.rasi +++ b/rofi/config-cliphist.rasi @@ -34,7 +34,7 @@ configuration { window { width: 400px; x-offset: -15px; - y-offset: 65px; + y-offset: 62px; spacing: 0px; padding: 0px; margin: 0px; diff --git a/rofi/config-power.rasi b/rofi/config-power.rasi index 2530da5..258a8c9 100644 --- a/rofi/config-power.rasi +++ b/rofi/config-power.rasi @@ -34,7 +34,7 @@ configuration { window { width: 400px; x-offset: -15px; - y-offset: 65px; + y-offset: 62px; spacing: 0px; padding: 0px; margin: 0px; diff --git a/rofi/config-screenshot.rasi b/rofi/config-screenshot.rasi index 73fab9e..de72c20 100644 --- a/rofi/config-screenshot.rasi +++ b/rofi/config-screenshot.rasi @@ -35,7 +35,7 @@ window { width: 400px; height: 130px; x-offset: -15px; - y-offset: 65px; + y-offset: 62px; spacing: 0px; padding: 0px; margin: 0px; diff --git a/rofi/config-short.rasi b/rofi/config-short.rasi index 71961d5..a46a995 100644 --- a/rofi/config-short.rasi +++ b/rofi/config-short.rasi @@ -35,7 +35,7 @@ window { width: 200px; height: 130px; x-offset: -15px; - y-offset: 65px; + y-offset: 62px; spacing: 0px; padding: 0px; margin: 0px; diff --git a/rofi/config-wallpaper.rasi b/rofi/config-wallpaper.rasi index 95946a4..a6311ac 100644 --- a/rofi/config-wallpaper.rasi +++ b/rofi/config-wallpaper.rasi @@ -34,7 +34,7 @@ configuration { window { width: 400px; x-offset: 0px; - y-offset: 65px; + y-offset: 62px; spacing: 0px; padding: 0px; margin: 0px; diff --git a/waybar/modules.json b/waybar/modules.json index 43491e6..d0d1264 100644 --- a/waybar/modules.json +++ b/waybar/modules.json @@ -90,6 +90,7 @@ "custom/wallpaper": { "format": "", "on-click": "~/dotfiles/scripts/wallpaper-swww.sh", + "on-click-right": "~/dotfiles/scripts/updatewal-swww.sh", "tooltip": false }, diff --git a/waybar/style.css b/waybar/style.css index 586fd46..ec71e72 100644 --- a/waybar/style.css +++ b/waybar/style.css @@ -52,7 +52,7 @@ window#waybar { } #workspaces button { - padding: 1px 5px; + padding: 1px 9px; margin: 3px 3px; border-radius: 15px; border:0px;