diff options
| -rw-r--r-- | X11/xresources | 2 | ||||
| -rw-r--r-- | easyeffectsrc | 2 | ||||
| -rw-r--r-- | environment.d/cursor.conf | 2 | ||||
| -rw-r--r-- | gtk-3.0/settings.ini | 2 | ||||
| -rw-r--r-- | hypr/hypridle.conf | 6 | ||||
| -rw-r--r-- | hypr/hyprland.conf | 71 | ||||
| -rw-r--r-- | hypr/hyprpaper.conf | 46 | ||||
| -rw-r--r-- | hypr/hyprscratch.conf | 16 | ||||
| -rw-r--r-- | hypr/pyprland.toml | 73 | ||||
| -rw-r--r-- | niri/config.kdl | 2 | ||||
| -rw-r--r-- | scroll/config | 2 | ||||
| -rw-r--r-- | sh/profile | 1 | ||||
| -rw-r--r-- | waybar/config | 11 |
13 files changed, 169 insertions, 67 deletions
diff --git a/X11/xresources b/X11/xresources index c72f299..822c7e2 100644 --- a/X11/xresources +++ b/X11/xresources @@ -460,4 +460,4 @@ rofi.color-window: #1d1f21, #101010, #000000 ! Xcursor Xcursor.theme: BreezeX-Black -Xcursor.size: 32 +Xcursor.size: 48 diff --git a/easyeffectsrc b/easyeffectsrc new file mode 100644 index 0000000..a4cbf66 --- /dev/null +++ b/easyeffectsrc @@ -0,0 +1,2 @@ +[UiSettings] +ColorScheme=BreezeDark diff --git a/environment.d/cursor.conf b/environment.d/cursor.conf index 9b9ef2b..da48a5c 100644 --- a/environment.d/cursor.conf +++ b/environment.d/cursor.conf @@ -1,2 +1,2 @@ XCURSOR_THEME=BreezeX-Black -XCURSOR_SIZE=32 +XCURSOR_SIZE=48 diff --git a/gtk-3.0/settings.ini b/gtk-3.0/settings.ini index 809e192..282767e 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 gtk-icon-theme-name=Papirus-Dark gtk-font-name=Noto Sans, 10 gtk-cursor-theme-name=BreezeX-Black -gtk-cursor-theme-size=32 +gtk-cursor-theme-size=48 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..4b59375 100644 --- a/hypr/hypridle.conf +++ b/hypr/hypridle.conf @@ -6,15 +6,15 @@ general { listener { timeout = 150 # 2.5min. - on-timeout = brightnessctl set 1 # set monitor backlight to minimum, avoid 0 on OLED monitor. + on-timeout = brightnessctl set 236 # for some reason, on the pangolin 236 is darker than 235 and below on-resume = brightnessctl -r # monitor backlight restore. } # 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 2a64c9e..c7ab954 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -22,7 +22,7 @@ exec-once = hyprpaper #exec-once = hypridle exec-once = waybar exec-once = pypr -exec-once = hyprscratch init +#exec-once = hyprscratch init exec-once = lxqt-policykit-agent exec-once = import-gsettings gtk-theme 'Flat-Remix-GTK-Green-Darkest' exec-once = import-gsettings icon-theme 'Papirus-Dark' @@ -106,6 +106,7 @@ general { #}}} #{{{ cursor +cursor=BreezeX-Black 48 cursor { no_warps = false } @@ -216,7 +217,25 @@ plugin { # Example windowrule v2 # windowrule = float, class:^(kitty)$, title:^(kitty)$ # See https://wiki.hypr.land/Configuring/Window-Rules/ for more -windowrulev2 = workspace special:easyeffects silent, match: class ^(com\.github\.wwmm\.easyeffects)$ +windowrule = fullscreen on, match:class ^(Xephyr)$ +windowrule = float on, match:title ^(LibreWolf - Choose User Profile)$ +windowrule = float on, match:class ^(xdg-desktop-portal-gtk) +windowrule = float on, match:title ^(UNDERTALE)$ +windowrule = float on, match:class ^(Tk)$ +windowrule = float on, match:class ^(lxqt-policykit-agent)$ +windowrule = float on, match:class ^(Kdenlive)$ +windowrule = stay_focused on, match:title ^()$, match:class ^(steam)$ +windowrule = min_size 1 1, match:title ^()$, match:class ^(steam)$ +windowrule = stay_focused on, match:title ^(menu)$,match:class ^(yabridge-host.exe.so)$ +windowrule = min_size 1 1, match:title ^(menu)$,match:class ^(yabridge-host.exe.so)$ +windowrule = float on, match:class ^(yabridge-host.exe.so)$, match:title ^(menu)$ +windowrule = float on, match:float no, match:title ^(menu*) +windowrule = workspace 2, match:title ^(REAPER .*initializing.*)$ +windowrule = tile on, match:class ^(REAPER)$, match:title ^(.*REAPER v[0-9.]* - Licensed for personal/small business use)$ +windowrule = tile on, match:class ^(WebApp-Qobuz[0-9]*)$ +windowrule = float on, match:title ^(menu)$ +windowrule = move cursor -50% -50%, match:class ^(yabridge-host.exe.so)$, match:title ^(menu)$ +windowrulev2 = workspace special:easyeffects silent, match:class ^(com\.github\.wwmm\.easyeffects)$ # Fix brave xray menus windowrulev2 = xray 0, match:class ^(\s*), match:title ^(\s*)$ # Center floating XWayland windows @@ -224,18 +243,18 @@ windowrule = center on, match:xwayland on, match:class negative:^(steam|REAPER)$ # Make Steam Big Picture Mode fullscreen windowrule = fullscreen on, match:class ^(steam)$, match:title ^(Steam Big Picture Mode)$ # Fix scratchpad window spawn behavior -windowrule = workspace +0, match:workspace name:sphtop, match:class negative:sphtop -windowrule = workspace +0, match:workspace name:spterm, match:class negative:spterm -windowrule = workspace +0, match:workspace name:sppmxr, match:class negative:sppmxr -windowrule = workspace +0, match:workspace name:spblue, match:class negative:spblue -windowrule = workspace +0, match:workspace name:spncmp, match:class negative:spncmp -windowrule = workspace +0, match:workspace name:spmutt, match:class negative:spmutt -windowrule = workspace +0, match:workspace name:spprof, match:class negative:spprof -windowrule = workspace +0, match:workspace name:spirss, match:class negative:spirss -windowrule = workspace +0, match:workspace name:spvimw, match:class negative:spvimw -windowrule = workspace +0, match:workspace name:sptrmc, match:class negative:sptrmc -windowrule = workspace +0, match:workspace name:helvum, match:class negative:helvum -windowrule = workspace +0, match:workspace name:easyeffects, match:class negative:easyeffects +windowrule = workspace +0, match:workspace name:sphtop, match:title negative:sphtop +windowrule = workspace +0, match:workspace name:spterm, match:title negative:spterm +windowrule = workspace +0, match:workspace name:sppmxr, match:title negative:sppmxr +windowrule = workspace +0, match:workspace name:spblue, match:title negative:spblue +windowrule = workspace +0, match:workspace name:spncmp, match:title negative:spncmp +windowrule = workspace +0, match:workspace name:spmutt, match:title negative:spmutt +windowrule = workspace +0, match:workspace name:spprof, match:title negative:spprof +windowrule = workspace +0, match:workspace name:spirss, match:title negative:spirss +windowrule = workspace +0, match:workspace name:spvimw, match:title negative:spvimw +windowrule = workspace +0, match:workspace name:sptrmc, match:title negative:sptrmc +windowrule = workspace +0, match:workspace name:helvum, match:title negative:helvum +windowrule = workspace +0, match:workspace name:easyfx, match:title negative:easyfx #}}} #{{{ Layerrules @@ -437,18 +456,18 @@ bind = $mainMod Control, M, exec, volsv -m #}}} #{{{ Scratchpads -bind = $mainMod CONTROL, Z, exec, hyprscratch toggle sphtop -bind = $mainMod CONTROL, X, exec, hyprscratch toggle spterm -bind = $mainMod CONTROL, C, exec, hyprscratch toggle sppmxr -bind = $mainMod CONTROL, V, exec, hyprscratch toggle spblue -bind = $mainMod CONTROL, B, exec, hyprscratch toggle spncmp -bind = $mainMod CONTROL, A, exec, hyprscratch toggle spmutt -bind = $mainMod CONTROL, S, exec, hyprscratch toggle spprof -bind = $mainMod CONTROL, D, exec, hyprscratch toggle spirss -bind = $mainMod CONTROL, F, exec, hyprscratch toggle spvimw -bind = $mainMod CONTROL, G, exec, hyprscratch toggle sptrmc -bind = $mainMod CONTROL, Q, exec, hyprscratch toggle helvum -bind = $mainMod CONTROL, E, exec, hyprscratch toggle easyeffects +bind = $mainMod CONTROL, Z, exec, pypr toggle sphtop +bind = $mainMod CONTROL, X, exec, pypr toggle spterm +bind = $mainMod CONTROL, C, exec, pypr toggle sppmxr +bind = $mainMod CONTROL, V, exec, pypr toggle spblue +bind = $mainMod CONTROL, B, exec, pypr toggle spncmp +bind = $mainMod CONTROL, A, exec, pypr toggle spmutt +bind = $mainMod CONTROL, S, exec, pypr toggle spprof +bind = $mainMod CONTROL, D, exec, pypr toggle spirss +bind = $mainMod CONTROL, F, exec, pypr toggle spvimw +bind = $mainMod CONTROL, G, exec, pypr toggle sptrmc +bind = $mainMod CONTROL, Q, exec, pypr toggle helvum +bind = $mainMod CONTROL, E, exec, pypr toggle easyfx #}}} #{{{ OBS bindings diff --git a/hypr/hyprpaper.conf b/hypr/hyprpaper.conf index 728c00c..a11d6b0 100644 --- a/hypr/hyprpaper.conf +++ b/hypr/hyprpaper.conf @@ -1,15 +1,33 @@ -preload = ~/Pictures/background.png -#if more than one preload is desired then continue to preload other backgrounds -#preload = /path/to/next_image.png -# .. more preloads - -#set the default wallpaper(s) seen on inital workspace(s) --depending on the number of monitors used -wallpaper = eDP-1,~/Pictures/background.png -wallpaper = HDMI-A-1,~/Pictures/background.png -wallpaper = HDMI-A-2,~/Pictures/background.png -wallpaper = DP-1,~/Pictures/background.png -wallpaper = DP-2,~/Pictures/background.png -#if more than one monitor in use, can load a 2nd image -#wallpaper = monitor2,~/background.png -# .. more monitors +wallpaper { + monitor = eDP-1 + path = ~/Pictures/background.png + fit_mode = cover +} + +wallpaper { + monitor = HDMI-A-1 + path = ~/Pictures/background.png + fit_mode = cover +} + +wallpaper { + monitor = HDMI-A-2 + path = ~/Pictures/background.png + fit_mode = cover +} + +wallpaper { + monitor = DP-1 + path = ~/Pictures/background.png + fit_mode = cover +} + +wallpaper { + monitor = DP-2 + path = ~/Pictures/background.png + fit_mode = cover +} + +# Misc Options splash = false +ipc = true diff --git a/hypr/hyprscratch.conf b/hypr/hyprscratch.conf index 5964419..fe3cda6 100644 --- a/hypr/hyprscratch.conf +++ b/hypr/hyprscratch.conf @@ -1,8 +1,8 @@ # Optional globals that apply to all scratchpads daemon_options = clean -daemon_options = eager +daemon_options = spotless -global_rules = size 50% 50% +global_options = special sphtop { # Mandatory fields @@ -11,7 +11,6 @@ sphtop { # Optional fields options = lazy - options = special } spterm { @@ -21,7 +20,6 @@ spterm { # Optional fields options = lazy - options = special } sppmxr { @@ -31,7 +29,6 @@ sppmxr { # Optional fields options = lazy - options = special } spblue { @@ -41,7 +38,6 @@ spblue { # Optional fields options = lazy - options = special } spncmp { @@ -51,7 +47,6 @@ spncmp { # Optional fields options = lazy - options = special } spmutt { @@ -61,7 +56,6 @@ spmutt { # Optional fields options = lazy - options = special } spprof { @@ -71,7 +65,6 @@ spprof { # Optional fields options = lazy - options = special } spirss { @@ -81,7 +74,6 @@ spirss { # Optional fields options = lazy - options = special } spvimw { @@ -91,7 +83,6 @@ spvimw { # Optional fields options = lazy - options = special } sptrmc { @@ -101,7 +92,6 @@ sptrmc { # Optional fields options = lazy - options = special } helvum { @@ -111,7 +101,6 @@ helvum { # Optional fields options = lazy - options = special } easyeffects { @@ -121,6 +110,5 @@ easyeffects { # Optional fields options = lazy - options = special } diff --git a/hypr/pyprland.toml b/hypr/pyprland.toml index cacd7f1..3110ba5 100644 --- a/hypr/pyprland.toml +++ b/hypr/pyprland.toml @@ -1,5 +1,78 @@ [pyprland] plugins = [ "toggle_special", + "scratchpads", "expose" ] + +[scratchpads.sphtop] +animation = "fromBottom" +command = "kitty --class sphtop -e htop" +class = "sphtop" +size = "50% 50%" + +[scratchpads.spterm] +animation = "fromBottom" +command = "kitty --class spterm" +class = "spterm" +size = "50% 50%" + +[scratchpads.sppmxr] +animation = "fromBottom" +command = "kitty --class sppmxr -e pulsemixer" +class = "sppmxr" +size = "50% 50%" + +[scratchpads.spblue] +animation = "fromBottom" +command = "kitty --class spblue -e bluetoothctl" +class = "spblue" +size = "50% 50%" + +[scratchpads.spncmp] +animation = "fromBottom" +command = "kitty --class spncmp -e ncmpcpp" +class = "spncmp" +size = "50% 50%" + +[scratchpads.spmutt] +animation = "fromBottom" +command = "kitty --class spmutt -e neomutt" +class = "spmutt" +size = "50% 50%" + +[scratchpads.spprof] +animation = "fromBottom" +command = "kitty --class spprof -e profanity" +class = "spprof" +size = "50% 50%" + +[scratchpads.spirss] +animation = "fromBottom" +command = "kitty --class spirss -e irssi" +class = "spirss" +size = "50% 50%" + +[scratchpads.spvimw] +animation = "fromBottom" +command = "kitty --class spvimw -e vw" +class = "spvimw" +size = "50% 50%" + +[scratchpads.trmc] +animation = "fromBottom" +command = "kitty --class trmc -e tremc" +class = "trmc" +size = "50% 50%" + +[scratchpads.helvum] +animation = "fromBottom" +command = "helvum" +class = "org.pipewire.Helvum" +size = "50% 50%" + +[scratchpads.easyfx] +animation = "fromBottom" +command = "easyeffects" +class = "com.github.wwmm.easyeffects" +size = "50% 50%" diff --git a/niri/config.kdl b/niri/config.kdl index 8fa7330..3fc9c5c 100644 --- a/niri/config.kdl +++ b/niri/config.kdl @@ -71,7 +71,7 @@ input { // Find more information on the wiki: // https://github.com/YaLTeR/niri/wiki/Configuration:-Outputs // Remember to uncomment the node by removing "/-"! -/-output "eDP-1" { +output "eDP-1" { // Uncomment this line to disable this output. //off diff --git a/scroll/config b/scroll/config index ae73c24..0d71d5b 100644 --- a/scroll/config +++ b/scroll/config @@ -46,7 +46,7 @@ exec hyprpaper # # You can get the names of your outputs by running: scrollmsg -t get_outputs -#output eDP-1 resolution 1920x1080 position 0 0 +output eDP-1 resolution 1920x1080 position 0 0 #output HDMI-A-1 resolution 1920x1080 position 1920 0 #output DP-2 resolution 1920x1080 position 0 0 @@ -127,6 +127,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/waybar/config b/waybar/config index 91dd9a4..8ca6666 100644 --- a/waybar/config +++ b/waybar/config @@ -12,7 +12,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", "custom/battery", "network", "clock", "custom/power"], // Modules configuration @@ -72,6 +72,7 @@ "active-only": false, "all-outputs": false, "persistent-only": true, + "show-special": false, "format-icons": { "1": "1", "2": "2", @@ -172,16 +173,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": ["", "", ""] |