From 1b20fb90e9253d1cf58439a0db5cbd00e08c0aa1 Mon Sep 17 00:00:00 2001 From: Jacob Babor Date: Fri, 18 Oct 2024 17:14:20 -0500 Subject: [PATCH] Remove sway stuff from hyprland --- hyprland/.config/sway/config | 21 ----- .../.config/sway/config.d/03-keybinds.conf | 91 ------------------- hyprland/.config/sway/config.d/04-inputs.conf | 22 ----- hyprland/.config/sway/config.d/05-theme.conf | 38 -------- hyprland/.config/sway/config.d/06-modes.conf | 24 ----- .../.config/sway/config.d/30-wallpaper.conf | 5 - .../sway/config.d/40-window-rules.conf | 60 ------------ .../.config/sway/config.d/90-swayidle.conf | 15 --- .../.config/sway/config.d/90-wlsunset.conf | 11 --- hyprland/.config/sway/config.d/template | 2 - hyprland/.config/sway/environment | 2 - .../dsk-ryzen-1.ws.mgmt.desu.ltd.conf | 54 ----------- .../lap-fw-diy-1.ws.mgmt.desu.ltd.conf | 32 ------- hyprland/.config/sway/machine.d/template | 28 ------ hyprland/.config/swayidle/config | 4 - hyprland/.config/swaylock/config | 2 - 16 files changed, 411 deletions(-) delete mode 100644 hyprland/.config/sway/config delete mode 100644 hyprland/.config/sway/config.d/03-keybinds.conf delete mode 100644 hyprland/.config/sway/config.d/04-inputs.conf delete mode 100644 hyprland/.config/sway/config.d/05-theme.conf delete mode 100644 hyprland/.config/sway/config.d/06-modes.conf delete mode 100644 hyprland/.config/sway/config.d/30-wallpaper.conf delete mode 100644 hyprland/.config/sway/config.d/40-window-rules.conf delete mode 100644 hyprland/.config/sway/config.d/90-swayidle.conf delete mode 100644 hyprland/.config/sway/config.d/90-wlsunset.conf delete mode 100644 hyprland/.config/sway/config.d/template delete mode 100644 hyprland/.config/sway/environment delete mode 100644 hyprland/.config/sway/machine.d/dsk-ryzen-1.ws.mgmt.desu.ltd.conf delete mode 100644 hyprland/.config/sway/machine.d/lap-fw-diy-1.ws.mgmt.desu.ltd.conf delete mode 100644 hyprland/.config/sway/machine.d/template delete mode 100644 hyprland/.config/swayidle/config delete mode 100644 hyprland/.config/swaylock/config diff --git a/hyprland/.config/sway/config b/hyprland/.config/sway/config deleted file mode 100644 index 40cd5594..00000000 --- a/hyprland/.config/sway/config +++ /dev/null @@ -1,21 +0,0 @@ -# -# Salt's Sway configuration file -# -# NOTE -# Any further configuration that isn't just declaring a global should be -# done via the creation of a file in config.d. -# -# Note that you can also override system-provided configs by making an -# identically-named file in config.d -# - -## CONFIGS -set $term foot -# Set modifiers -set $mod Mod1 -set $sup Mod4 -set $ctl Ctrl -set $shift Shift - -include '$(/usr/libexec/sway/layered-include "/usr/share/sway/config.d/*.conf" "/etc/sway/config.d/*.conf" "${XDG_CONFIG_HOME:-$HOME/.config}/sway/config.d/*.conf")' -include "${XDG_CONFIG_HOME:-$HOME/.config}/sway/machine.d/$HOSTNAME.conf" diff --git a/hyprland/.config/sway/config.d/03-keybinds.conf b/hyprland/.config/sway/config.d/03-keybinds.conf deleted file mode 100644 index a60c9cf7..00000000 --- a/hyprland/.config/sway/config.d/03-keybinds.conf +++ /dev/null @@ -1,91 +0,0 @@ -# vim: set ft=swayconfig: -# -# This file holds keybinds for all of swaywm -# - -# Use Mouse+$mod to drag floating windows to their wanted position -floating_modifier $mod -# Program opening and closing -bindsym $mod+Return exec "$term" -bindsym $mod+q kill -bindsym $mod+space exec "rofi -show drun" -bindsym $mod+backslash exec "rofi -show ssh" -bindsym $mod+Tab exec "rofi -show window" -# Dunst management -bindsym $mod+$shift+space exec dunstctl close -bindsym $mod+$shift+Return exec dunstctl close-all -bindsym $mod+$shift+d exec dunstctl history-pop -bindsym $mod+$shift+o exec dunstctl context -# Pulse controls -bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume 0 +5% #increase sound volume -bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume 0 -5% #decrease sound volume -bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute 0 toggle # mute sound -# Screenshots -bindsym $mod+o exec grim -g "$(slurp -d)" - | wl-copy -# Brightness controls -#bindsym XF86MonBrightnessUp exec xbacklight -inc 5 # increase screen brightness -#bindsym XF86MonBrightnessDown exec xbacklight -dec 5 # decrease screen brightness -# pavucontrol controls -bindsym $mod+p exec --no-startup-id "pgrep pavucontrol || pavucontrol" -bindsym $mod+$shift+p exec --no-startup-id "pkill pavucontrol" -# Miscellaneous non-movement hotkeys -bindsym $ctl+$mod+l exec --no-startup-id "loginctl lock-session" -bindsym $mod+$shift+c reload -# Change focus -bindsym $mod+h focus left -bindsym $mod+j focus down -bindsym $mod+k focus up -bindsym $mod+l focus right -# Move the focused window around -bindsym $mod+$shift+h move left -bindsym $mod+$shift+j move down -bindsym $mod+$shift+k move up -bindsym $mod+$shift+l move right -# Move the focused workspace between monitors -# Disabled here because I like having workspaces allocated to certain outputs -#bindsym $sup+h move workspace to output left -#bindsym $sup+j move workspace to output down -#bindsym $sup+k move workspace to output up -#bindsym $sup+l move workspace to output right -# Configure the split of this container -bindsym $mod+semicolon split h -bindsym $mod+v split v -# Toggle floating -bindsym $mod+f floating toggle -# Fullscreen -bindsym $mod+$shift+f fullscreen toggle -# Change the layout of this container -# Disabled because I just fatfinger these, they're never useful in my workflow -#bindsym $mod+s layout stacking -bindsym $mod+w layout tabbed -bindsym $mod+e layout toggle split -# Focus the parent container. Lets you move groups at a time -bindsym $mod+a focus parent -# Focus the child container -bindsym $mod+d focus child -# Switch between workspaces -bindsym $mod+1 workspace $w1 -bindsym $mod+2 workspace $w2 -bindsym $mod+3 workspace $w3 -bindsym $mod+4 workspace $w4 -bindsym $mod+5 workspace $w5 -bindsym $mod+6 workspace $w6 -bindsym $mod+7 workspace $w7 -bindsym $mod+8 workspace $w8 -bindsym $mod+9 workspace $w9 -bindsym $mod+0 workspace $w10 -bindsym $mod+minus workspace $w11 -bindsym $mod+period workspace next -bindsym $mod+comma workspace prev -# Move the focused container to a specific workspace -bindsym $mod+$shift+1 move container to workspace $w1 -bindsym $mod+$shift+2 move container to workspace $w2 -bindsym $mod+$shift+3 move container to workspace $w3 -bindsym $mod+$shift+4 move container to workspace $w4 -bindsym $mod+$shift+5 move container to workspace $w5 -bindsym $mod+$shift+6 move container to workspace $w6 -bindsym $mod+$shift+7 move container to workspace $w7 -bindsym $mod+$shift+8 move container to workspace $w8 -bindsym $mod+$shift+9 move container to workspace $w9 -bindsym $mod+$shift+0 move container to workspace $w10 -bindsym $mod+$shift+minus move container to workspace $w11 diff --git a/hyprland/.config/sway/config.d/04-inputs.conf b/hyprland/.config/sway/config.d/04-inputs.conf deleted file mode 100644 index e9c1d400..00000000 --- a/hyprland/.config/sway/config.d/04-inputs.conf +++ /dev/null @@ -1,22 +0,0 @@ -# vim: set ft=swayconfig: -# -# This file stores global confguration for input devices -# - -# Mice -#input "type:pointer" { -# accel_profile flat # Disables mouse acceleration -# pointer_accel 0.000 # Set a sens that I like -#} -input "type:touchpad" { - drag enabled - dwt disabled - tap enabled - tap_button_map lrm -} -# Keyboards -input "type:keyboard" { - xkb_capslock disabled - xkb_numlock enabled -} - diff --git a/hyprland/.config/sway/config.d/05-theme.conf b/hyprland/.config/sway/config.d/05-theme.conf deleted file mode 100644 index e59e0732..00000000 --- a/hyprland/.config/sway/config.d/05-theme.conf +++ /dev/null @@ -1,38 +0,0 @@ -# vim: set ft=swayconfig: -# -# This file controls all theming within swaywm, including colors, gaps, -# borders, fonts, etc. -# -# Right now we're staring at a nice gruvbox theme -# -font pango:IBM Plex Sans 12 -default_border pixel 4 -titlebar_border_thickness 4 -focus_on_window_activation none -gaps inner 8 - -set $red #fb4934 -set $green #b8bb26 -set $yellow #fabd2f -set $blue #83a598 -set $magenta #de869b -set $cyan #8ec07c -set $white #ebdbb2 -set $black #282828 -set $gray #32302f - -# See sway(5) for details on these -# Border color of the view itself v -# Indicator color (like for v/h split) v -# Titlebar text color v -# Titlebar backgrouond color v -# Titlebar border color v -# - # The currently focused window - client.focused $blue $blue $black $gray $blue - # The most recently focused view in an unfocused container - client.focused_inactive $gray $black $white $gray $gray - # Any other unfocused views - client.unfocused $gray $gray $white $gray $gray - # Any view with an urgency hint - client.urgent $yellow $black $white $gray $yellow diff --git a/hyprland/.config/sway/config.d/06-modes.conf b/hyprland/.config/sway/config.d/06-modes.conf deleted file mode 100644 index 9dd946ca..00000000 --- a/hyprland/.config/sway/config.d/06-modes.conf +++ /dev/null @@ -1,24 +0,0 @@ -# vim: set ft=swayconfig: -# -# This file stores "modes" for sway, such as for resizing -# - -# Resize -bindsym $mod+r mode "resize" -mode "resize" { - bindsym h resize shrink width 10 px or 10 ppt - bindsym j resize grow height 10 px or 10 ppt - bindsym k resize shrink height 10 px or 10 ppt - bindsym l resize grow width 10 px or 10 ppt - - bindsym Left resize shrink width 10 px or 10 ppt - bindsym Down resize grow height 10 px or 10 ppt - bindsym Up resize shrink height 10 px or 10 ppt - bindsym Right resize grow width 10 px or 10 ppt - - bindsym Return mode "default" - bindsym Escape mode "default" - bindsym $mod+r mode "default" -} - - diff --git a/hyprland/.config/sway/config.d/30-wallpaper.conf b/hyprland/.config/sway/config.d/30-wallpaper.conf deleted file mode 100644 index 5419ed5f..00000000 --- a/hyprland/.config/sway/config.d/30-wallpaper.conf +++ /dev/null @@ -1,5 +0,0 @@ -# vim: set ft=swayconfig: -# Wallpaper -#output * bg ~/Pictures/Wallpapers/.current fill -output * bg ~/Pictures/Wallpapers/.current center #282828 - diff --git a/hyprland/.config/sway/config.d/40-window-rules.conf b/hyprland/.config/sway/config.d/40-window-rules.conf deleted file mode 100644 index b63231e3..00000000 --- a/hyprland/.config/sway/config.d/40-window-rules.conf +++ /dev/null @@ -1,60 +0,0 @@ -# vim: set ft=swayconfig: -# -# This file allocates rules for organizing windows -# - -## WORKSPACES -set $w1 1 -set $w2 2 -set $w3 3 -set $w4 4 -set $w5 5 -set $w6 6 -set $w7 7 -set $w8 8 -set $w9 9 -set $w10 10 -set $w11 11 - -# General rules of thought: -# * The primary monitor will contain workspaces 1-7 -# * Secondary monitors will get workspaces 8-10 -# * Important apps go on primary, unimportant ones that are likely to be side- -# content, event-driven, and distractive can go on the secondary -# * Laptops get all 10 on one monitor, but shunting unimportant junk to the -# back workspaces yields a better workflow regardless -# * No rules are set in stone and the user can totally just move stuff around -# with reckless abandon -for_window { - # Workspace 1 should always be the web browser - [app_id="org.mozilla.firefox"] move container to workspace $w1 - - # Workspace 2 should contain Steam, if we intend to launch a game this session - #[app_id="com.valvesoftware.Steam"] move container to workspace $w2 - - # Workspace 8 contains Thunderbird and Keepass - [app_id="org.keepassxc.KeePassXC"] move container to workspace $w8 - [app_id="org.mozilla.Thunderbird"] move container to workspace $w8 - [class="thunderbird"] move container to workspace $w8 - - # Workspace 9 should be communications platforms - [app_id="com.dev.vencord.Vesktop"] move container to workspace $w9 - [app_id="com.dev.vencord.Vesktop"] inhibit_idle visible - [app_id="vesktop"] move container to workspace $w9 - [app_id="vesktop"] inhibit_idle visible - [app_id="com.discordapp.Discord"] move container to workspace $w9 - [app_id="com.discordapp.Discord"] inhibit_idle visible - - [app_id="im.riot.Riot"] move container to workspace $w9 - [app_id="im.riot.Riot"] inhibit_idle visible - - # And Workspace 10 should contain misc. long-running programs - [class="Spotify"] move container to workspace $w10 - [app_id="spotube"] move container to workspace $w10 - [class="nuclear"] move container to workspace $w10 -} - -# These rules are app-specific but for any workspace -for_window { - [class="steam_app_2291060"] fullscreen -} diff --git a/hyprland/.config/sway/config.d/90-swayidle.conf b/hyprland/.config/sway/config.d/90-swayidle.conf deleted file mode 100644 index 81c19dd0..00000000 --- a/hyprland/.config/sway/config.d/90-swayidle.conf +++ /dev/null @@ -1,15 +0,0 @@ -# vim: set ft=swayconfig: -# -# Idle and lock configuration -# - -exec LT="900" && \ - swayidle -w \ - timeout $LT \ - 'swaylock -f' \ - before-sleep \ - 'swaylock -f' \ - lock \ - 'swaylock -f' \ - unlock \ - 'pkill -xu "$USER" -SIGUSR1 swaylock' diff --git a/hyprland/.config/sway/config.d/90-wlsunset.conf b/hyprland/.config/sway/config.d/90-wlsunset.conf deleted file mode 100644 index 49d84419..00000000 --- a/hyprland/.config/sway/config.d/90-wlsunset.conf +++ /dev/null @@ -1,11 +0,0 @@ -# vim: set ft=swayconfig: -# -# wlsunset is more or less redshift. It reddens the screen as the day draws -# to a close. -# -# For customization, see wlsunset(1) -# -exec wlsunset \ - -T 5300 \ - -t 3500 \ - -g 1 diff --git a/hyprland/.config/sway/config.d/template b/hyprland/.config/sway/config.d/template deleted file mode 100644 index 7122041d..00000000 --- a/hyprland/.config/sway/config.d/template +++ /dev/null @@ -1,2 +0,0 @@ -# vim: set ft=swayconfig: - diff --git a/hyprland/.config/sway/environment b/hyprland/.config/sway/environment deleted file mode 100644 index c24fe4c8..00000000 --- a/hyprland/.config/sway/environment +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -SWAY_EXTRA_ARGS="-D noscanout" diff --git a/hyprland/.config/sway/machine.d/dsk-ryzen-1.ws.mgmt.desu.ltd.conf b/hyprland/.config/sway/machine.d/dsk-ryzen-1.ws.mgmt.desu.ltd.conf deleted file mode 100644 index e6fda6b3..00000000 --- a/hyprland/.config/sway/machine.d/dsk-ryzen-1.ws.mgmt.desu.ltd.conf +++ /dev/null @@ -1,54 +0,0 @@ -# vim: set ft=swayconfig: -set $monprim "Acer Technologies XV272U 0x11122114" -set $monsec "Acer Technologies XV272U 0x0501FD67" - -output $monprim { - res 2560x1440@143.998993Hz - pos 1440 937 - adaptive_sync off -} -output $monsec { - res 2560x1440@143.998993Hz - pos 0 0 - transform 270 - adaptive_sync off -} -# Valve Index -output "Unknown Unknown Unknown" { - disable -} - -input type:pointer { - accel_profile flat - pointer_accel 0.000 -} - -output * bg ~/Pictures/Wallpapers/1561879941868.jpg fill - -## WORKSPACES -set $w1 1 -set $w2 2 -set $w3 3 -set $w4 4 -set $w5 5 -set $w6 6 -set $w7 7 -set $w8 8 -set $w9 9 -set $w10 10 -set $w11 11 -# Workspace setup for my desktop -# Defaults to whatever on my laptop and on other machines -workspace $w1 output $monprim -workspace $w2 output $monprim -workspace $w3 output $monprim -workspace $w4 output $monprim -workspace $w5 output $monprim -workspace $w6 output $monprim -workspace $w7 output $monprim -# Putting 10 here first so it's the default for my secondary -workspace $w10 output $monsec -workspace $w8 output $monsec -workspace $w9 output $monsec -workspace $w11 output $monsec - diff --git a/hyprland/.config/sway/machine.d/lap-fw-diy-1.ws.mgmt.desu.ltd.conf b/hyprland/.config/sway/machine.d/lap-fw-diy-1.ws.mgmt.desu.ltd.conf deleted file mode 100644 index e6798700..00000000 --- a/hyprland/.config/sway/machine.d/lap-fw-diy-1.ws.mgmt.desu.ltd.conf +++ /dev/null @@ -1,32 +0,0 @@ -# vim: set ft=swayconfig: -set $monprim "eDP-1" - -output $monprim scale 1.5 - -output * bg ~/Pictures/Wallpapers/1561879941868.jpg fill - -## WORKSPACES -set $w1 1 -set $w2 2 -set $w3 3 -set $w4 4 -set $w5 5 -set $w6 6 -set $w7 7 -set $w8 8 -set $w9 9 -set $w10 10 -set $w11 11 -# Workspace setup for my desktop -# Defaults to whatever on my laptop and on other machines -workspace $w1 output $mon -workspace $w2 output $mon -workspace $w3 output $mon -workspace $w4 output $mon -workspace $w5 output $mon -workspace $w6 output $mon -workspace $w7 output $mon -workspace $w8 output $mon -workspace $w9 output $mon -workspace $w10 output $mon -workspace $w11 output $mon diff --git a/hyprland/.config/sway/machine.d/template b/hyprland/.config/sway/machine.d/template deleted file mode 100644 index 2c9e1484..00000000 --- a/hyprland/.config/sway/machine.d/template +++ /dev/null @@ -1,28 +0,0 @@ -# vim: set ft=swayconfig: -## WORKSPACES -set $w1 1 -set $w2 2 -set $w3 3 -set $w4 4 -set $w5 5 -set $w6 6 -set $w7 7 -set $w8 8 -set $w9 9 -set $w10 10 -# Workspace setup for my desktop -# Defaults to whatever on my laptop and on other machines -set $monprim DisplayPort-0 -set $monsec HDMI-A-0 -workspace $w1 output $monprim -workspace $w2 output $monprim -workspace $w3 output $monprim -workspace $w4 output $monprim -workspace $w5 output $monprim -workspace $w6 output $monprim -workspace $w7 output $monprim -# Putting 10 here first so it's the default for my secondary -workspace $w10 output $monsec -workspace $w8 output $monsec -workspace $w9 output $monsec - diff --git a/hyprland/.config/swayidle/config b/hyprland/.config/swayidle/config deleted file mode 100644 index f700bca5..00000000 --- a/hyprland/.config/swayidle/config +++ /dev/null @@ -1,4 +0,0 @@ -timeout 900 'swaylock -f' -before-sleep 'swaylock -f' -lock 'swaylock -f' -unlock 'pkill -xu "$USER" -SIGUSR1 swaylock' diff --git a/hyprland/.config/swaylock/config b/hyprland/.config/swaylock/config deleted file mode 100644 index 9160b192..00000000 --- a/hyprland/.config/swaylock/config +++ /dev/null @@ -1,2 +0,0 @@ -scaling=fill -color=000000