diff options
-rw-r--r-- | X11/xresources | 2 | ||||
-rw-r--r-- | environment.d/cursor.conf | 2 | ||||
-rw-r--r-- | gtk-3.0/settings.ini | 2 | ||||
-rw-r--r-- | hypr/hypridle.conf | 4 | ||||
-rw-r--r-- | hypr/hyprland.conf | 51 | ||||
-rw-r--r-- | hypr/hyprscratch.conf | 20 | ||||
-rw-r--r-- | kitty/kitty.conf | 8 | ||||
-rw-r--r-- | sh/profile | 3 | ||||
-rw-r--r-- | tofi/dmenu_cosmic | 22 | ||||
-rw-r--r-- | tofi/themes/dmenu | 1 | ||||
-rw-r--r-- | tofi/themes/dmenu_vertical | 1 | ||||
-rw-r--r-- | waybar/config | 16 | ||||
-rw-r--r-- | waybar/style.css | 7 |
13 files changed, 94 insertions, 45 deletions
diff --git a/X11/xresources b/X11/xresources index 63f2348..762a674 100644 --- a/X11/xresources +++ b/X11/xresources @@ -493,3 +493,5 @@ dmenu.selhiforeground: #198844 ! white *.color7: #b4b7b5 *.color15: #ffffff +Xcursor.theme: BreezeX-Black +Xcursor.size: 24 diff --git a/environment.d/cursor.conf b/environment.d/cursor.conf index 9b9ef2b..5638210 100644 --- a/environment.d/cursor.conf +++ b/environment.d/cursor.conf @@ -1,2 +1,2 @@ XCURSOR_THEME=BreezeX-Black -XCURSOR_SIZE=32 +XCURSOR_SIZE=24 diff --git a/gtk-3.0/settings.ini b/gtk-3.0/settings.ini index 28ef3a0..dd10b54 100644 --- a/gtk-3.0/settings.ini +++ b/gtk-3.0/settings.ini @@ -3,7 +3,7 @@ gtk-theme-name=Flat-Remix-GTK-Green-Darkest-Solid gtk-icon-theme-name=Cosmic gtk-font-name=Cantarell 11 gtk-cursor-theme-name=BreezeX-Black -gtk-cursor-theme-size=32 +gtk-cursor-theme-size=24 gtk-toolbar-style=3 gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR gtk-button-images=0 diff --git a/hypr/hypridle.conf b/hypr/hypridle.conf index 3a58aea..ea40f1f 100644 --- a/hypr/hypridle.conf +++ b/hypr/hypridle.conf @@ -13,8 +13,8 @@ listener { # turn off keyboard backlight, comment out this section if you dont have a keyboard backlight. listener { timeout = 150 # 2.5min. - on-timeout = brightnessctl -d led::kbd_backlight set 0 # turn off keyboard backlight. - on-resume = brightnessctl -rd led::kbd_backlight # turn on keyboard backlight. + on-timeout = brightnessctl -d system76::kbd_backlight set 0 # turn off keyboard backlight. + on-resume = brightnessctl -rd system76::kbd_backlight # turn on keyboard backlight. } listener { diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index 3e9547a..c0501a1 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -24,7 +24,7 @@ exec-once = xrdb -load "$XDG_CONFIG_HOME"/X11/xresources exec-once = com.github.wwmm.easyeffects exec-once = systemctl --user start dunst exec-once = systemctl --user start hypridle -#exec-once = mpd +exec-once = mpd #}}} #{{{ env @@ -105,7 +105,7 @@ misc { disable_hyprland_logo = true disable_splash_rendering = true enable_swallow = true - swallow_regex = ^(st-256color)$ + swallow_regex = ^(kitty)$ swallow_exception_regex = ^(wev|.*ueberzug|n?vi?m? .*)$ vfr = true vrr = 3 @@ -203,10 +203,28 @@ plugin { #{{{ Windowrules # Example windowrule v1 -# windowrule = float, ^(st)$ +# windowrule = float, ^(kitty)$ # Example windowrule v2 -# windowrule = float, class:^(st)$, title:^(st)$ +# windowrule = float, class:^(kitty)$, title:^(kitty)$ # See https://wiki.hyprland.org/Configuring/Window-Rules/ for more +windowrule = fullscreen, class:^(Xephyr)$ +windowrule = float, title:^(LibreWolf - Choose User Profile)$ +windowrule = float, class:^(xdg-desktop-portal-gtk) +windowrule = float, title:^(UNDERTALE)$ +windowrule = float, class:^(Tk)$ +windowrule = float, class:^(lxqt-policykit-agent)$ +windowrule = float, class:^(Kdenlive)$ +windowrule = stayfocused, title:^()$, class:^(steam)$ +windowrule = minsize 1 1, title:^()$, class:^(steam)$ +windowrule = stayfocused, title:^(menu)$,class:^(yabridge-host.exe.so)$ +windowrule = minsize 1 1, title:^(menu)$,class:^(yabridge-host.exe.so)$ +windowrule = float, class:^(yabridge-host.exe.so)$, title:^(menu)$ +windowrule = float, floating:0, title:^(menu*) +windowrule = workspace 2, title:^(REAPER .*initializing.*)$ +windowrule = tile, class:^(REAPER)$, title:^(.*REAPER v[0-9.]* - Licensed for personal/small business use)$ +windowrule = tile, class:^(WebApp-Qobuz[0-9]*)$ +windowrule = float, title:^(menu)$ +windowrule = move cursor -50% -50%, class:^(yabridge-host.exe.so)$, title:^(menu)$ #}}} #{{{ Mods @@ -239,14 +257,17 @@ $secdMod = ALT # hyprscrolling layout binds #bind = $mainMod+SHIFT, H, layoutmsg, move -1 #HYPRSCROLLING #bind = $mainMod+SHIFT, L, layoutmsg, move +1 #HYPRSCROLLING -bind = $mainMod+SHIFT, H, layoutmsg, movewindowto l #HYPRSCROLLING -bind = $mainMod+SHIFT, L, layoutmsg, movewindowto r #HYPRSCROLLING -bind = $mainMod+SHIFT, J, layoutmsg, colresize -conf #HYPRSCROLLING -bind = $mainMod+SHIFT, K, layoutmsg, colresize +conf #HYPRSCROLLING +bind = $mainMod+ALT, H, layoutmsg, movewindowto l #HYPRSCROLLING +bind = $mainMod+ALT, L, layoutmsg, movewindowto r #HYPRSCROLLING +bind = $mainMod+SHIFT, H, movewindow, l #HYPRSCROLLING +bind = $mainMod+SHIFT, L, movewindow, r #HYPRSCROLLING +bind = $mainMod+SHIFT, K, movewindow, u #HYPRSCROLLING +bind = $mainMod+SHIFT, J, movewindow, d #HYPRSCROLLING bind = $mainMod, H, layoutmsg, focus l #HYPRSCROLLING -bind = $mainMod, J, layoutmsg, focus u #HYPRSCROLLING -bind = $mainMod, K, layoutmsg, focus d #HYPRSCROLLING +bind = $mainMod, J, layoutmsg, focus d #HYPRSCROLLING +bind = $mainMod, K, layoutmsg, focus u #HYPRSCROLLING bind = $mainMod, L, layoutmsg, focus r #HYPRSCROLLING +bind = $mainMod+SHIFT, R, layoutmsg, colresize +conf #HYPRSCROLLING bind = $mainMod+SHIFT, Return, layoutmsg, promote #HYPRSCROLLING #}}} @@ -369,8 +390,8 @@ submap = reset #}}} #{{{ Menu bindings -bind = $mainMod, R, exec, sh -c "tofi-drun --drun-launch=true -c $HOME/.config/tofi/themes/dmenu_vertical" -bind = $mainMod, D, exec, sh -c "$(tofi-run -c $HOME/.config/tofi/themes/dmenu_vertical)" +bind = $mainMod, R, exec, sh -c "tofi-drun -c ~/.config/tofi/themes/dmenu_vertical --drun-launch=true" +bind = $mainMod, D, exec, sh -c "exec $(tofi-run -c ~/.config/tofi/themes/dmenu_vertical)" bind = $mainMod $secdMod, Q, exec, qbc bind = $mainMod $secdMod, W, exec, lwc bind = $mainMod $secdMod, E, exec, mbc @@ -384,14 +405,14 @@ bind = $mainMod $secdMod, P, exec, passmenu #}}} #{{{ Misc bindings -bind = $mainMod, Return, exec, st -bind = $mainMod $secdMod, F, exec, st lf +bind = $mainMod, Return, exec, kitty +bind = $mainMod $secdMod, F, exec, kitty lf bind = $mainMod, W, exec, pkill -USR1 waybar bind = $mainMod, Q, exec, loginctl lock-session bind = $mainMod $secdMod CONTROL, Q, exec, systemctl suspend bind = $mainMod SHIFT, G, exec, get-app-id bind = $mainMod Control, M, exec, volsv -m -bind = $mainMod, Comma, exec, acpi-notify.sh +#bind = $mainMod, Comma, exec, acpi-notify.sh #bind = $mainMod CONTROL, R, exec, startx -- /usr/bin/Xephyr -screen 1920x1080 :1 #}}} diff --git a/hypr/hyprscratch.conf b/hypr/hyprscratch.conf index ce73d98..4274dcd 100644 --- a/hypr/hyprscratch.conf +++ b/hypr/hyprscratch.conf @@ -6,7 +6,7 @@ global_rules = size 50% 50% sphtop { # Mandatory fields title = sphtop - command = st -t sphtop htop + command = kitty -T sphtop htop # Optional fields options = lazy @@ -16,7 +16,7 @@ sphtop { spterm { # Mandatory fields title = spterm - command = st -t spterm + command = kitty -T spterm # Optional fields options = lazy @@ -26,7 +26,7 @@ spterm { sppmxr { # Mandatory fields title = sppmxr - command = st -t sppmxr pulsemixer + command = kitty -T sppmxr pulsemixer # Optional fields options = lazy @@ -36,7 +36,7 @@ sppmxr { spblue { # Mandatory fields title = spblue - command = st -t spblue bluetoothctl + command = kitty -T spblue bluetoothctl # Optional fields options = lazy @@ -46,7 +46,7 @@ spblue { spncmp { # Mandatory fields title = spncmp - command = st -t spncmp ncmpcpp + command = kitty -T spncmp ncmpcpp # Optional fields options = lazy @@ -56,7 +56,7 @@ spncmp { spmutt { # Mandatory fields title = spmutt - command = st -t spmutt neomutt + command = kitty -T spmutt neomutt # Optional fields options = lazy @@ -66,7 +66,7 @@ spmutt { spprof { # Mandatory fields title = spprof - command = st -t spprof profanity + command = kitty -T spprof profanity # Optional fields options = lazy @@ -76,7 +76,7 @@ spprof { spirss { # Mandatory fields title = spirss - command = st -t spirss irssi + command = kitty -T spirss irssi # Optional fields options = lazy @@ -86,7 +86,7 @@ spirss { sptodo { # Mandatory fields title = sptodo - command = st -t sptodo todo + command = kitty -T sptodo todo # Optional fields options = lazy @@ -96,7 +96,7 @@ sptodo { sptrmc { # Mandatory fields title = sptrmc - command = st -t sptrmc tremc + command = kitty -T sptrmc tremc # Optional fields options = lazy diff --git a/kitty/kitty.conf b/kitty/kitty.conf index 59a7f5e..f9772f5 100644 --- a/kitty/kitty.conf +++ b/kitty/kitty.conf @@ -24,7 +24,7 @@ bold_italic_font auto #: italic_font Operator Mono Book Italic #: bold_italic_font Operator Mono Medium Italic -font_size 11.0 +font_size 12.0 #: Font size (in pts) @@ -1151,7 +1151,7 @@ color8 #969896 #: black color1 #89231d -color9 #ec0101 +color9 #cc342b #: red @@ -1170,8 +1170,8 @@ color12 #3971ed #: blue -color5 #6e3c85 -color13 #8400c1 +color5 #784e93 +color13 #a36ac7 #: magenta @@ -53,7 +53,7 @@ export MPD_HOST="$XDG_CONFIG_HOME/mpd/socket" export GTK2_RC_FILES="$XDG_CONFIG_HOME"/gtk-2.0/gtkrc export RENPY_PATH_TO_SAVES="$XDG_DATA_HOME" export XINITRC="$XDG_CONFIG_HOME"/X11/xinitrc -export XAUTHORITY="$XDG_RUNTIME_DIR"/X11/Xauthority +#export XAUTHORITY="$XDG_RUNTIME_DIR"/X11/Xauthority #export VIMINIT="set nocp | source ${XDG_CONFIG_HOME:-$HOME.config}/vim/vimrc" export ANDROID_USER_HOME="$XDG_DATA_HOME"/android export XCURSOR_PATH="/usr/share/icons:$XDG_DATA_HOME/icons" @@ -126,6 +126,7 @@ addtopath "$CARGO_HOME/bin" addtopath "$GOPATH/bin" addtopath "$ZVMPATH" addtopath "$ZVM_INSTALL" +addtopath "/opt/$USER/Grayjay.Desktop-linux-x64-v4" addtopath "/var/lib/flatpak/exports/bin" # MERGE PATHS diff --git a/tofi/dmenu_cosmic b/tofi/dmenu_cosmic new file mode 100644 index 0000000..9a5b4be --- /dev/null +++ b/tofi/dmenu_cosmic @@ -0,0 +1,22 @@ +include = "themes/colors" + +hidden-character = "*" +anchor = top +width = 100% +height = 32 +horizontal = true +font-size = 18 +prompt-text = "" +font = Fira Code Nerd Font Mono +outline-width = 0 +border-width = 0 +min-input-width = 424 +result-spacing = 15 +padding-top = 0 +padding-bottom = 0 +padding-left = 0 +padding-right = 0 +history = false +selection-background-padding = 12 +result-spacing = 24 +require-match=false diff --git a/tofi/themes/dmenu b/tofi/themes/dmenu index e2dc14d..82cff1d 100644 --- a/tofi/themes/dmenu +++ b/tofi/themes/dmenu @@ -20,3 +20,4 @@ history = false selection-background-padding = 12 result-spacing = 24 require-match=false +physical-keybindings=false diff --git a/tofi/themes/dmenu_vertical b/tofi/themes/dmenu_vertical index c8b6900..6357b5a 100644 --- a/tofi/themes/dmenu_vertical +++ b/tofi/themes/dmenu_vertical @@ -26,3 +26,4 @@ clip-to-padding=true history = false require-match = false num-results = 15 +physical-keybindings=false diff --git a/waybar/config b/waybar/config index 77f7386..ecedb20 100644 --- a/waybar/config +++ b/waybar/config @@ -2,7 +2,7 @@ "layer": "bottom", "position": "top", "height": 36, - //"output": "%%DISPLAY%%", + "output": "eDP-1", "spacing": 4, //"margin-top": 5, //"margin-bottom":5, @@ -11,7 +11,7 @@ "modules-left":[ "hyprland/workspaces", "custom/launcher", "hyprland/window"], "modules-center":[], - "modules-right":[ "tray", "mpd", "idle_inhibitor", "wireplumber", "cpu", "memory", "temperature#cpu", "temperature#gpu", "backlight", "network", "clock", "custom/power"], + "modules-right":[ "tray", "mpd", "idle_inhibitor", "wireplumber", "cpu", "memory", "temperature#cpu", "temperature#gpu", "backlight", "battery", "network", "clock", "custom/power"], // Modules configuration @@ -105,16 +105,16 @@ }, "temperature#cpu": { "thermal-zone": 0, - // "hwmon-path": "cat /sys/class/hwmon/hwmon5/temp1_input", - "critical-threshold": 110, + // "hwmon-path": "cat /sys/class/hwmon/hwmon4/temp1_input", + "critical-threshold": 90, "format-critical": "{temperatureC}°C", "format": "", "format-icons": ["", "", ""] }, "temperature#gpu": { "thermal-zone": 1, - // "hwmon-path": "/sys/class/hwmon/hwmon4/temp1_input", - "critical-threshold": 126, + // "hwmon-path": "/sys/class/hwmon/hwmon3/temp1_input", + "critical-threshold": 90, "format-critical": "{temperatureC}°C", "format": "", "format-icons": ["", "", ""] @@ -144,12 +144,12 @@ "scroll-step": 0.1 }, "custom/launcher":{ - "format": "", + "format": ">", "on-click": "rofi -show drun", //"on-click-right": "killall rofi" }, "custom/power":{ - "format": " ", + "format": "", "on-click": "rofi -show p -modi p:rofi-power-menu", //"on-click-right": "killall rofi" }, diff --git a/waybar/style.css b/waybar/style.css index fefb890..cf419a9 100644 --- a/waybar/style.css +++ b/waybar/style.css @@ -45,7 +45,7 @@ window#waybar.hidden { /* #workspaces button:hover { - background: #6e3c85; + background: #39c1ed; color: black; border-bottom: 3px solid #ffffff; @@ -58,7 +58,7 @@ window#waybar.hidden { /* #workspaces button.active:hover { - background: #6e3c85; + background: #39c1ed; color: black; border-bottom: 3px solid #ffffff; } @@ -278,7 +278,8 @@ label:focus { } #tray { - background-color: transparent; + border-radius: 20px; + background-color: black; color: #ffffff; } |