From 3bc35117dd0916ad72e1969f827804d693559c87 Mon Sep 17 00:00:00 2001 From: Simon Bruder Date: Sat, 7 Nov 2020 14:05:51 +0100 Subject: [PATCH] Remove sway --- home/.config/mako/config | 8 -- home/.config/sway/config | 191 ---------------------------------- home/.config/waybar/config | 163 ----------------------------- home/.config/waybar/style.css | 153 --------------------------- home/.zprofile | 5 - 5 files changed, 520 deletions(-) delete mode 100644 home/.config/mako/config delete mode 100644 home/.config/sway/config delete mode 100644 home/.config/waybar/config delete mode 100644 home/.config/waybar/style.css delete mode 100644 home/.zprofile diff --git a/home/.config/mako/config b/home/.config/mako/config deleted file mode 100644 index c44f8b0..0000000 --- a/home/.config/mako/config +++ /dev/null @@ -1,8 +0,0 @@ -background-color=#002b36 -border-color=#073642 -text-color=#839496 -progress-color=over #073642 - -group-by=app-name - -default-timeout=5000 diff --git a/home/.config/sway/config b/home/.config/sway/config deleted file mode 100644 index 022d0ee..0000000 --- a/home/.config/sway/config +++ /dev/null @@ -1,191 +0,0 @@ -# vim: set ts=4 sw=4 sts=4: -set $mod Mod4 - -set $left h -set $down j -set $up k -set $right l - -set $term alacritty - -# Symlink to the current wallpaper -set $wallpaper $HOME/.config/sway/wallpaper - -set $menu dmenu-wl_path | dmenu-wl -nb "#002b36" -nf "#839496" -sb "#859900" -sf "#073642" | xargs swaymsg exec -- - -# Outputs -output * bg $wallpaper fill - -# FIXME: maybe use kanshi -output eDP-1 resolution 1920x1080 position 0,424 -output "Dell Inc. DELL U2410 F525M0A104NL" resolution 1920x1200 position 1920,0 - -# Inputs -input type:keyboard { - xkb_layout de - xkb_options compose:caps - xkb_numlock enable -} - -# Idle -exec swayidle -w \ - timeout 300 "swaylock -f -i $wallpaper" \ - timeout 300 'swaymsg "output * dpms off"' \ - resume 'swaymsg "output * dpms on"' \ - before-sleep "swaylock -f -i $wallpaper" - -# Key bindings -# Basics -bindsym $mod+Return exec $term -bindsym $mod+Shift+c kill -bindsym $mod+r exec $menu -floating_modifier $mod normal -bindsym $mod+Control+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' - -# Focus -bindsym $mod+$left focus left -bindsym $mod+$down focus down -bindsym $mod+$up focus up -bindsym $mod+$right focus right - -bindsym $mod+Left focus left -bindsym $mod+Down focus down -bindsym $mod+Up focus up -bindsym $mod+Right focus right - -# Moving -bindsym $mod+Shift+$left move left -bindsym $mod+Shift+$down move down -bindsym $mod+Shift+$up move up -bindsym $mod+Shift+$right move right - -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 workspace 1 -bindsym $mod+2 workspace 2 -bindsym $mod+3 workspace 3 -bindsym $mod+4 workspace 4 -bindsym $mod+5 workspace 5 -bindsym $mod+6 workspace 6 -bindsym $mod+7 workspace 7 -bindsym $mod+8 workspace 8 -bindsym $mod+9 workspace 9 -bindsym $mod+0 workspace 10 - -bindsym $mod+Shift+1 move container to workspace 1 -bindsym $mod+Shift+2 move container to workspace 2 -bindsym $mod+Shift+3 move container to workspace 3 -bindsym $mod+Shift+4 move container to workspace 4 -bindsym $mod+Shift+5 move container to workspace 5 -bindsym $mod+Shift+6 move container to workspace 6 -bindsym $mod+Shift+7 move container to workspace 7 -bindsym $mod+Shift+8 move container to workspace 8 -bindsym $mod+Shift+9 move container to workspace 9 -bindsym $mod+Shift+0 move container to workspace 10 - -# Moving workspaces between outputs -bindsym $mod+Control+$left move workspace to output left -bindsym $mod+Control+$down move workspace to output down -bindsym $mod+Control+$up move workspace to output up -bindsym $mod+Control+$right move workspace to output right - -bindsym $mod+Control+Left move workspace to output left -bindsym $mod+Control+Down move workspace to output down -bindsym $mod+Control+Up move workspace to output up -bindsym $mod+Control+Right move workspace to output right - -# open next window as (vertical/horizontal) split -bindsym $mod+b splith -bindsym $mod+v splitv - -# layouts -bindsym $mod+s layout stacking -bindsym $mod+t layout tabbed -bindsym $mod+e layout toggle split - -bindsym $mod+f fullscreen -bindsym $mod+Control+space floating toggle - -# switch focus to tiling/floating -bindsym $mod+space focus mode_toggle - -bindsym $mod+a focus parent - -# Scratchpad -bindsym $mod+Shift+minus move scratchpad -# show/hide/cycle scratchpad windows -bindsym $mod+minus scratchpad show - -# Resizing -mode "resize" { - bindsym $left resize shrink width 10px - bindsym $down resize grow height 10px - bindsym $up resize shrink height 10px - bindsym $right resize grow width 10px - - bindsym Left resize shrink width 10px - bindsym Down resize grow height 10px - bindsym Up resize shrink height 10px - bindsym Right resize grow width 10px - - bindsym Return mode "default" - bindsym Escape mode "default" -} -bindsym $mod+d mode "resize" - -# Multimedia Keys -bindsym XF86AudioMute exec pactl set-sink-mute @DEFAULT_SINK@ toggle -bindsym XF86AudioMicMute exec pactl set-source-mute @DEFAULT_SOURCE@ toggle -bindsym --locked XF86MonBrightnessDown exec brightnessctl set 5%- -bindsym --locked XF86MonBrightnessUp exec brightnessctl set +5% -bindsym XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +5% -bindsym XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ -5% - -bindsym XF86AudioPrev exec mpc next -bindsym XF86AudioNext exec mpc prev -bindsym XF86AudioPlay exec mpc toggle - -bindsym $mod+y exec "swaylock -f -i $wallpaper" -bindsym --locked $mod+q exec 'test $(swaymsg -t get_outputs | jq "[.[].dpms] | any") = "true" && swaymsg "output * dpms off" || swaymsg "output * dpms on"' - -# Status Bar -bar { - swaybar_command waybar -} - -# Window rules (native: by app_id, xwayland legacy: by class) -assign [app_id="firefox"] 2 -#assign [class="Chromium"] 2 -assign [app_id="net.sourceforge.mumble."] 3 -assign [class="Claws-mail"] 3 -assign [app_id="anki"] 4 -assign [app_id="libreoffice-startcenter"] 4 -assign [app_id="net.sourceforge.gscan2pdf"] 4 -assign [app_id="org.pwmt.zathura"] 4 -assign [app_id="xournalpp"] 4 -assign [app_id="audacious"] 5 -assign [app_id="pavucontrol"] 5 -assign [app_id="darktable"] 8 -assign [app_id="org.inkscape.Inkscape"] 8 -assign [class="Blender"] 8 -assign [class="Gimp"] 8 -assign [class="krita"] 8 - -# Window borders -default_border pixel 1 - -client.focused "#93a1a1" "#073642" "#93a1a1" "#2aa198" -client.focused_inactive "#839496" "#002b36" "#839496" "#2aa198" -client.unfocused "#839496" "#002b36" "#839496" "#2aa198" -client.urgent "#073642" "#dc322f" "#073642" "#2aa198" - -# Cursor -seat seat0 xcursor_theme Adwaita - -# Autostart -exec mako diff --git a/home/.config/waybar/config b/home/.config/waybar/config deleted file mode 100644 index fccacff..0000000 --- a/home/.config/waybar/config +++ /dev/null @@ -1,163 +0,0 @@ -// vim: set ft=json: -// not actually json, but better than nothing -{ - "layer": "top", - "position": "top", - "height": 24, // Waybar height (to be removed for auto height) - - // Position/Order of modules - "modules-left": [ - "sway/workspaces", - "sway/mode" - ], - "modules-center": [], - "modules-right": [ - "tray", - "custom/redshift", - "idle_inhibitor", - "backlight", - "mpd", - "pulseaudio", - "network", - "custom/vpn", - "network#speed", - "memory", - "cpu", - "temperature", - "battery", - "clock" - ], - - // Modules configuration - "sway/workspaces": { - "disable-scroll": true - }, - "sway/mode": { - "format": "{}" - }, - - "mpd": { - "format": "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} – {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) ", - "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": "綾 " - }, - "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": 5 - }, - "clock": { - "format": "{:%H:%M %Z}", - "format-alt": "{:%Y-%m-%d (%a)}", - "tooltip-format": "{:%Y %B}\n{calendar}" - }, - "cpu": { - "interval": 2, - "format": "{usage:2}% ﬙ ", - "tooltip": false - }, - "memory": { - "interval": 2, - "format": "{:2}%  " - }, - "temperature": { - "critical-threshold": 80, - "format": "{temperatureC}°C {icon}", - "format-icons": ["", "", "", "", ""] - }, - "backlight": { - "format": "{percent}% {icon}", - "format-icons": [" ", " ", " ", " ", " ", " ", " "], - "on-scroll-up": "brightnessctl set +5%", - "on-scroll-down": "brightnessctl set 5%-" - }, - "battery": { - "interval": 5, - "states": { - "good": 95, - "warning": 30, - "critical": 15 - }, - "format": "{capacity}% {icon}", - "format-charging": "{capacity}% ", - "format-plugged": "{capacity}% ﮣ", - "format-alt": "{time} {icon}", - "format-icons": ["", "", "", "", "", "", "", "", "", "", ""] - }, - "network": { - "format-wifi": "{essid} ({signalStrength}%) 直 ", - "format-ethernet": "{ifname}: {ipaddr}/{cidr}  ", - "format-linked": "{ifname} (No IP)  ", - "format-disconnected": "Disconnected ⚠ ", - "format-alt": "{ifname}: {ipaddr}/{cidr}", - "tooltip": false, - "on-click-right": "alacritty -e nmtui" - }, - "network#speed": { - "interval": 2, - "format": "{bandwidthDownBits:>8}  {bandwidthUpBits:>8} 祝", - "format-alt": "{bandwidthDownOctets:>8}  {bandwidthUpOctets:>8} 祝", - "format-disconnected": " 0b/s 祝 0b/s", - "tooltip": false - }, - "pulseaudio": { - "format": "{volume}% {icon} {format_source}", - "format-bluetooth": "{volume}% {icon} {format_source}", - "format-bluetooth-muted": "遼 {icon} {format_source}", // FIXME: see below - "format-muted": "遼 {format_source}", // FIXME: use normal mute icon (ﱝ ), which for some reason is displayed right of the source? - "format-source": "{volume}% \u2009", - "format-source-muted": "\u2009", - "format-icons": { - "headphone": " ", - "hands-free": " ", - "headset": " ", - "phone": " ", - "portable": " ", - "car": " ", - "default": ["奄", "奔", "墳"] - }, - "on-click": "pavucontrol" - }, - "custom/vpn": { - "interval": 10, - "exec": "ip -j link | jq --unbuffered --compact-output '[[.[].ifname | select(. | startswith(\"mullvad\"))][] | split(\"-\")[1] + \" \u2009\"] as $conns | { text: ($conns[0] // \"\"), class: (if $conns | length > 0 then \"connected\" else \"disconnected\" end) }'", - "return-type": "json", - "format": "{}", - "tooltip": false - }, - "custom/redshift": { - "interval": 10, - "exec": "systemctl --user show redshift | grep -q ActiveState=active && echo '{\"tooltip\": \"Redshift active\", \"class\": \"active\"}' || echo '{\"tooltip\": \"Redshift inactive\", \"class\": \"inactive\"}'", - "on-click": "systemctl --user show redshift | grep -q ActiveState=active && systemctl --user stop redshift || systemctl --user start redshift", - "return-type": "json", - "format": "", - "tooltip": false - } -} diff --git a/home/.config/waybar/style.css b/home/.config/waybar/style.css deleted file mode 100644 index e4119f5..0000000 --- a/home/.config/waybar/style.css +++ /dev/null @@ -1,153 +0,0 @@ -* { - border-radius: 0; - border: none; - font-family: "Iosevka Nerd Font"; - font-size: 12px; - min-height: 0; - transition-property: none; -} - -window#waybar { - background-color: #002b36; - color: #839496; -} - -#workspaces button { - padding: 0 5px; - background-color: #002b36; - color: inherit; - border-bottom: 2px solid transparent; -} - -#workspaces button:hover { - background: #073642; - box-shadow: inherit; - text-shadow: inherit; -} - -#workspaces button.focused { - border-bottom: 2px solid #859900; -} - -#workspaces button.urgent { - background-color: #dc322f; -} - -#mode { - background-color: #073642; - font-style: italic; -} - -/* all modules on the right */ -#waybar > box > box:nth-child(3) > widget > label { - padding: 0 10px; -} - -#battery.charging { - color: #073642; - background-color: #859900; -} - -@keyframes blink { - to { - background-color: #fdf6e3; - color: #657b83; - } -} - -#battery.critical:not(.charging), -#temperature.critical { - background-color: #dc322f; - animation-name: blink; - animation-duration: 0.5s; - /* FIXME use nearest neighbor interpolation if possible */ - animation-timing-function: cubic-bezier(1, 0, 0, 1); - animation-iteration-count: infinite; - animation-direction: alternate; -} - -#cpu { - background-color: #2aa198; - color: #073642 -} - -#memory { - background-color: #b58900; - color: #073642 -} - -#backlight { - background-color: #fdf6e3; - color: #657b83; -} - -#network { - background-color: #6c71c4; - color: #073642 -} - -#custom-vpn { - background-color: #268bd2; - color: #073642 -} - -#network.disconnected { - background-color: #dc322f; -} - -#network.speed { - background-color: #859900; -} - -#pulseaudio { - background-color: #fdf6e3; - color: #657b83; -} - -#pulseaudio.muted { - background-color: #002b36; - color: #839496; -} - -#temperature { - background-color: #d33682; - color: #073642; -} - -#idle_inhibitor.activated { - background-color: #fdf6e3; - color: #002b36; -} - -#mpd { - background-color: #859900; - color: #073642; -} - -#mpd.disconnected { - background-color: #dc322f; -} - -#mpd.stopped { - background-color: #cb4b16; -} - -#mpd.paused { - background-color: #b58900; -} - -#custom-redshift { - color: #073642; -} - -#custom-redshift.active { - background-color: #dc322f; -} - -#custom-redshift.inactive { - background-color: #268bd2; -} - -#tray { - padding: 0 5px; -} diff --git a/home/.zprofile b/home/.zprofile deleted file mode 100644 index d0300fe..0000000 --- a/home/.zprofile +++ /dev/null @@ -1,5 +0,0 @@ -if [[ -z $WAYLAND_DISPLAY ]] && [[ $(tty) = /dev/tty1 ]] && command -v sway >/dev/null ; then - systemctl --user start graphical-session.target - export XDG_SESSION_TYPE="wayland" - exec sway -fi