diff --git a/.config/dunst/dunstrc b/.config/dunst/dunstrc new file mode 100644 index 0000000..e90d771 --- /dev/null +++ b/.config/dunst/dunstrc @@ -0,0 +1,25 @@ +[global] + font = Ubuntu Nerd Font 10 + corner_radius = 10 + follow = mouse + origin = top-center + offset = 0x0 + frame_width = 1 + frame_color = "#232323" + format = "%s\n%b" + +[urgency_low] + background = "#232323" + foreground = "#ffffff" + timeout = 10 + +[urgency_normal] + background = "#232323" + foreground = "#ffffff" + timeout = 10 + +[urgency_critical] + background = "#d64e4e" + foreground = "#f0e0e0" + frame_color = "#d64e4e" + timeout = 0 diff --git a/.config/hypr/autostart.conf b/.config/hypr/autostart.conf index 84b282c..5041fc9 100644 --- a/.config/hypr/autostart.conf +++ b/.config/hypr/autostart.conf @@ -1,13 +1,8 @@ -exec-once = dunst exec-once = $statusbar exec-once = waypaper --restore +exec-once = dunst exec-once = wl-paste --watch cliphist store -exec-once = dbus-update-activation-environment --all -exec-once = gnome-keyring-daemon --start --components=pkcs11,secrets,ssh -exec-once = [workspace 3 silent] $browser -exec-once = [workspace 4 silent] $terminal -exec-once = [workspace 5 silent] $terminal -exec-once = [workspace 6 silent] $terminal +exec-once = [workspace 1 silent] $browser exec-once = [workspace 7 silent] $files exec-once = [workspace 9 silent] $email diff --git a/.config/hypr/environment.conf b/.config/hypr/environment.conf index b78dc08..cd320ab 100644 --- a/.config/hypr/environment.conf +++ b/.config/hypr/environment.conf @@ -1,6 +1,6 @@ -# Some default env vars. +# Cursor env = XCURSOR_SIZE,24 -env = TERMINAL,$terminal +env = WLR_NO_HARDWARE_CURSORS,1 # Firefox env = MOZ_ENABLE_WAYLAND,1 @@ -9,7 +9,10 @@ env = MOZ_ENABLE_WAYLAND,1 env = LIBVA_DRIVER_NAME,nvidia env = GBM_BACKEND,nvidia-drm env = __GLX_VENDOR_LIBRARY_NAME,nvidia -env = WLR_NO_HARDWARE_CURSORS,1 + +# Programs +env = EDITOR,$editor +env = TERMINAL,$terminal # Qt env = QT_QPA_PLATFORM,wayland @@ -22,4 +25,3 @@ env = SSH_AUTH_SOCK,$XDG_RUNTIME_DIR/gcr/ssh # Wayland env = XDG_SESSION_TYPE,wayland env = GDK_BACKEND,wayland -env = SDL_VIDEODRIVER,wayland diff --git a/.config/hypr/general.conf b/.config/hypr/general.conf index adb7485..49ea401 100644 --- a/.config/hypr/general.conf +++ b/.config/hypr/general.conf @@ -1,6 +1,6 @@ general { gaps_in = 5 - gaps_out = 10 + gaps_out = 20 border_size = 2 col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg col.inactive_border = rgba(595959aa) diff --git a/.config/hypr/keys.conf b/.config/hypr/keys.conf index fde7719..4c629d4 100644 --- a/.config/hypr/keys.conf +++ b/.config/hypr/keys.conf @@ -5,8 +5,8 @@ $movews = CTRL ALT bind = $leader, T, exec, $terminal bind = $leader, B, exec, $browser bind = $leader, E, exec, $files -bind = $leader, Super_L, exec, $menu bind = $leader, L, exec, $lockscreen +bind = $leader, Space, exec, $menu bind = $leader, F12, exec, $logout bind = , Print, exec, $screenshot @@ -14,8 +14,8 @@ bind = , Print, exec, $screenshot bind = $leader, C, killactive, bind = $leader, F, fullscreen, bind = $leader, V, togglefloating, -bind = $leader, P, pseudo, # dwindle -bind = $leader, J, togglesplit, # dwindle +bind = $leader, P, pseudo, +bind = $leader, J, togglesplit, bind = $leader, M, exit, # Move focus with leader + arrow keys diff --git a/.config/hypr/programs.conf b/.config/hypr/programs.conf index dc34b76..774f2fc 100644 --- a/.config/hypr/programs.conf +++ b/.config/hypr/programs.conf @@ -4,7 +4,7 @@ $email = geary $files = nautilus $logout = wlogout $lockscreen = swaylock -$menu = ~/.bin/toggle-fuzzel +$menu = pkill fuzzel || fuzzel $screenshot = grim -g "$(slurp -d)" - | wl-copy $statusbar = ~/.bin/launch-waybar $terminal = alacritty diff --git a/.config/hypr/rules.conf b/.config/hypr/rules.conf index bb410ba..c64013a 100644 --- a/.config/hypr/rules.conf +++ b/.config/hypr/rules.conf @@ -1,2 +1,2 @@ -windowrulev2 = tile, class:.* windowrulev2 = suppressevent maximize, class:.* +#windowrulev2 = tile, class:.* diff --git a/.config/waybar/config b/.config/waybar/config index 525064f..29985c5 100644 --- a/.config/waybar/config +++ b/.config/waybar/config @@ -2,39 +2,51 @@ "layer": "top", "modules-left": ["custom/os","hyprland/workspaces"], "modules-center": ["clock"], - "modules-right": ["cpu","memory","disk","network","custom/power"], + "modules-right": ["cpu","custom/gpu","memory","disk","network","custom/power"], "clock": { "interval": 60, - "format": "{:%a %H : %M}", - "tooltip-format": "{:%Y-%m-%d}" + "format": "{:%H : %M}", + "tooltip-format": "{:%A, %Y-%m-%d}", + "on-click": "date -u +'%Y-%m-%dT%H:%M:%SZ' | wl-copy" }, "cpu": { "interval": 2, "format": "{icon} {usage}%", "format-icons": ["󰾆", "󰾅", "󰓅"], - "max-length": 10 + "max-length": 10, + "on-click": "$TERMINAL -e btop", + }, + "custom/gpu": { + "exec": "nvidia-smi --query-gpu=utilization.gpu --format=csv,noheader,nounits", + "format": " {}%", + "return-type": "", + "interval": 2, + "on-click": "$TERMINAL -e nvtop", }, "memory": { "interval": 2, "format": " {used} GiB", - "max-length": 10 + "max-length": 10, + "on-click": "$TERMINAL -e btop", }, "network": { "interval": 2, "format": " {ifname}", "format-wifi": " {essid}", - "format-ethernet": " {bandwidthUpBits}  {bandwidthDownBits}", + "format-ethernet": " {bandwidthUpBits}  {bandwidthDownBits}", "format-disconnected": "", "tooltip-format": "{ifname} via {gwaddr}", "tooltip-format-wifi": " {essid} ({signalStrength}%)", "tooltip-format-ethernet": " {ifname}", "tooltip-format-disconnected": "", - "max-length": 50 + "max-length": 50, + "on-click": "$TERMINAL -e nethogs", }, "disk": { "interval": 30, "format": "󰋊 {used}", - "path": "/" + "path": "/", + "on-click": "$TERMINAL -e dua i", }, "mpris": { "format": "{player_icon} {title}", @@ -53,7 +65,7 @@ "format-muted": "", "scroll-step": 5, "on-click": "helvum", - "format-icons": ["", "", ""] + "format-icons": ["", "", ""], }, "hyprland/workspaces": { "format": "{icon}", @@ -66,11 +78,11 @@ "active": "", "default": "" }, - "sort-by-number": true + "sort-by-number": true, }, "custom/os":{ "format": "", "tooltip": false, - "on-click": "alacritty --hold -e neofetch", - } + "on-click": "$TERMINAL --hold -e neofetch", + }, } diff --git a/.config/waybar/style.css b/.config/waybar/style.css index 2b7fd05..733e317 100644 --- a/.config/waybar/style.css +++ b/.config/waybar/style.css @@ -22,23 +22,27 @@ window#waybar.hidden { #network, #wireplumber, #workspaces, -#custom-os { +#custom-os, +#custom-gpu { color: @fg; background: @bg; - margin: 0 4px; + margin: 0 8px; transition: none; } #workspaces button { padding: 0px 5px; color: rgba(255, 255, 255, 0.5); + background: transparent; + text-shadow: none; } +#workspaces button:hover, #workspaces button.active { color: rgba(255, 255, 255, 1.0); } #custom-os { font-size: 24px; - color: #89DCEB; + color: rgb(137, 220, 235); } diff --git a/.gitignore b/.gitignore index f009b0f..c90b82a 100644 --- a/.gitignore +++ b/.gitignore @@ -8,11 +8,11 @@ !/.config /.config/* !/.config/alacritty +!/.config/dunst !/.config/fish !/.config/fuzzel !/.config/htop !/.config/hypr -!/.config/nushell !/.config/nvim !/.config/swaylock !/.config/tmux