Declutter.

3 files changed, 203 insertions, 245 deletions

diff --git a/.config/sway/config b/.config/sway/config
index 69c2727..8d2df6b 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -1,42 +1,195 @@
-include ./defaults
-
 ### Variables
+set $left h
+set $down j
+set $up k
+set $right l
 set $mod Mod4
-set $menu rofi -show run
-#bemenu-run
 set $term alacritty
 
-### Key Bindings
-# I repeat them here to add `--to-code --no-warn` flag to make the bindings layout agnostic.
-bindsym --to-code --no-warn {
-  $mod+$left focus left
-  $mod+$down focus down
-  $mod+$up focus up
-  $mod+$right focus right
-}
-bindsym --to-code --no-warn $mod+Return exec $term
-bindsym --to-code --no-warn $mod+Shift+q kill
-bindsym --to-code --no-warn $mod+d exec $menu
-bindsym --to-code --no-warn $mod+Shift+c reload
+# Note: pass the final command to swaymsg so that the resulting window can be opened
+# on the original workspace that the command was run on.
+#set $menu dmenu_path | dmenu | xargs swaymsg exec --
+set $menu rofi -show run
+
+### Output configuration
+#
+# Default wallpaper (more resolutions are available in /usr/share/backgrounds/sway/)
+output * bg /usr/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill
+#
+# Example configuration:
+#
+#	output HDMI-A-1 resolution 1920x1080 position 1920,0
+#
+# You can get the names of your outputs by running: swaymsg -t get_outputs
+
+### Idle configuration
+#
+# Example configuration:
+#
+exec swayidle -w \
+	timeout 300 'swaylock -f -c 000000' \
+	timeout 600 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' \
+	before-sleep 'swaylock -f -c 000000'
+
+# This will lock your screen after 300 seconds of inactivity, then turn off
+# your displays after another 300 seconds, and turn your screens back on when
+# resumed. It will also lock your screen before your computer goes to sleep.
+
+### Input configuration
+#
+# Example configuration:
+#
+#	input "2:14:SynPS/2_Synaptics_TouchPad" {
+#		dwt enabled
+#		tap enabled
+#		natural_scroll enabled
+#		middle_emulation enabled
+#	}
+#
+# 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.
 
 input * {
-    xkb_layout "de,ir"
-    xkb_options "lv3:caps_switch,grp:lctrl_lwin_toggle,shift:both_shiftlock"
+	xkb_layout "de,ir"
+	xkb_options "lv3:caps_switch,grp:lctrl_lwin_toggle,shift:both_shiftlock"
 }
 
 input type:touchpad {
-    tap disabled
-    natural_scroll enabled
+	tap disabled
+	natural_scroll enabled
 }
 
