From 9e391c6aed474e7bcb7b789060f7260ec056ffe5 Mon Sep 17 00:00:00 2001 From: _N0x Date: Sat, 5 Oct 2024 19:51:00 +0200 Subject: [PATCH] added rofi and waybar, updated fish kitty hypr setup --- fish/.config/fish/config.fish | 8 +- hypr/.config/hypr/hyprland.conf | 29 ++--- kitty/.config/kitty/kitty.conf | 3 +- rofi/.config/rofi/config.rasi | 1 + waybar/.config/waybar/config | 196 ++++++++++++++++++++++++++++++++ waybar/.config/waybar/style.css | 104 +++++++++++++++++ 6 files changed, 325 insertions(+), 16 deletions(-) create mode 100644 rofi/.config/rofi/config.rasi create mode 100644 waybar/.config/waybar/config create mode 100644 waybar/.config/waybar/style.css diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish index 648591b..ca9dadf 100644 --- a/fish/.config/fish/config.fish +++ b/fish/.config/fish/config.fish @@ -1,11 +1,11 @@ if [ -z "$DISPLAY" ] && [ (fgconsole) -eq 1 ]; - startx + # startx end # uncomment to automatically start tmux if status is-interactive and not set -q TMUX - exec tmux +# exec tmux end fish_ssh_agent @@ -14,6 +14,10 @@ function q exit end +function ff + fastfetch -l /home/n0x/Pictures/Nyarch_Transparent_BG_smol.png -c neofetch.jsonc +end + function lf command lfub end diff --git a/hypr/.config/hypr/hyprland.conf b/hypr/.config/hypr/hyprland.conf index 288aaa8..dbdea47 100644 --- a/hypr/.config/hypr/hyprland.conf +++ b/hypr/.config/hypr/hyprland.conf @@ -23,7 +23,7 @@ # See https://wiki.hyprland.org/Configuring/Monitors/ monitor=DP-1,2560x1440@165,0x0,1 -monitor=DP-2,3440x1440@165,0x1440,1 +monitor=DP-2,3440x1440@165,-440x1440,1 ################### ### MY PROGRAMS ### @@ -34,7 +34,8 @@ monitor=DP-2,3440x1440@165,0x1440,1 # Set programs that you use $terminal = kitty $fileManager = pcmanfm -$menu = wofi --show drun +$menu = rofi -show drun +$screenshot = slurp | grim -g - ~/Pictures/Screenshots/screenshot_$(date "+%Y-%m-%d_%T").png ################# @@ -46,7 +47,8 @@ $menu = wofi --show drun # exec-once = $terminal # exec-once = nm-applet & -exec-once = waybar & hyprpaper +exec-once = waybar +exec-once = hyprpaper ############################# @@ -184,14 +186,15 @@ device { $mainMod = SUPER # Sets "Windows" key as main modifier # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more -bind = $mainMod, Q, exec, $terminal -bind = $mainMod, C, killactive, -bind = $mainMod, M, exit, -bind = $mainMod, E, exec, $fileManager -bind = $mainMod, V, togglefloating, -bind = $mainMod, R, exec, $menu -bind = $mainMod, P, pseudo, # dwindle -bind = $mainMod, J, togglesplit, # dwindle +bind = $mainMod SHIFT, return, exec, $terminal +bind = $mainMod SHIFT, C, killactive, +bind = $mainMod SHIFT, Q, exit, +bind = $mainMod, E, exec, $fileManager +bind = $mainMod, V, togglefloating, +bind = $mainMod, P, exec, $menu +bind = $mainMod SHIFT, P, pseudo, # dwindle +bind = $mainMod, J, togglesplit, # dwindle +bind = $mainMod SHIFT, S, exec, $screenshot # Move focus with mainMod + arrow keys bind = $mainMod, left, movefocus, l @@ -224,8 +227,8 @@ bind = $mainMod SHIFT, 9, movetoworkspace, 9 bind = $mainMod SHIFT, 0, movetoworkspace, 10 # Example special workspace (scratchpad) -bind = $mainMod, S, togglespecialworkspace, magic -bind = $mainMod SHIFT, S, movetoworkspace, special:magic +bind = $mainMod, space, togglespecialworkspace, magic +bind = $mainMod SHIFT, space, movetoworkspace, special:magic # Scroll through existing workspaces with mainMod + scroll bind = $mainMod, mouse_down, workspace, e+1 diff --git a/kitty/.config/kitty/kitty.conf b/kitty/.config/kitty/kitty.conf index d2d2282..881bda2 100644 --- a/kitty/.config/kitty/kitty.conf +++ b/kitty/.config/kitty/kitty.conf @@ -84,4 +84,5 @@ enable_audio_bell yes open_url_modifiers ctrl+shift term xterm-kitty open_url_with default -allow_remote_control yes \ No newline at end of file +allow_remote_control yes +confirm_os_window_close 0 \ No newline at end of file diff --git a/rofi/.config/rofi/config.rasi b/rofi/.config/rofi/config.rasi new file mode 100644 index 0000000..c082d3b --- /dev/null +++ b/rofi/.config/rofi/config.rasi @@ -0,0 +1 @@ +@theme "/usr/share/rofi/themes/android_notification.rasi" diff --git a/waybar/.config/waybar/config b/waybar/.config/waybar/config new file mode 100644 index 0000000..f41f3d0 --- /dev/null +++ b/waybar/.config/waybar/config @@ -0,0 +1,196 @@ +{ + "layer": "top", // Waybar at top layer + "position": "top", // Waybar position (top|bottom|left|right) + "height": 34, // Waybar height (to be removed for auto height) + // "width": 1280, // Waybar width + "spacing": 4, // Gaps between modules (4px) + // Choose the order of the modules + "modules-left": ["hyprland/workspaces"], + "modules-center": ["hyprland/window"], + "modules-right": ["idle_inhibitor", "pulseaudio", "backlight", "network", "custom/updates", "hyprland/submap", "hyprland/language", "cpu", "memory", "temperature", "battery", "tray", "clock"], + // Modules configuration + "hyprland/workspaces": { + "disable-scroll": true, + "on-click": "activate", + // "all-outputs": false, + // "format": "{name}: {icon}", + "format": "{name}", + "on-scroll-up": "hyprctl dispatch workspace m-1 > /dev/null", + "on-scroll-down": "hyprctl dispatch workspace m+1 > /dev/null", + "format-icons": { + "1": "", + "2": "", + "3": "", + "4": "", + "5": "", + "urgent": "", + "focused": "", + "default": "" + } + }, + "keyboard-state": { + "numlock": false, + "capslock": false, + "format": "{name} {icon}", + "format-icons": { + "locked": "", + "unlocked": "" + } + }, + "hyprland/window": { + "max-length": 50, + "separate-outputs": true + }, + "hyprland/language": { + "format": "{}", + "max-length": 18 + }, + "sway/mode": { + "format": "{}" + }, + "sway/scratchpad": { + "format": "{icon} {count}", + "show-empty": false, + "format-icons": ["", ""], + "tooltip": true, + "tooltip-format": "{app}: {title}" + }, + "mpd": { + "format": "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) ⸨{songPosition}|{queueLength}⸩ {volume}% ", + "format-disconnected": "Disconnected ", + "format-stopped": "{consumeIcon}{randomIcon}{repeatIcon}{singleIcon}Stopped ", + "unknown-tag": "N/A", + "interval": 2, + "consume-icons": { + "on": " " + }, + "random-icons": { + "off": " ", + "on": " " + }, + "repeat-icons": { + "on": " " + }, + "single-icons": { + "on": "1 " + }, + "state-icons": { + "paused": "", + "playing": "" + }, + "tooltip-format": "MPD (connected)", + "tooltip-format-disconnected": "MPD (disconnected)" + }, + "idle_inhibitor": { + "format": "{icon}", + "format-icons": { + "activated": "", + "deactivated": "" + } + }, + "tray": { + // "icon-size": 21, + "spacing": 0 + }, + "clock": { + // "timezone": "America/New_York", + "tooltip-format": "{:%Y %B}\n{calendar}", + "format-alt": "{:%Y-%m-%d}" + }, + "cpu": { + "format": "{usage}% ", + "tooltip": false + }, + "memory": { + "format": "{}% " + }, + "temperature": { + // "thermal-zone": 2, + // "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input", + "critical-threshold": 80, + // "format-critical": "{temperatureC}°C {icon}", + "format": "{temperatureC}°C {icon}", + "format-icons": ["", "", ""] + }, + "backlight": { + // "device": "acpi_video1", + "format": "{percent}% {icon}", + "format-icons": ["", "", "", "", "", "", "", "", ""] + }, + "battery": { + "states": { + // "good": 95, + "warning": 30, + "critical": 15 + }, + "format": "{capacity}% {icon}", + "format-charging": "{capacity}% 🗲", + "format-plugged": "{capacity}% ", + "format-alt": "{time} {icon}", + // "format-good": "", // An empty format will hide the module + // "format-full": "", + "format-icons": ["", "", "", "", ""] + }, + "battery#bat2": { + "bat": "BAT2" + }, + "network": { + "interface": "enp4s0", // (Optional) To force the use of this interface + "format-wifi": "{essid} ", + "format-ethernet": "{ipaddr}/{cidr} ", + "tooltip-format": "{ifname} via {gwaddr} ", + "format-linked": "{ifname} (No IP) ", + "format-disconnected": "Disconnected ⚠", + "format-alt": "{ifname}: {ipaddr}/{cidr}" + }, + "pulseaudio": { + // "scroll-step": 10, // %, can be a float + "format": "{volume}%{icon} {format_source}", + "format-bluetooth": "{volume}% {icon} {format_source}", + "format-bluetooth-muted": " {icon} {format_source}", + "format-muted": " {format_source}", + "format-source": "{volume}% ", + "format-source-muted": "", + "format-icons": { + "headphone": "", + "hands-free": "", + "headset": "", + "phone": "", + "portable": "", + "car": "", + "default": ["", "", ""] + }, + "on-click": "pavucontrol" + }, + "custom/notification": { + "tooltip": false, + "format": "{} {icon}", + "format-icons": { + "notification": " ", + "none": "", + "dnd-notification": " ", + "dnd-none": "", + "inhibited-notification": " ", + "inhibited-none": "", + "dnd-inhibited-notification": " ", + "dnd-inhibited-none": "" + }, + "return-type": "json", + "exec-if": "which swaync-client", + "exec": "swaync-client -swb", + "on-click": "sleep 0.1 && swaync-client -t -sw", + "on-click-right": "swaync-client -d -sw", + "escape": true + }, + "custom/updates": { + "format": "{} {icon}", + "return-type": "json", + "format-icons": { + "has-updates": "󱍷", + "updated": "󰂪" + }, + "exec-if": "which waybar-module-pacman-updates", + "exec": "waybar-module-pacman-updates --interval-seconds 5 --network-interval-seconds 300" + } +} + diff --git a/waybar/.config/waybar/style.css b/waybar/.config/waybar/style.css new file mode 100644 index 0000000..b976d1b --- /dev/null +++ b/waybar/.config/waybar/style.css @@ -0,0 +1,104 @@ +@define-color base00 #181818; +@define-color base01 #2b2e37; +@define-color base02 #3b3e47; +@define-color base03 #585858; +@define-color base04 #b8b8b8; +@define-color base05 #d8d8d8; +@define-color base06 #e8e8e8; +@define-color base07 #f8f8f8; +@define-color base08 #ab4642; +@define-color base09 #dc9656; +@define-color base0A #f7ca88; +@define-color base0B #a1b56c; +@define-color base0C #86c1b9; +@define-color base0D #7cafc2; +@define-color base0E #ba8baf; +@define-color base0F #a16946; + +* { + transition: none; + box-shadow: none; +} + +#waybar { + font-family: 'Source Code Pro', sans-serif; + font-size: 1.2em; + font-weight: 400; + color: @base04; + background: @base01; +} + +#workspaces { + margin: 0 4px; +} + +#workspaces button { + margin: 4px 0; + padding: 0 4px; + color: @base05; +} + +#workspaces button.visible { +} + +#workspaces button.active { + border-radius: 4px; + background-color: @base02; +} + +#workspaces button.urgent { + color: rgba(238, 46, 36, 1); +} + +#tray { + margin: 4px 4px 4px 4px; + border-radius: 4px; + background-color: @base02; +} + +#tray * { + padding: 0 6px; + border-left: 1px solid @base00; +} + +#tray *:first-child { + border-left: none; +} + +#mode, #battery, #cpu, #memory, #network, #pulseaudio, #idle_inhibitor, #backlight, #custom-storage, #custom-updates, #custom-weather, #custom-mail, #clock, #temperature, #language{ + margin: 4px 2px; + padding: 0 6px; + background-color: @base02; + border-radius: 4px; + min-width: 20px; +} + +#pulseaudio.muted { + color: @base0F; +} + +#pulseaudio.bluetooth { + color: @base0C; +} + +#clock { + margin-left: 0px; + margin-right: 4px; + background-color: transparent; +} + +#temperature.critical { + color: @base0F; +} + +#window { + font-size: 0.9em; + font-weight: 400; + font-family: sans-serif; +} + +#language { + font-size: 0.9em; + font-weight: 500; + letter-spacing: -1px; +} \ No newline at end of file