diff --git a/cava/config b/cava/config index bac6121..44f7172 100644 --- a/cava/config +++ b/cava/config @@ -38,7 +38,7 @@ framerate = 200 # the bandwidth of the visualizer. # Note: there is a minimum total bandwidth of 43Mhz x number of bars. # Cava will automatically increase the higher cutoff if a too low band is specified. -lower_cutoff_freq = 10 +lower_cutoff_freq = 20 higher_cutoff_freq = 22050 @@ -153,7 +153,7 @@ method = noncurses # 'mono_option' set mono to either take input from 'left', 'right' or 'average'. # set 'reverse' to 1 to display frequencies the other way around. channels = mono -; mono_option = average +mono_option = average ; reverse = 0 # Raw output target. A fifo will be created if target does not exist. @@ -183,7 +183,7 @@ channels = mono # set label on bars on the x-axis. Can be 'frequency' or 'none'. Default: 'none' # 'frequency' displays the lower cut off frequency of the bar above. # Only supported on ncurses and noncurses output. -#xaxis = frequency +xaxis = frequency # enable alacritty synchronized updates. 1 = on, 0 = off # removes flickering in alacritty terminal emulator. @@ -261,7 +261,7 @@ waves = 0 # Noise reduction, int 0 - 100. default 77 # the raw visualization is very noisy, this factor adjusts the integral and gravity filters to keep the signal smooth # 100 will be very slow and smooth, 0 will be fast but noisy. -; noise_reduction = 77 +noise_reduction = 20 [eq] diff --git a/hypr/binds.conf b/hypr/binds.conf index 5d3edf4..0f60a56 100644 --- a/hypr/binds.conf +++ b/hypr/binds.conf @@ -44,7 +44,7 @@ bind = $mainMod SHIFT, s, exec, grim -g "$(slurp)" - | wl-copy && wl-paste > ~/P bind =, PRINT, exec, grim - | wl-copy && wl-paste > ~/Pictures/Screenshots/Screenshot-$(date +%F_%T).png # Toggle Monitors Off/On -bind = $mainMod SHIFT CTRL ALT, m, exec,hyprctl dispatch dpms off | hyprctl dispatch dpms on +bind = $mainMod SHIFT CTRL ALT, m, exec, sleep 1 && hyprctl dispatch dpms off # Access Clipboard #bind = $mainMod, V, exec, cliphist list | rofi -dmenu | cliphist decode | wl-copy diff --git a/hypr/env.conf b/hypr/env.conf index 4590b12..0b7fdcc 100644 --- a/hypr/env.conf +++ b/hypr/env.conf @@ -2,12 +2,12 @@ env = XCURSOR_SIZE,24 env = WLR_NO_HARDWARE_CURSORS,1 env = QT_QPA_PLATFORM,wayland -env = QT_QPA_PLATFORMTHEME,qt6ct +env = QT_QPA_PLATFORMTHEME,kde env = GTK_IM_MODULE,fcitx env = QT_IM_MODULE,fcitx env = XMODIFIERS,@im=fcitx -env = QT_STYLE_OVERRIDE=kvantum +env = QT_STYLE_OVERRIDE=kde env = ELECTRON_OZONE_PLATFORM_HINT,auto env = ELECTRON_ENABLE_WAYLAND_IME diff --git a/hypr/exec.conf b/hypr/exec.conf index 705e9a8..97355c2 100644 --- a/hypr/exec.conf +++ b/hypr/exec.conf @@ -1,6 +1,6 @@ # Launch apps # Default -#exec-once = hyprpaper +exec-once = hyprpm reload -n exec-once = swaync exec-once = /usr/lib/polkit-kde-authentication-agent-1 exec-once = fcitx5 diff --git a/hypr/hyprbars.conf b/hypr/hyprbars.conf new file mode 100644 index 0000000..f4ce33b --- /dev/null +++ b/hypr/hyprbars.conf @@ -0,0 +1,15 @@ +plugin { + hyprbars { + # example config + bar_height = 15 + bar_text_size = 12 + bar_color = rgb(000000) + bar_part_of_window = true + bar_text_font = NotoMono Nerd Font Mono + bar_text_align = left + + hyprbars-button = rgb(ff4040), 12,, hyprctl dispatch killactive + hyprbars-button = rgb(eeee11), 10,, hyprctl dispatch fullscreen 1 + hyprbars-button = rgb(95ff00), 10,, hyprctl dispatch togglefloating + } +} diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index 002280c..ceaf8c3 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -4,10 +4,10 @@ #source=~/.config/hypr/laptop.conf # PC Specific -#source=~/.config/hypr/pc.conf +source=~/.config/hypr/pc.conf # Elitebook Specific -source=~/.config/hypr/elitebook.conf +#source=~/.config/hypr/elitebook.conf # Default Exec source=~/.config/hypr/exec.conf @@ -42,6 +42,7 @@ source=~/.config/hypr/binds.conf # Hyprcursor source=~/.config/hypr/cursor.conf - +# Hyprbars +source=~/.config/hypr/hyprbars.conf diff --git a/hypr/pc.conf b/hypr/pc.conf index 3bd4450..5c0fbc7 100644 --- a/hypr/pc.conf +++ b/hypr/pc.conf @@ -32,7 +32,6 @@ workspace=3,monitor:DP-2 #exec-once = openrgb --startminimized exec-once = waybar exec-once = hyprpaper -exec-once = flatpak run dev.vencord.Vesktop exec-once = feishin exec-once = nicotine exec-once = sleep 10 && jellyfin-mpv-shim diff --git a/hypr/rules.conf b/hypr/rules.conf index 80f437a..022b045 100644 --- a/hypr/rules.conf +++ b/hypr/rules.conf @@ -1,6 +1,7 @@ # Transparency Windowrules windowrulev2 = opacity 0.65 0.65,class:^(feishin|@joplin/app-desktop|org.kde.dolphin|virt-manager|vesktop|kitty|org.fooyin.fooyin|org.nicotine_plus.Nicotine|virt-manager|org.polkit-kde-authentication-agent-1)$ +windowrulev2 = opacity 0.8 0.8,class:^(code) # Idle Inhibit windowrulev2 = idleinhibit fullscreen,class:^(looking-glass-client) @@ -9,8 +10,13 @@ windowrulev2 = idleinhibit fullscreen,class:^(looking-glass-client) windowrulev2 = fullscreen,class:^(looking-glass-client) windowrulev2 = renderunfocused,class:^(looking-glass-client)$ - # Setting popups windowrulev2 = float,class:^(org.pulseaudio.pavucontrol|blueman-manager|nm-connection-editor|org.kde.polkit-kde-authentication-agent-1) windowrulev2 = size 50% 50%,class:^(org.pulseaudio.pavucontrol|blueman-manager|nm-connection-editor) windowrulev2 = move 49% 35,class:^(org.pulseaudio.pavucontrol|blueman-manager|nm-connection-editor) + +# Hide hyprbars when window is inactive +#windowrulev2 = plugin:hyprbars:nobar,focus:0 + +# Hide hyprbars +windowrulev2 = plugin:hyprbars:nobar,class:^(firefox) diff --git a/kitty/current-theme.conf b/kitty/current-theme.conf index 8945d68..15083f7 100644 --- a/kitty/current-theme.conf +++ b/kitty/current-theme.conf @@ -1,101 +1,21 @@ -# vim:ft=kitty -#: This is a template that can be used to create new kitty themes. -#: Theme files should start with a metadata block consisting of -#: lines beginning with ##. All metadata fields are optional. - -## name: Box -## author: D3vil0p3r -## license: GPLv3 -## blurb: Hack The Box inspired colorscheme. - -#: All the settings below are colors, which you can choose to modify, or use the -#: defaults. You can also add non-color based settings if needed but note that -#: these will not work with using kitty @ set-colors with this theme. For a -#: reference on what these settings do see https://sw.kovidgoyal.net/kitty/conf/ - -#: The basic colors - -foreground #9fef00 -background #141d2b -selection_foreground #141d2b -selection_background #a4b1cd - - -#: Cursor colors - -cursor #9fef00 -cursor_text_color #111111 - - -#: URL underline color when hovering with mouse - -url_color #2ee7b6 - - -#: kitty window border colors and terminal bell colors - -active_border_color #00ff00 -inactive_border_color #cccccc -bell_border_color #ff5a00 -visual_bell_color none - - -#: OS Window titlebar colors - -wayland_titlebar_color system -macos_titlebar_color system - - -#: Tab bar colors - -active_tab_foreground #141d2b -active_tab_background #9fef00 -inactive_tab_foreground #141d2b -inactive_tab_background #a4b1cd -tab_bar_background none -tab_bar_margin_color none - - -#: Colors for marks (marked text in the terminal) - -mark1_foreground black -mark1_background #98d3cb -mark2_foreground black -mark2_background #f2dcd3 -mark3_foreground black -mark3_background #f274bc - - -#: The basic 16 colors - -#: black -color0 #000000 -color8 #767676 - -#: red -color1 #cc0403 -color9 #f2201f - -#: green -color2 #19cb00 -color10 #23fd00 - -#: yellow -color3 #cecb00 -color11 #fffd00 - -#: blue -color4 #0d73cc -color12 #1a8fff - -#: magenta -color5 #cb1ed1 -color13 #fd28ff - -#: cyan -color6 #0dcdcd -color14 #14ffff - -#: white -color7 #dddddd -color15 #ffffff +background #000000 +foreground #ffffff +cursor #bbbbbb +selection_background #b5d5ff +color0 #000000 +color8 #545454 +color1 #ff5555 +color9 #ff5555 +color2 #55ff55 +color10 #55ff55 +color3 #ffff55 +color11 #ffff55 +color4 #5555ff +color12 #5555ff +color5 #ff55ff +color13 #ff55ff +color6 #55ffff +color14 #55ffff +color7 #bbbbbb +color15 #ffffff +selection_foreground #000000 diff --git a/kitty/kitty.conf b/kitty/kitty.conf index 073d939..d6cb4e8 100644 --- a/kitty/kitty.conf +++ b/kitty/kitty.conf @@ -5,7 +5,7 @@ term xterm-256color # BEGIN_KITTY_THEME -# Box +# Dark Pastel include current-theme.conf # END_KITTY_THEME diff --git a/kitty/kitty.conf.bak b/kitty/kitty.conf.bak index f3352a7..073d939 100644 --- a/kitty/kitty.conf.bak +++ b/kitty/kitty.conf.bak @@ -5,7 +5,7 @@ term xterm-256color # BEGIN_KITTY_THEME -# 1984 Dark +# Box include current-theme.conf # END_KITTY_THEME diff --git a/waybar/black/config b/waybar/black/config new file mode 100644 index 0000000..a1b7b67 --- /dev/null +++ b/waybar/black/config @@ -0,0 +1,164 @@ + +{ + "layer": "top", // Waybar at top layer + "position": "bottom", // Waybar position (top|bottom|left|right) + //"height": 5, // Waybar height (to be removed for auto height) + //"width": 5, // Waybar width + "spacing": 8, // Gaps between modules (4px) + // Choose the order of the modules + "modules-left": ["hyprland/workspaces"], + "modules-center": ["hyprland/window"], + "modules-right": [ "tray","idle_inhibitor", "power-profiles-daemon","cpu", "memory", "temperature", "pulseaudio", "network", "backlight", "upower", "clock"], + //Modules configuration + + "hyprland/workspaces": { + "all-outputs": true, + "format": "{name}", + "on-scroll-up": "hyprctl dispatch workspace e+1", + "on-scroll-down": "hyprctl dispatch workspace e-1", + "on-click": "activate" + }, + + "hyprland/window": { + "format": "{}", + "max-length": 140, + "separate-outputs": false + }, + + "tray": { + "icon-size": 18, + "spacing": 6 + }, + + "clock": { + "format": "{:%I:%M %p}", + "timezone": "Australia/Melbourne", + "tooltip-format": "{calendar}", + "calendar": { + "mode" : "month", + + "mode-mon-col" : 3, + "weeks-pos" : "right", + "on-scroll" : 1, + "on-click-right": "mode", + "format": { + "months": "{}", + "days": "{}", + "weeks": "W{}", + "weekdays": "{}", + "today": "{}" + } + }, + "actions": { + "on-click-right": "mode", + "on-click-forward": "tz_up", + "on-click-backward": "tz_down", + "on-scroll-up": "shift_up", + "on-scroll-down": "shift_down" + } + }, + + "temperature": { + "thermal-zone": 2, + "hwmon-path": "/sys/class/hwmon/hwmon4/temp1_input", + "critical-threshold": 80, + "format": "{icon}{temperatureC:3}°C", + "format-icons": ["󰼩", "󱩱", "󰼷"] + }, + "backlight": { + //"device": "acpi_video1", + "format": "{icon} {percent}%", + "format-icons": ["", "", "", "", "", "", "", "", ""] + }, + + "upower": { + "format": "{percentage}", + "icon-size": 18, + "hide-if-empty": true, + "tooltip": true, + "tooltip-spacing": 20 + }, + + "network": { + // "interface": "wlp2*", // (Optional) To force the use of this interface + "interval": 60, + "format": "󰌗 {ifname}", + "format-wifi": " {essid}", + "tooltip-format": "LAN IP: {ipaddr} Gateway: {gwaddr}", + "format-linked": "{ifname} (No IP)", + "format-disconnected": "󰌙", + "min-length": 1 + }, + + "pulseaudio": { + "scroll-step": 1, // %, can be a float + "on-click": "exec pavucontrol", + "on-click-right": "pactl set-sink-mute @DEFAULT_SINK@ toggle", + "ignored-sinks": ["Easy Effects Sink"], + "format": "{icon} {volume:3}%", + "format-bluetooth": "󰥰 {volume:3}%", + "format-muted": "󰖁 Mute", + "format-icons": { + "headphone": "", + "hands-free": "", + "headset": "", + "phone": "", + "portable": "", + "car": "", + "default": [" 󰕿", " 󰖀", " 󰕾"] + } + + }, + + "cpu": { + "interval": 1, + "format": " {usage:3}%", + "on-click": "exec kitty btop" + }, + + "memory": { + "interval": 5, + "format": " {percentage:3}%", + "on-click": "exec kitty btop" + }, + + "power-profiles-daemon": { + "format": "{icon}", + "tooltip-format": "Power profile: {profile}\nDriver: {driver}", + "tooltip": true, + "format-icons": { + "default": "", + "performance": " ", + "balanced": " ", + "power-saver": " " + } +}, + + "idle_inhibitor": { + "format": "{icon}", + "format-icons": { + "activated": " ", + "deactivated": " " + } + }, + + "custom/arrow" : { + "format": "", + "tooltip-format": "Tray Expander" + }, + + "group/tray": { + "orientation": "inherit", + "drawer": { + "transition-duration": 500, + "children-class": "not-power", + "transition-left-to-right": false, + }, + "modules": [ + "custom/arrow", // First element is the "group leader" and won't ever be hidden + "tray" + ] + } + +} + \ No newline at end of file diff --git a/waybar/black/style.css b/waybar/black/style.css new file mode 100644 index 0000000..ca7bf50 --- /dev/null +++ b/waybar/black/style.css @@ -0,0 +1,83 @@ +* { + /* `otf-font-awesome` is required to be installed for icons */ + font-family: NotoSansM Nerd Font; + font-weight: 600; +} + +/* Waybar Window */ +window#waybar { + background: #000000; + color: #ffffff; +} + +/* Global Buttons */ +button { + /* Use box-shadow instead of border so the text isn't offset */ + box-shadow: inset 0 -3px transparent; + /* Avoid rounded borders under each button name */ + padding: 0px; + margin: 0px; + border-radius: 0px; +} + + +/* Workspace Selector */ +#workspaces button { + padding: 0 2px; + background-color: transparent; +} + +#workspaces button:hover { + background: rgba(238, 238, 238, 0.2); +} + +#workspaces button.active { + background-color: #6c7086; + color: #ffffff; + box-shadow: inset 0 -2px #ffffff; +} + +#workspaces button.urgent { + background-color: #eb4d4b; +} + + +/* Clock */ + + + +/* Status Segments */ +#window, +#power-profiles-daemon, +#idle_inhibitor, +#network, +#backlight, +#pulseaudio, +#temperature, +#memory, +#cpu, +#upower, +#clock, +#tray { + padding-left: 15px; + color: #ffffff; + font-size: 15px; +} + +#clock { + padding-right: 15px; +} + + +#tray > .passive { + -gtk-icon-effect: dim; +} + +#tray > .needs-attention { + -gtk-icon-effect: highlight; + background-color: #eb4d4b; +} + + + + diff --git a/waybar/config b/waybar/config index a1b7b67..f1b9069 100644 --- a/waybar/config +++ b/waybar/config @@ -2,13 +2,13 @@ { "layer": "top", // Waybar at top layer "position": "bottom", // Waybar position (top|bottom|left|right) - //"height": 5, // Waybar height (to be removed for auto height) + "height": 2, // Waybar height (to be removed for auto height) //"width": 5, // Waybar width "spacing": 8, // Gaps between modules (4px) // Choose the order of the modules - "modules-left": ["hyprland/workspaces"], - "modules-center": ["hyprland/window"], - "modules-right": [ "tray","idle_inhibitor", "power-profiles-daemon","cpu", "memory", "temperature", "pulseaudio", "network", "backlight", "upower", "clock"], + "modules-left": ["cpu", "memory", "temperature"], + "modules-center": ["hyprland/workspaces"], + "modules-right": [ "tray","idle_inhibitor", "power-profiles-daemon", "pulseaudio", "network", "backlight", "upower", "clock"], //Modules configuration "hyprland/workspaces": { @@ -26,12 +26,13 @@ }, "tray": { - "icon-size": 18, + "icon-size": 15, "spacing": 6 }, "clock": { "format": "{:%I:%M %p}", + "format-alt": "{:%b %e}", "timezone": "Australia/Melbourne", "tooltip-format": "{calendar}", "calendar": { @@ -62,7 +63,7 @@ "thermal-zone": 2, "hwmon-path": "/sys/class/hwmon/hwmon4/temp1_input", "critical-threshold": 80, - "format": "{icon}{temperatureC:3}°C", + "format": "Tmp:{temperatureC:3}°C", "format-icons": ["󰼩", "󱩱", "󰼷"] }, "backlight": { @@ -82,11 +83,11 @@ "network": { // "interface": "wlp2*", // (Optional) To force the use of this interface "interval": 60, - "format": "󰌗 {ifname}", - "format-wifi": " {essid}", + "format": "Net: {ifname}", + "format-wifi": "Wi-Fi", "tooltip-format": "LAN IP: {ipaddr} Gateway: {gwaddr}", "format-linked": "{ifname} (No IP)", - "format-disconnected": "󰌙", + "format-disconnected": "Dscnt", "min-length": 1 }, @@ -95,50 +96,41 @@ "on-click": "exec pavucontrol", "on-click-right": "pactl set-sink-mute @DEFAULT_SINK@ toggle", "ignored-sinks": ["Easy Effects Sink"], - "format": "{icon} {volume:3}%", + "format": "Vol:{volume:3}%", "format-bluetooth": "󰥰 {volume:3}%", - "format-muted": "󰖁 Mute", - "format-icons": { - "headphone": "", - "hands-free": "", - "headset": "", - "phone": "", - "portable": "", - "car": "", - "default": [" 󰕿", " 󰖀", " 󰕾"] - } + "format-muted": "Vol: Mtd" }, "cpu": { "interval": 1, - "format": " {usage:3}%", + "format": "Cpu:{usage:3}%", "on-click": "exec kitty btop" }, "memory": { "interval": 5, - "format": " {percentage:3}%", + "format": "Ram:{percentage:3}%", "on-click": "exec kitty btop" }, "power-profiles-daemon": { - "format": "{icon}", - "tooltip-format": "Power profile: {profile}\nDriver: {driver}", + "format": "Pwr: {icon}", + "tooltip-format": "Power Profile: {profile}\nDriver: {driver}", "tooltip": true, "format-icons": { - "default": "", - "performance": " ", - "balanced": " ", - "power-saver": " " + "default": "Def", + "performance": "Prf", + "balanced": "Bal", + "power-saver": "Eco" } }, "idle_inhibitor": { - "format": "{icon}", + "format": "Idl: {icon}", "format-icons": { - "activated": " ", - "deactivated": " " + "activated": "Act", + "deactivated": "Dct" } }, @@ -158,7 +150,7 @@ "custom/arrow", // First element is the "group leader" and won't ever be hidden "tray" ] - } + }, } \ No newline at end of file diff --git a/waybar/style.css b/waybar/style.css index ca7bf50..1097c11 100644 --- a/waybar/style.css +++ b/waybar/style.css @@ -1,12 +1,15 @@ * { /* `otf-font-awesome` is required to be installed for icons */ - font-family: NotoSansM Nerd Font; - font-weight: 600; + font-family: NotoMono Nerd Font Mono; + font-weight: 400; + font-size: 18px; + padding-top: 0px; + padding-bottom: 0px; } /* Waybar Window */ window#waybar { - background: #000000; + background: rgba(0, 0, 0, 0.5); color: #ffffff; } @@ -25,14 +28,15 @@ button { #workspaces button { padding: 0 2px; background-color: transparent; + color: rgba(255, 255, 255, 0.3); } #workspaces button:hover { - background: rgba(238, 238, 238, 0.2); + background: rgba(238, 238, 238, 0.5); } #workspaces button.active { - background-color: #6c7086; + background: rgba(0, 0, 0, 0.5); color: #ffffff; box-shadow: inset 0 -2px #ffffff; } @@ -41,11 +45,6 @@ button { background-color: #eb4d4b; } - -/* Clock */ - - - /* Status Segments */ #window, #power-profiles-daemon, @@ -60,12 +59,18 @@ button { #clock, #tray { padding-left: 15px; + padding-right: 15px; color: #ffffff; - font-size: 15px; + background-color: rgba(0, 0, 0, 0.3); + border-radius: 5px; +} + +#tray { + background: transparent; } #clock { - padding-right: 15px; + margin-left: 0px; }