-bar {
-  status_command i3status
+### Key Bindings
+# `--to-code --no-warn` are used to make bindings layout agnostic.
+bindsym --to-code --no-warn {
+	$mod+Return exec $term
+	$mod+d exec $menu
+	$mod+Shift+q kill
+	$mod+Shift+c reload
+	$mod+Shift+e 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'
 }
 
-# Enable fzf-based floating app menu
-#for_window [app_id="^launcher$"] floating enable, sticky enable, resize set 30 ppt 60 ppt, border pixel 10
-#set $menu exec $term --class=launcher -e sway-launcher-desktop
-#bindsym --to-code --no-warn $mod+tab 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
+
+#
+# Moving around:
+#
+	# Move your focus around
+	bindsym --to-code $mod+$left focus left
+	bindsym --to-code $mod+$down focus down
+	bindsym --to-code $mod+$up focus up
+	bindsym --to-code $mod+$right focus right
+	# Or use $mod+[up|down|left|right]
+	bindsym --to-code $mod+Left focus left
+	bindsym --to-code $mod+Down focus down
+	bindsym --to-code $mod+Up focus up
+	bindsym --to-code $mod+Right focus right
+
+	# Move the focused window with the same, but add Shift
+	bindsym --to-code $mod+Shift+$left move left
+	bindsym --to-code $mod+Shift+$down move down
+	bindsym --to-code $mod+Shift+$up move up
+	bindsym --to-code $mod+Shift+$right move right
+	# Ditto, with arrow keys
+	bindsym --to-code $mod+Shift+Left move left
+	bindsym --to-code $mod+Shift+Down move down
+	bindsym --to-code $mod+Shift+Up move up
+	bindsym --to-code $mod+Shift+Right move right
+#
+# Workspaces:
+#
+	# Switch to workspace
+	bindsym --to-code $mod+1 workspace number 1
+	bindsym --to-code $mod+2 workspace number 2
+	bindsym --to-code $mod+3 workspace number 3
+	bindsym --to-code $mod+4 workspace number 4
+	bindsym --to-code $mod+5 workspace number 5
+	bindsym --to-code $mod+6 workspace number 6
+	bindsym --to-code $mod+7 workspace number 7
+	bindsym --to-code $mod+8 workspace number 8
+	bindsym --to-code $mod+9 workspace number 9
+	bindsym --to-code $mod+0 workspace number 10
+	# Move focused container to workspace
+	bindsym --to-code $mod+Shift+1 move container to workspace number 1
+	bindsym --to-code $mod+Shift+2 move container to workspace number 2
+	bindsym --to-code $mod+Shift+3 move container to workspace number 3
+	bindsym --to-code $mod+Shift+4 move container to workspace number 4
+	bindsym --to-code $mod+Shift+5 move container to workspace number 5
+	bindsym --to-code $mod+Shift+6 move container to workspace number 6
+	bindsym --to-code $mod+Shift+7 move container to workspace number 7
+	bindsym --to-code $mod+Shift+8 move container to workspace number 8
+	bindsym --to-code $mod+Shift+9 move container to workspace number 9
+	bindsym --to-code $mod+Shift+0 move container to workspace number 10
+	# Note: workspaces can have any name you want, not just numbers.
+	# We just use 1-10 as the default.
+
+#
+# Layout stuff:
+#
+	# You can "split" the current object of your focus with
+	# $mod+b or $mod+v, for horizontal and vertical splits
+	# respectively.
+	bindsym --to-code $mod+b splith
+	bindsym --to-code $mod+v splitv
+
+	# Switch the current container between different layout styles
+	bindsym --to-code $mod+s layout stacking
+	bindsym --to-code $mod+w layout tabbed
+	bindsym --to-code $mod+e layout toggle split
+
+	# Make the current focus fullscreen
+	bindsym --to-code $mod+f fullscreen
+
+	# Toggle the current focus between tiling and floating mode
+	bindsym --to-code $mod+Shift+space floating toggle
+
+	# Swap focus between the tiling area and the floating area
+	bindsym --to-code $mod+space focus mode_toggle
+
+	# Move focus to the parent container
+	bindsym --to-code $mod+a focus parent
+#
+# 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 --to-code $mod+Shift+minus 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 --to-code $mod+minus 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 --to-code $left resize shrink width 10px
+	bindsym --to-code $down resize grow height 10px
+	bindsym --to-code $up resize shrink height 10px
+	bindsym --to-code $right resize grow width 10px
+
+	# Ditto, with arrow keys
+	bindsym --to-code Left resize shrink width 10px
+	bindsym --to-code Down resize grow height 10px
+	bindsym --to-code Up resize shrink height 10px
+	bindsym --to-code Right resize grow width 10px
+
+	# Return to default mode
+	bindsym --to-code Return mode "default"
+	bindsym --to-code Escape mode "default"
+}
+bindsym --to-code $mod+r mode "resize"
 
 #
 # Multimedia keys - Courtesy of great Arch Linux wiki and its awesome users.
@@ -66,4 +219,27 @@ bindsym $ps2 exec grim -g "$(slurp)" - | wl-copy
 bindsym $ps3 exec grim $(xdg-user-dir PICTURES)/Screenshots/ps_$(date +"%Y%m%d%H%M%S").png
 bindsym $ps4 exec grim -g "$(slurp)" $(xdg-user-dir PICTURES)/Screenshots/ps_$(date +"%Y%m%d%H%M%S").png
 
