diff --git a/desktop/configs/shell-files/.zshrc b/desktop/configs/shell-files/.zshrc index 7353457..7194f44 100644 --- a/desktop/configs/shell-files/.zshrc +++ b/desktop/configs/shell-files/.zshrc @@ -55,5 +55,5 @@ eval `dircolors /yang/docs/dircolors.256dark` [ -f "/yang/.ghcup/env" ] && source "/yang/.ghcup/env" # ghcup-env if [ -z "${WAYLAND_DISPLAY}" ] && [ "${XDG_VTNR}" -eq 1 ]; then - dbus-run-session Hyprland + dbus-run-session sway fi diff --git a/desktop/configs/sway/.config/sway/biw b/desktop/configs/sway/.config/sway/biw deleted file mode 100755 index f0ba10e..0000000 --- a/desktop/configs/sway/.config/sway/biw +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -OUTPUT="$(swaymsg -t get_outputs | jq -r '.[]|select(.focused)|.name')" -WORKSPACE="$1" -# Switch to workspace and move it to the focused output. Focus it again, because move just moves. -swaymsg workspace "$WORKSPACE" \; move workspace to output "$OUTPUT" \; workspace "$WORKSPACE" diff --git a/desktop/configs/sway/.config/sway/config b/desktop/configs/sway/.config/sway/config index 40d2770..5136f6b 100644 --- a/desktop/configs/sway/.config/sway/config +++ b/desktop/configs/sway/.config/sway/config @@ -1,297 +1,3 @@ -### Variables -set $mod Mod4 -set $left h -set $down j -set $up k -set $right l -set $term kitty -set $menu ~/.config/rofi/launchers/type-6/launcher.sh +include ~/.config/sway/settings/* -# exec linux-wallpaperengine 2937346640 --screen-root HDMI-A-1 --silent --fps 30 -# output DP-1 bg ~/Pictures/wallpapers/FouGLjX.png fill -output DP-1 bg ~/Pictures/wallpapers/HHN8.png fill -# exec linux-wallpaperengine 2920910376 --screen-root DP-1 --silent --fps 30 -output HDMI-A-1 bg ~/Pictures/wallpapers/FouGLjX.png fill -# -output DP-1 resolution 1920x1080 position 0,0 adaptive_sync on -# output HDMI-A-1 resolution 1920x1080 position 1920,-145 # negative indeces dont work xwayland - -# gtk theme -set $gnome-schema org.gnome.desktop.interface -exec_always { - gsettings set $gnome-schema gtk-theme 'Gruvbox-Dark-BL-LB' - gsettings set $gnome-schema icon-theme 'Nordzy-green-dark' - gsettings set $gnome-schema cursor-theme 'oreo_white_cursors' - gsettings set $gnome-schema font-name 'Cartograph CF 13' -} - -seat seat0 xcursor_theme oreo_white_cursors 16 - -exec swayidle -w \ - timeout 300 'swaylock -f -c 000000 -i /home/jab/Pictures/wallpapers/ce9n8lbxes4b1.jpg' \ - timeout 600 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' \ - before-sleep 'swaylock -f -c 000000 -i /home/jab/Pictures/wallpapers/ce9n8lbxes4b1.jpg' - -# exec xrandr --output DP-1 --primary -exec waybar -exec otd -exec mpd -exec lxqt-policykit -exec nmcli con up Wired\ Connection\ 1 -exec_always autotiling -exec redshift -t 4500:3500 -l -23.5475:-46.63611 -b 1.0:0.7 & -exec dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway -exec touch ~/tmp/swaylol -exec rm -rf ~/tmp/* -exec umount ~/xabu -exec sshfs server:/home/xabu ~/xabu -o reconnect - -### Input configuration -# -# Example configuration: -# - input "2362:9523:Gaming_Mouse" { - accel_profile flat - dwt enabled - middle_emulation enabled - pointer_accel 0.5 - } - - input "3141:20484:SONiX_USB_DEVICE" { - xkb_layout br - xkb_variant abnt2 -} - input "1356:2508:Wireless_Controller_Touchpad" { - map_to_output DISABLED - } -# -# You can get the names of your inputs by running: swaymsg -t get_inputs -# Read `man 5 sway-input` for more information about this section. - -### Key bindings -# Basics: - # Start a terminal - bindsym $mod+Return exec $term - - # Kill focused window - bindsym $mod+Shift+c kill - - # Start your launcher - bindsym $mod+Shift+Return exec $menu - - # Drag floating windows by holding down $mod and left mouse button. - # Resize them with right mouse button + $mod. - # Despite the name, also works for non-floating windows. - # Change normal to inverse to use left mouse button for resizing and right - # mouse button for dragging. - floating_modifier $mod normal - - # Reload the configuration file - bindsym $mod+Shift+r reload - - # Exit sway (logs you out of your Wayland session) - bindsym $mod+Shift+q exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -B 'Yes, exit sway' 'swaymsg exit' -# -# Moving around: -# - # Move your focus around - bindsym $mod+$up focus left - # bindsym $mod+$down focus down - # bindsym $mod+$up focus up - bindsym $mod+$down focus right - # Or use $mod+[up|down|left|right] - bindsym $mod+Left focus left - bindsym $mod+Down focus down - bindsym $mod+Up focus up - bindsym $mod+Right focus right - - # Move the focused window with the same, but add Shift - bindsym $mod+Shift+$up move left - # bindsym $mod+Shift+$down move down - # bindsym $mod+Shift+$up move up - bindsym $mod+Shift+$down move right - # Ditto, with arrow keys - bindsym $mod+Shift+Left move left - bindsym $mod+Shift+Down move down - bindsym $mod+Shift+Up move up - bindsym $mod+Shift+Right move right -# -# Workspaces: -# - bindsym $mod+1 exec ~/.config/sway/xmonad workspace 1 - bindsym $mod+2 exec ~/.config/sway/xmonad workspace 2 - bindsym $mod+3 exec ~/.config/sway/xmonad workspace 3 - bindsym $mod+4 exec ~/.config/sway/xmonad workspace 4 - bindsym $mod+5 exec ~/.config/sway/xmonad workspace 5 - bindsym $mod+6 exec ~/.config/sway/xmonad workspace 6 - bindsym $mod+7 exec ~/.config/sway/xmonad workspace 7 - bindsym $mod+8 exec ~/.config/sway/xmonad workspace 8 - bindsym $mod+Shift+1 move container to workspace number 1 - bindsym $mod+Shift+2 move container to workspace number 2 - bindsym $mod+Shift+3 move container to workspace number 3 - bindsym $mod+Shift+4 move container to workspace number 4 - bindsym $mod+Shift+5 move container to workspace number 5 - bindsym $mod+Shift+6 move container to workspace number 6 - bindsym $mod+Shift+7 move container to workspace number 7 - bindsym $mod+Shift+8 move container to workspace number 8 -# -# Layout stuff: -# - # You can "split" the current object of your focus with - # $mod+b or $mod+v, for horizontal and vertical splits - # respectively. - bindsym $mod+h splith - bindsym $mod+v splitv - - # Switch the current container between different layout styles - bindsym $mod+s layout stacking - bindsym $mod+w layout tabbed - bindsym $mod+Shift+e layout toggle split - - # Make the current focus fullscreen - bindsym $mod+f fullscreen - - # Toggle the current focus between tiling and floating mode - bindsym $mod+t floating toggle - - # Swap focus between the tiling area and the floating area - bindsym $mod+space focus mode_toggle - - # Move focus to the parent container - bindsym $mod+a focus parent - - bindsym $mod+comma focus output DP-1 - bindsym $mod+period focus output HDMI-A-1 - bindsym $mod+Shift+comma move container to output left - bindsym $mod+Shift+period move container to output right -# -# Scratchpad: -# - # Sway has a "scratchpad", which is a bag of holding for windows. - # You can send windows there and get them back later. - - # Move the currently focused window to the scratchpad - bindsym $mod+Control+Return move scratchpad - - # Show the next scratchpad window or hide the focused scratchpad window. - # If there are multiple scratchpad windows, this command cycles through them. - bindsym $mod+Control+s scratchpad show -# -# Resizing containers: -# -mode "resize" { - # left will shrink the containers width - # right will grow the containers width - # up will shrink the containers height - # down will grow the containers height - bindsym $left resize shrink width 40px - bindsym $down resize grow height 40px - bindsym $up resize shrink height 40px - bindsym $right resize grow width 40px - - # Ditto, with arrow keys - bindsym Left resize shrink width 40px - bindsym Down resize grow height 40px - bindsym Up resize shrink height 40px - bindsym Right resize grow width 40px - - # Return to default mode - bindsym Return mode "default" - bindsym Escape mode "default" -} -bindsym $mod+r mode "resize" -bindsym $mod+b exec ~/.config/sway/firefox-to-workspace.sh main 2 -bindsym $mod+Shift+b exec ~/.config/sway/firefox-to-workspace.sh dev 5 -bindsym $mod+Control+b exec ~/.config/sway/firefox-to-workspace.sh school 7 -bindsym $mod+F1 exec mpc prev -bindsym $mod+F2 exec mpc next -bindsym $mod+Escape exec mpc toggle -bindsym $mod+Control+l exec sudo lutris-chroot -bindsym $mod+Control+x exec GTK_THEME=Orchis-Dark xournalpp -bindsym $mod+Alt+x exec LD_PRELOAD="$LD_PRELOAD:/usr/\$LIB/libgamemodeauto.so.0" XL_SECRET_PROVIDER=FILE xivlauncher -bindsym $mod+Control+o exec VK_ICD_FILENAMES=/usr/share/vulkan/icd.d/amd_pro_icd64.json obs -bindsym $mod+Shift+i exec ~/.local/share/idea-IC/bin/idea.sh -bindsym $mod+Shift+d exec flatpak run de.shorsh.discord-screenaudio - -default_border pixel 2 -client.focused #cb4b16 #cb4b16 #cb4b16 -focus_on_window_activation none -popup_during_fullscreen smart -no_focus [window_role="pop-up"] - -corner_radius 8 -shadows on -shadows_on_csd on -shadow_blur_radius 80 -blur enable -blur_radius 3 -blur_passes 3 - -gaps inner 8 - -for_window [class="discord"] move to workspace 3 -for_window [class="Anki" title="Add"] floating enable -for_window [class="VencordDesktop"] move to workspace 3 -for_window [shell=".*"] inhibit_idle fullscreen -for_window [class="obsidian"] move to workspace 6 -for_window [class="xournalpp"] move to workspace 7 -for_window [app_id=".*office.*"] move to workspace 5 -for_window [app_id="WebCord"] move to workspace 3 -for_window [app_id="de.shorsh.discord-screenaudio"] move to workspace 3 -for_window [app_id="SGDBoop"] floating enable -for_window [class="Steam"] move to workspace 8 -for_window [class="steam"] move to workspace 8 -for_window [class=".*jetbrains.*"] move to workspace 4 -for_window [app_id="lutris"] move to workspace 5 -for_window [class="heroic"] move to workspace 5 -for_window [class="explorer.exe"] move to workspace 4 -for_window [class="osu!"] move to workspace 4 -for_window [title="Wine System Tray"] kill -for_window [app_id="org.prismlauncher.PrismLauncher"] move to workspace 5 -for_window [class="ffxiv_dx11.exe"] move to workspace 4, floating enable -for_window [class="battle.net.exe"] move to workspace 4, floating enable -for_window [class="diablo iv.exe"] move to workspace 4, floating enable -for_window [class=".*Minecraft.*"] move to workspace 4, floating enable -for_window [class="XIVLauncher.Core"] move to workspace 4, floating enable -for_window [class=".*league.*"] move to workspace 4, floating enable -assign [class="league of legends.exe"] 4 -for_window [class=".*riot.*"] move to workspace 4, floating enable -for_window [class=".*csgo.*"] move to workspace 4, floating enable -assign [class="gamescope"] 4 -for_window [class="gamescope"] floating enable -for_window [class=".*steam_.*"] move to workspace 4, floating enable - -# firefox tweaks -for_window [title = "Firefox - Sharing Indicator"] kill -for_window [title = "About Mozilla Firefox"] floating enable -for_window [window_role = "About"] floating enable -for_window [app_id="firefox" title="Library"] floating enable, border pixel 1, sticky enable -for_window [title = "Firefox — Sharing Indicator"] kill - -# steam tweaks -for_window [class="^Steam$" title="^Friends$"] floating enable -for_window [class="^Steam$" title="Steam - News"] floating enable -for_window [class="^Steam$" title=".* - Chat"] floating enable -for_window [class="^Steam$" title="^Settings$"] floating enable -for_window [class="^Steam$" title=".* - event started"] floating enable -for_window [class="^Steam$" title=".* CD key"] floating enable -for_window [class="^Steam$" title="^Steam - Self Updater$"] floating enable -for_window [class="^Steam$" title="^Screenshot Uploader$"] floating enable -for_window [class="^Steam$" title="^Steam Guard - Computer Authorization Required$"] floating enable -for_window [title="^Steam Keyboard$"] floating enable - -# jetbrains - - -bindsym $mod+Shift+s exec steam --noverifyfiles -bindsym $mod+e exec thunar -bindsym Print exec ~/.local/bin/print-fullscreen -bindsym Shift+Print exec ~/.local/bin/print-select -bindsym Control+Shift+Print exec ~/.local/bin/print-tmp -bindsym Control+Print exec ~/.local/bin/print-window.sh - -# audio -bindsym XF86AudioRaiseVolume exec wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+ -bindsym XF86AudioLowerVolume exec wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%- - -include /etc/sway/config.d/* +# vim: ts=2 sts=2 sw=2 ft=swayconfig diff --git a/desktop/configs/sway/.config/sway/firefox-to-workspace.sh b/desktop/configs/sway/.config/sway/firefox-to-workspace.sh deleted file mode 100755 index 341d517..0000000 --- a/desktop/configs/sway/.config/sway/firefox-to-workspace.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash - -firefox_binary="firefox-bin" - -if pidof sway; then - ipc_binary=swaymsg - else - ipc_binary=i3-msg -fi - -if [[ -z $1 ]]; then - echo "Usage: $0 " - exit 1 -fi - -firefox_profile=$1 -workspace=$2 - -echo "$firefox_profile to $workspace" - -$firefox_binary -p $firefox_profile &> /dev/null & -PID=$! - -command="$ipc_binary "[pid=$PID]" move workspace $workspace" -echo $command - -until $ipc_binary -t get_tree | grep "\"pid\": $PID" > /dev/null #wait till window opens - do - sleep 0 -done -$command -disown -exit 0 diff --git a/desktop/configs/sway/.config/sway/settings/binds b/desktop/configs/sway/.config/sway/settings/binds new file mode 100644 index 0000000..5c609b3 --- /dev/null +++ b/desktop/configs/sway/.config/sway/settings/binds @@ -0,0 +1,93 @@ +set $mod Mod4 +set $left h +set $down j +set $up k +set $right l +set $term wezterm +set $menu fuzzel + +mode "resize" { + bindsym $left resize shrink width 40px + bindsym $down resize grow height 40px + bindsym $up resize shrink height 40px + bindsym $right resize grow width 40px + bindsym Return mode "default" + bindsym Escape mode "default" +} + +bindsym $mod+r mode "resize" +bindsym $mod+b exec firefox-bin +bindsym $mod+Shift+b exec qutebrowser +bindsym $mod+Shift+d exec flatpak run de.shorsh.discord-screenaudio +bindsym $mod+Return exec $term +bindsym $mod+Shift+c kill +bindsym $mod+Shift+Return exec $menu +floating_modifier $mod normal +bindsym $mod+Shift+r reload +bindsym $mod+Shift+q exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -B 'Yes, exit sway' 'swaymsg exit' + +bindsym $mod+$up focus up +bindsym $mod+$down focus down +bindsym $mod+$left focus left +bindsym $mod+$right focus right + +bindsym $mod+Shift+$up move up +bindsym $mod+Shift+$down move down +bindsym $mod+Shift+$left move left +bindsym $mod+Shift+$right move right + +bindsym $mod+1 exec ~/.config/sway/xmonad workspace 1 +bindsym $mod+2 exec ~/.config/sway/xmonad workspace 2 +bindsym $mod+3 exec ~/.config/sway/xmonad workspace 3 +bindsym $mod+4 exec ~/.config/sway/xmonad workspace 4 +bindsym $mod+5 exec ~/.config/sway/xmonad workspace 5 +bindsym $mod+6 exec ~/.config/sway/xmonad workspace 6 +bindsym $mod+7 exec ~/.config/sway/xmonad workspace 7 +bindsym $mod+8 exec ~/.config/sway/xmonad workspace 8 +bindsym $mod+9 exec ~/.config/sway/xmonad workspace 9 +bindsym $mod+0 exec ~/.config/sway/xmonad workspace 10 +bindsym $mod+Shift+1 move container to workspace number 1 +bindsym $mod+Shift+2 move container to workspace number 2 +bindsym $mod+Shift+3 move container to workspace number 3 +bindsym $mod+Shift+4 move container to workspace number 4 +bindsym $mod+Shift+5 move container to workspace number 5 +bindsym $mod+Shift+6 move container to workspace number 6 +bindsym $mod+Shift+7 move container to workspace number 7 +bindsym $mod+Shift+8 move container to workspace number 8 +bindsym $mod+Shift+9 move container to workspace number 9 +bindsym $mod+Shift+0 move container to workspace number 10 + +bindsym $mod+Control+h splith +bindsym $mod+Control+v splitv +bindsym $mod+s layout stacking +bindsym $mod+w layout tabbed +bindsym $mod+Shift+e layout toggle split +bindsym $mod+f fullscreen +bindsym $mod+t floating toggle + +# Swap focus between the tiling area and the floating area +bindsym $mod+space focus mode_toggle +bindsym $mod+a focus parent + +bindsym $mod+comma focus output left +bindsym $mod+period focus output right +bindsym $mod+Shift+comma move container to output left +bindsym $mod+Shift+period move container to output right +bindsym $mod+Control+Return move scratchpad + +# Show the next scratchpad window or hide the focused scratchpad window. +# If there are multiple scratchpad windows, this command cycles through them. +bindsym $mod+Control+s scratchpad show + +bindsym $mod+Shift+s exec steam --noverifyfiles +bindsym $mod+e exec pcmanfm +bindsym Print exec ~/.local/bin/way-print.sh p +bindsym Shift+Print exec ~/.local/bin/way-print.sh s +bindsym Control+Shift+Print exec ~/.local/bin/way-print.sh t +bindsym Control+Print exec ~/.local/bin/way-print.sh m + +# audio +bindsym XF86AudioRaiseVolume exec wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+ +bindsym XF86AudioLowerVolume exec wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%- + +# vim: ts=2 sts=2 sw=2 ft=swayconfig diff --git a/desktop/configs/sway/.config/sway/settings/config b/desktop/configs/sway/.config/sway/settings/config new file mode 100644 index 0000000..5065055 --- /dev/null +++ b/desktop/configs/sway/.config/sway/settings/config @@ -0,0 +1,34 @@ +output { + HDMI-A-1 pos 0 0 + DP-3 pos 0 -1080 + DP-2 pos 2560 0 +} + +default_border pixel 2 +client.focused #268bd2 #268bd2 #002b36 +client.focused_inactive #268bd2 #002b36 #839496 +focus_on_window_activation none +popup_during_fullscreen smart +no_focus [window_role="pop-up"] + +gaps inner 10 +mouse_warping none + +input "2362:9523:Gaming_Mouse" { + accel_profile flat + dwt enabled + middle_emulation enabled + pointer_accel 0.5 +} + +input "1241:6185:LogoTech_Gaming_Keyboard" { + xkb_layout br + xkb_variant abnt2 + xkb_options ctrl:nocaps +} + +input "1356:2508:Wireless_Controller_Touchpad" { + map_to_output DISABLED +} + +# vim: ts=2 sts=2 sw=2 ft=swayconfig diff --git a/desktop/configs/sway/.config/sway/settings/init b/desktop/configs/sway/.config/sway/settings/init new file mode 100644 index 0000000..4151da2 --- /dev/null +++ b/desktop/configs/sway/.config/sway/settings/init @@ -0,0 +1,20 @@ +set $gnome-schema org.gnome.desktop.interface +exec_always { + # gsettings set $gnome-schema gtk-theme 'Gruvbox-Dark-BL-LB' + # gsettings set $gnome-schema icon-theme 'Nordzy-green-dark' + # gsettings set $gnome-schema cursor-theme 'oreo_white_cursors' + gsettings set $gnome-schema font-name 'CartographCF Nerd Font 13' +} + +exec { + xrandr --output HDMI-A-1 --primary + waybar & + lxqt-policykit & + autotiling + gammastep -t 4500:3500 -l -23.5475:-46.63611 -b 1.0:0.6 & + dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway + rm -rf ~/tmp/* + ~/scripts/swww.sh +} + +# vim: ts=2 sts=2 sw=2 ft=swayconfig diff --git a/desktop/configs/sway/.config/sway/settings/rules b/desktop/configs/sway/.config/sway/settings/rules new file mode 100644 index 0000000..ccbd470 --- /dev/null +++ b/desktop/configs/sway/.config/sway/settings/rules @@ -0,0 +1,43 @@ +for_window [class="Anki" title="Add"] floating enable +for_window [shell=".*"] inhibit_idle fullscreen +for_window [app_id=".*office.*"] move to workspace 5 +for_window [app_id="WebCord"] move to workspace 6 +for_window [class="Steam"] move to workspace 8 +for_window [class="steam"] move to workspace 8 +for_window [class=".*jetbrains.*"] move to workspace 5 +for_window [app_id="lutris"] move to workspace 7 +for_window [class="heroic"] move to workspace 7 +for_window [class="explorer.exe"] move to workspace 9 +for_window [class="osu!"] move to workspace 9 +for_window [title="Wine System Tray"] kill +for_window [app_id="org.prismlauncher.PrismLauncher"] move to workspace 7 +for_window [class="ffxiv_dx11.exe"] move to workspace 9, floating enable +for_window [class="battle.net.exe"] move to workspace 9, floating enable +for_window [class="diablo iv.exe"] move to workspace 9, floating enable +for_window [class=".*Minecraft.*"] move to workspace 9, floating enable +for_window [class="XIVLauncher.Core"] move to workspace 9, floating enable +for_window [class=".*csgo.*"] move to workspace 9, floating enable +assign [class="gamescope"] 9 +for_window [class="gamescope"] floating enable +for_window [class=".*steam_.*"] move to workspace 9, floating enable + +# firefox tweaks +for_window [title = "Firefox - Sharing Indicator"] kill +for_window [title = "About Mozilla Firefox"] floating enable +for_window [window_role = "About"] floating enable +for_window [app_id="firefox" title="Library"] floating enable, border pixel 1, sticky enable +for_window [title = "Firefox — Sharing Indicator"] kill + +# steam tweaks +for_window [class="^Steam$" title="^Friends$"] floating enable +for_window [class="^Steam$" title="Steam - News"] floating enable +for_window [class="^Steam$" title=".* - Chat"] floating enable +for_window [class="^Steam$" title="^Settings$"] floating enable +for_window [class="^Steam$" title=".* - event started"] floating enable +for_window [class="^Steam$" title=".* CD key"] floating enable +for_window [class="^Steam$" title="^Steam - Self Updater$"] floating enable +for_window [class="^Steam$" title="^Screenshot Uploader$"] floating enable +for_window [class="^Steam$" title="^Steam Guard - Computer Authorization Required$"] floating enable +for_window [title="^Steam Keyboard$"] floating enable + +# vim: ts=2 sts=2 sw=2 ft=swayconfig diff --git a/desktop/configs/waybar/.config/waybar/config b/desktop/configs/waybar/.config/waybar/config index 9b7f3e3..57bc092 100644 --- a/desktop/configs/waybar/.config/waybar/config +++ b/desktop/configs/waybar/.config/waybar/config @@ -1,19 +1,19 @@ { "layer": "top", - "position": "top", + "position": "bottom", "mod": "dock", "exclusive": true, "passtrough": false, "gtk-layer-shell": true, - "height": 0, + "height": 30, /* "output": "DP-3", */ "modules-left": [ - "hyprland/workspaces", + "sway/workspaces", ], "modules-center": [ - "hyprland/window" + "sway/window" ], "modules-right": [ @@ -22,13 +22,11 @@ "tray", ], - "hyprland/window": { + "sway/window": { "format": "{}" }, - "hyprland/workspaces": { - "on-scroll-up": "hyprctl dispatch workspace e+1", - "on-scroll-down": "hyprctl dispatch workspace e-1", + "sway/workspaces": { "all-outputs": true, "on-click": "activate", "format": "{icon}", @@ -56,14 +54,14 @@ }, "clock": { - "format": "{:%a %b %d, %H:%M}", + "format": "{:%a %b %d, %H:%M} //", "tooltip-format": "{:%Y %B}\n\n{calendar}" }, "pulseaudio": { - "format": " {volume}%", + "format": " {volume}% //", "tooltip": false, - "format-muted": " N/A", + "format-muted": " N/A //", "on-click": "pavucontrol &", "scroll-step": 5 }, diff --git a/desktop/configs/waybar/.config/waybar/style.css b/desktop/configs/waybar/.config/waybar/style.css index 90a7669..aeee3df 100644 --- a/desktop/configs/waybar/.config/waybar/style.css +++ b/desktop/configs/waybar/.config/waybar/style.css @@ -1,50 +1,43 @@ * { - border: none; - border-radius: 0; - padding: 0; - margin: 0; - font-size: 11px; + border: none; + border-radius: 0; + /* padding: 0; */ + /* margin: 0; */ + font-size: 15px; + font-family: FiraCode Nerd Font; + font-style: italic; } window#waybar { - background: #292828; - color: #ffffff; -} - -#custom-logo { - font-size: 18px; - margin: 0; - margin-left: 7px; - margin-right: 12px; - padding: 0; - font-family: NotoSans Nerd Font Mono; + background: #002b36; + color: #ffffff; + margin: 10px; } #workspaces button { - margin-left: 2px; - margin-right: 10px; - color: #ffffff; + margin-left: 2px; + padding: 2px 8px; } #workspaces button:hover, #workspaces button:active { - background-color: #292828; - color: #ffffff; + background-color: #004d61; + color: #839496; } #workspaces button.focused { - background-color: #383737; + background-color: #004d61; } #language { - margin-right: 7px; + margin-right: 7px; } #battery { - margin-left: 7px; - margin-right: 3px; + margin-left: 7px; + margin-right: 3px; } #clock { - margin: 0px 6px; + margin: 0px 6px; } diff --git a/desktop/configs/wezterm/.config/wezterm/wezterm.lua b/desktop/configs/wezterm/.config/wezterm/wezterm.lua index 9c28653..29afe91 100644 --- a/desktop/configs/wezterm/.config/wezterm/wezterm.lua +++ b/desktop/configs/wezterm/.config/wezterm/wezterm.lua @@ -56,7 +56,7 @@ return { default_cursor_style = "BlinkingUnderline", -- X11 - enable_wayland = false, + enable_wayland = true, -- Keybinds disable_default_key_bindings = true, @@ -87,10 +87,10 @@ return { bold_brightens_ansi_colors = true, -- Padding window_padding = { - left = 15, - right = 15, - top = 15, - bottom = 15, + left = 5, + right = 5, + top = 5, + bottom = 0, }, -- Tab Bar @@ -101,7 +101,7 @@ return { -- General automatically_reload_config = true, inactive_pane_hsb = { saturation = 1.0, brightness = 1.0 }, - window_background_opacity = 0.90, + -- window_background_opacity = 0.90, window_close_confirmation = "NeverPrompt", window_frame = { active_titlebar_bg = "#45475a", font = font_with_fallback(font_name, { bold = true }) }, check_for_updates = false, diff --git a/readme.md b/readme.md index 4096b79..76c1459 100644 --- a/readme.md +++ b/readme.md @@ -2,7 +2,7 @@ here you will find configs for my desktop and my laptop. -i primarily use [neovim](https://github.com/jabuxas/nvim.config), tmux ([sessionizer](https://github.com/jrmoulton/tmux-sessionizer)) and hyprland +i primarily use [neovim](https://github.com/jabuxas/nvim.config), tmux ([sessionizer](https://github.com/jrmoulton/tmux-sessionizer)) and sway themes are completely interchangeable as long as you setup the structure of files the same as this repo\*, or edit to your liking