+#
+# Status Bar:
+#
+# Read `man 5 sway-bar` for more information about this section.
+bar {
+	position top
+
+	# When the status_command prints a new line to stdout, swaybar updates.
+	# The default just shows the current date and time.
+	status_command while date +'%Y-%m-%d %l:%M:%S %p'; do sleep 1; done
+
+	colors {
+		statusline #ffffff
+		background #323232
+		inactive_workspace #32323200 #32323200 #5c5c5c
+	}
+}
+
+bar {
+	status_command i3status
+}
+
+# Load machine specific configuration
 include ~/.config/sway/`hostname`
diff --git a/.config/sway/defaults b/.config/sway/defaults
deleted file mode 100644
index fa32210..0000000
--- a/.config/sway/defaults
+++ /dev/null
@@ -1,217 +0,0 @@
-# Default config for sway
-#
-# Copy this to ~/.config/sway/config and edit it to your liking.
-#
-# Read `man 5 sway` for a complete reference.
-
-### Variables
-#
-# Logo key. Use Mod1 for Alt.
-set $mod Mod4
-# Home row direction keys, like vim
-set $left h
-set $down j
-set $up k
-set $right l
-# Your preferred terminal emulator
-set $term alacritty
-# Your preferred application launcher
-# Note: pass the final command to swaymsg so that the resulting window can be opened
-# on the original workspace that the command was run on.
-set $menu dmenu_path | dmenu | xargs swaymsg exec --
-
-### Output configuration
-#
-# Default wallpaper (more resolutions are available in /usr/share/backgrounds/sway/)
-output * bg /usr/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill
-#
-# Example configuration:
-#
-#   output HDMI-A-1 resolution 1920x1080 position 1920,0
-#
-# You can get the names of your outputs by running: swaymsg -t get_outputs
-
-### Idle configuration
-#
-# Example configuration:
-#
-# exec swayidle -w \
-#          timeout 300 'swaylock -f -c 000000' \
-#          timeout 600 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' \
-#          before-sleep 'swaylock -f -c 000000'
-#
-# This will lock your screen after 300 seconds of inactivity, then turn off
-# your displays after another 300 seconds, and turn your screens back on when
-# resumed. It will also lock your screen before your computer goes to sleep.
-
-### Input configuration
-#
-# Example configuration:
-#
-#   input "2:14:SynPS/2_Synaptics_TouchPad" {
-#       dwt enabled
-#       tap enabled
-#       natural_scroll enabled
-#       middle_emulation enabled
-#   }
-#
-# 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 --to-code $mod+Return exec $term
-
-    # Kill focused window
-    bindsym --to-code $mod+Shift+q kill
-
-    # Start your launcher
-    bindsym --to-code $mod+d 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 --to-code $mod+Shift+c reload
-
-    # Exit sway (logs you out of your Wayland session)
-    bindsym --to-code $mod+Shift+e 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 --to-code $mod+$left focus left
-    bindsym --to-code $mod+$down focus down
-    bindsym --to-code $mod+$up focus up
-    bindsym --to-code $mod+$right focus right
-    # Or use $mod+[up|down|left|right]
-    bindsym --to-code $mod+Left focus left
-    bindsym --to-code $mod+Down focus down
-    bindsym --to-code $mod+Up focus up
-    bindsym --to-code $mod+Right focus right
-
-    # Move the focused window with the same, but add Shift
-    bindsym --to-code $mod+Shift+$left move left
-    bindsym --to-code $mod+Shift+$down move down
-    bindsym --to-code $mod+Shift+$up move up
-    bindsym --to-code $mod+Shift+$right move right
-    # Ditto, with arrow keys
-    bindsym --to-code $mod+Shift+Left move left
-    bindsym --to-code $mod+Shift+Down move down
-    bindsym --to-code $mod+Shift+Up move up
-    bindsym --to-code $mod+Shift+Right move right
-#
-# Workspaces:
-#
-    # Switch to workspace
-    bindsym --to-code $mod+1 workspace number 1
-    bindsym --to-code $mod+2 workspace number 2
-    bindsym --to-code $mod+3 workspace number 3
-    bindsym --to-code $mod+4 workspace number 4
-    bindsym --to-code $mod+5 workspace number 5
-    bindsym --to-code $mod+6 workspace number 6
-    bindsym --to-code $mod+7 workspace number 7
-    bindsym --to-code $mod+8 workspace number 8
-    bindsym --to-code $mod+9 workspace number 9
-    bindsym --to-code $mod+0 workspace number 10
-    # Move focused container to workspace
-    bindsym --to-code $mod+Shift+1 move container to workspace number 1
-    bindsym --to-code $mod+Shift+2 move container to workspace number 2
-    bindsym --to-code $mod+Shift+3 move container to workspace number 3
-    bindsym --to-code $mod+Shift+4 move container to workspace number 4
-    bindsym --to-code $mod+Shift+5 move container to workspace number 5
-    bindsym --to-code $mod+Shift+6 move container to workspace number 6
-    bindsym --to-code $mod+Shift+7 move container to workspace number 7
-    bindsym --to-code $mod+Shift+8 move container to workspace number 8
-    bindsym --to-code $mod+Shift+9 move container to workspace number 9
-    bindsym --to-code $mod+Shift+0 move container to workspace number 10
-    # Note: workspaces can have any name you want, not just numbers.
-    # We just use 1-10 as the default.
-#
-# Layout stuff:
-#
-    # You can "split" the current object of your focus with
-    # $mod+b or $mod+v, for horizontal and vertical splits
-    # respectively.
-    bindsym --to-code $mod+b splith
-    bindsym --to-code $mod+v splitv
-
-    # Switch the current container between different layout styles
-    bindsym --to-code $mod+s layout stacking
-    bindsym --to-code $mod+w layout tabbed
-    bindsym --to-code $mod+e layout toggle split
-
-    # Make the current focus fullscreen
-    bindsym --to-code $mod+f fullscreen
-
-    # Toggle the current focus between tiling and floating mode
-    bindsym --to-code $mod+Shift+space floating toggle
-
-    # Swap focus between the tiling area and the floating area
-    bindsym --to-code $mod+space focus mode_toggle
-
-    # Move focus to the parent container
-    bindsym --to-code $mod+a focus parent
-#
-# 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 --to-code $mod+Shift+minus 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 --to-code $mod+minus 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 --to-code $left resize shrink width 10px
-    bindsym --to-code $down resize grow height 10px
-    bindsym --to-code $up resize shrink height 10px
-    bindsym --to-code $right resize grow width 10px
-
-    # Ditto, with arrow keys
-    bindsym --to-code Left resize shrink width 10px
-    bindsym --to-code Down resize grow height 10px
-    bindsym --to-code Up resize shrink height 10px
-    bindsym --to-code Right resize grow width 10px
-
-    # Return to default mode
-    bindsym --to-code Return mode "default"
-    bindsym --to-code Escape mode "default"
-}
-bindsym --to-code $mod+r mode "resize"
-
-#
-# Status Bar:
-#
-# Read `man 5 sway-bar` for more information about this section.
-bar {
-    position top
-
-    # When the status_command prints a new line to stdout, swaybar updates.
-    # The default just shows the current date and time.
-    status_command while date +'%Y-%m-%d %l:%M:%S %p'; do sleep 1; done
-
-    colors {
-        statusline #ffffff
-        background #323232
-        inactive_workspace #32323200 #32323200 #5c5c5c
-    }
-}
-
-include /etc/sway/config.d/*
diff --git a/.config/sway/rock b/.config/sway/rock
index 27956d7..40f82ca 100644
--- a/.config/sway/rock
+++ b/.config/sway/rock
@@ -1,3 +1,2 @@
-set $menu bemenu-run
-set $term termite
+bindsym --to-code --no-warn $mod+Return exec termite