sway

10 files changed, 49 insertions, 347 deletions

diff --git a/sway/config b/sway/config
index 94f6066..ebd3bab 100644
--- a/sway/config
+++ b/sway/config
@@ -1,351 +1,6 @@
-#vim:conf
-
-input * xkb_layout "de"
+# vi: ft=i3config
 
 set $mod Mod1
-
-font pango:monospace 9
-
-# Use Mouse+$mod to drag floating windows to their wanted position
 floating_modifier $mod
 
-# start a terminal
-bindsym $mod+Return exec "alacritty"
-
-#start ranger
-bindsym $mod+o exec "termite -e ranger"
-
-#start browser
-bindsym  $mod+b exec "brave"
-
-# kill focused window
-bindsym $mod+Shift+q kill
-
-bindsym $mod+Shift+w exec "i3lock -p win -i ~/vimconfig/pictures/lock.png"
-
-#Screenshot on mod+p
-bindsym $mod+p exec "scrot ~/Screenshots/Screenshot%Y-%m-%d%H:%M:%S.png"
-
-# start dmenu (a program launcher)
-bindsym $mod+d exec rofi -show run
-# There also is the (new) i3-dmenu-desktop which only displays applications
-# shipping a .desktop file. It is a wrapper around dmenu, so you need that
-# installed.
-# bindsym $mod+d exec --no-startup-id i3-dmenu-desktop
-
-# change focus
-bindsym $mod+j focus left
-bindsym $mod+k focus down
-bindsym $mod+l focus up
-bindsym $mod+odiaeresis focus right
-
-# alternatively, you can use the cursor keys:
-bindsym $mod+Left focus left
-bindsym $mod+Down focus down
-bindsym $mod+Up focus up
-bindsym $mod+Right focus right
-
-# move focused window
-bindsym $mod+Shift+j move left
-bindsym $mod+Shift+k move down
-bindsym $mod+Shift+l move up
-bindsym $mod+Shift+odiaeresis move right
-
-# alternatively, you can use the cursor 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
-
-# split in horizontal orientation
-bindsym $mod+h split h
-
-# split in vertical orientation
-bindsym $mod+v split v
-
-# enter fullscreen mode for the focused container
-bindsym $mod+f fullscreen toggle
-
-# change container layout (stacked, tabbed, toggle split)
-bindsym $mod+s layout stacking
-bindsym $mod+w layout tabbed
-bindsym $mod+e layout toggle split
-
-# toggle tiling / floating
-bindsym $mod+Shift+space floating toggle
-
-# change focus between tiling / floating windows
-bindsym $mod+space focus mode_toggle
-
-# focus the parent container
-bindsym $mod+a focus parent
-
-# focus the child container
-#bindsym $mod+d focus child
-
-# Define names for default workspaces for which we configure key bindings later on.
-# We use variables to avoid repeating the names in multiple places.
-set $ws1 "1"
-set $ws2 "2"
-set $ws3 "3"
-set $ws4 "4"
-set $ws5 "5"
-set $ws6 "6"
-set $ws7 "7"
-set $ws8 "8"
-set $ws9 "9"
-set $ws10 "10"
-
-# switch to workspace
-bindsym $mod+1 workspace $ws1
-bindsym $mod+2 workspace $ws2
-bindsym $mod+3 workspace $ws3
-bindsym $mod+4 workspace $ws4
-bindsym $mod+5 workspace $ws5
-bindsym $mod+6 workspace $ws6
-bindsym $mod+7 workspace $ws7
-bindsym $mod+8 workspace $ws8
-bindsym $mod+9 workspace $ws9
-bindsym $mod+0 workspace $ws10
-
-# move focused container to workspace
-bindsym $mod+Shift+1 move container to workspace $ws1
-bindsym $mod+Shift+2 move container to workspace $ws2
-bindsym $mod+Shift+3 move container to workspace $ws3
-bindsym $mod+Shift+4 move container to workspace $ws4
-bindsym $mod+Shift+5 move container to workspace $ws5
-bindsym $mod+Shift+6 move container to workspace $ws6
-bindsym $mod+Shift+7 move container to workspace $ws7
-bindsym $mod+Shift+8 move container to workspace $ws8
-bindsym $mod+Shift+9 move container to workspace $ws9
-bindsym $mod+Shift+0 move container to workspace $ws10
-
-# reload the configuration file
-bindsym $mod+Shift+c reload
-# restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
-bindsym $mod+Shift+r restart
-# exit i3 (logs you out of your X session)
-#bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'"
-bindsym $mod+Shift+e exec $(printf "shutdown now\nreboot\nswaymsg exit\nkillall compton" | rofi -dmenu -mesg "Exit?")
-
-# resize window (you can also use the mouse for that)
-mode "resize" {
-        # These bindings trigger as soon as you enter the resize mode
-
-        # Pressing left will shrink the window’s width.
-        # Pressing right will grow the window’s width.
-        # Pressing up will shrink the window’s height.
-        # Pressing down will grow the window’s height.
-        bindsym j resize shrink width 10 px or 10 ppt
-        bindsym k resize grow height 10 px or 10 ppt
-        bindsym l resize shrink height 10 px or 10 ppt
-        bindsym odiaeresis resize grow width 10 px or 10 ppt
-
-        # same bindings, but for the arrow keys
-        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
-
-        # back to normal: Enter or Escape or $mod+r
-        bindsym Return mode "default"
-        bindsym Escape mode "default"
-        bindsym $mod+r mode "default"
-}
-
-bindsym $mod+r mode "resize"
-
-##GAPS
-set $mode_gaps Gaps: (o)uter, (i)nner, (h)orizontal, (v)ertical, (t)op, (r)ight, (b)ottom, (l)eft
-set $mode_gaps_outer Outer Gaps: +|-|0 (local), Shift + +|-|0 (global)
-set $mode_gaps_inner Inner Gaps: +|-|0 (local), Shift + +|-|0 (global)
-set $mode_gaps_horiz Horizontal Gaps: +|-|0 (local), Shift + +|-|0 (global)
-set $mode_gaps_verti Vertical Gaps: +|-|0 (local), Shift + +|-|0 (global)
-set $mode_gaps_top Top Gaps: +|-|0 (local), Shift + +|-|0 (global)
-set $mode_gaps_right Right Gaps: +|-|0 (local), Shift + +|-|0 (global)
-set $mode_gaps_bottom Bottom Gaps: +|-|0 (local), Shift + +|-|0 (global)
-set $mode_gaps_left Left Gaps: +|-|0 (local), Shift + +|-|0 (global)
-bindsym $mod+Shift+g mode "$mode_gaps"
-
-mode "$mode_gaps" {
-        bindsym o      mode "$mode_gaps_outer"
-        bindsym i      mode "$mode_gaps_inner"
-        bindsym h      mode "$mode_gaps_horiz"
-        bindsym v      mode "$mode_gaps_verti"
-        bindsym t      mode "$mode_gaps_top"
-        bindsym r      mode "$mode_gaps_right"
-        bindsym b      mode "$mode_gaps_bottom"
-        bindsym l      mode "$mode_gaps_left"
-        bindsym Return mode "$mode_gaps"
-        bindsym Escape mode "default"
-}
-
-mode "$mode_gaps_outer" {
-        bindsym plus  gaps outer current plus 5
-        bindsym minus gaps outer current minus 5
-        bindsym 0     gaps outer current set 0
-
-        bindsym Shift+plus  gaps outer all plus 5
-        bindsym Shift+minus gaps outer all minus 5
-        bindsym Shift+0     gaps outer all set 0
-
-        bindsym Return mode "$mode_gaps"
-        bindsym Escape mode "default"
-}
-mode "$mode_gaps_inner" {
-        bindsym plus  gaps inner current plus 5
-        bindsym minus gaps inner current minus 5
-        bindsym 0     gaps inner current set 0
-
-        bindsym Shift+plus  gaps inner all plus 5
-        bindsym Shift+minus gaps inner all minus 5
-        bindsym Shift+0     gaps inner all set 0
-
-        bindsym Return mode "$mode_gaps"
-        bindsym Escape mode "default"
-}
-mode "$mode_gaps_horiz" {
-        bindsym plus  gaps horizontal current plus 5
-        bindsym minus gaps horizontal current minus 5
-        bindsym 0     gaps horizontal current set 0
-
-        bindsym Shift+plus  gaps horizontal all plus 5
-        bindsym Shift+minus gaps horizontal all minus 5
-        bindsym Shift+0     gaps horizontal all set 0
-
-        bindsym Return mode "$mode_gaps"
-        bindsym Escape mode "default"
-}
-mode "$mode_gaps_verti" {
-        bindsym plus  gaps vertical current plus 5
-        bindsym minus gaps vertical current minus 5
-        bindsym 0     gaps vertical current set 0
-
-        bindsym Shift+plus  gaps vertical all plus 5
-        bindsym Shift+minus gaps vertical all minus 5
-        bindsym Shift+0     gaps vertical all set 0
-
-        bindsym Return mode "$mode_gaps"
-        bindsym Escape mode "default"
-}
-mode "$mode_gaps_top" {
-        bindsym plus  gaps top current plus 5
-        bindsym minus gaps top current minus 5
-        bindsym 0     gaps top current set 0
-
-        bindsym Shift+plus  gaps top all plus 5
-        bindsym Shift+minus gaps top all minus 5
-        bindsym Shift+0     gaps top all set 0
-
-        bindsym Return mode "$mode_gaps"
-        bindsym Escape mode "default"
-}
-mode "$mode_gaps_right" {
-        bindsym plus  gaps right current plus 5
-        bindsym minus gaps right current minus 5
-        bindsym 0     gaps right current set 0
-
-        bindsym Shift+plus  gaps right all plus 5
-        bindsym Shift+minus gaps right all minus 5
-        bindsym Shift+0     gaps right all set 0
-
-        bindsym Return mode "$mode_gaps"
-        bindsym Escape mode "default"
-}
-mode "$mode_gaps_bottom" {
-        bindsym plus  gaps bottom current plus 5
-        bindsym minus gaps bottom current minus 5
-        bindsym 0     gaps bottom current set 0
-
-        bindsym Shift+plus  gaps bottom all plus 5
-        bindsym Shift+minus gaps bottom all minus 5
-        bindsym Shift+0     gaps bottom all set 0
-
-        bindsym Return mode "$mode_gaps"
-        bindsym Escape mode "default"
-}
-mode "$mode_gaps_left" {
-        bindsym plus  gaps left current plus 5
-        bindsym minus gaps left current minus 5
-        bindsym 0     gaps left current set 0
-
-        bindsym Shift+plus  gaps left all plus 5
-        bindsym Shift+minus gaps left all minus 5
-        bindsym Shift+0     gaps left all set 0
-
-        bindsym Return mode "$mode_gaps"
-        bindsym Escape mode "default"
-}
-##/GAPS
-
-#COLOR
-set $bgb #282a36
-set $bg #282a36AA
-set $fg #f8f8f2
-set $tf #f8f8f2AA
-set $hi #f1fa7c
-set $tx #040404
-set $pk #ff79c6
-set $yw #f1fa7c
-set $gn #50fa7b
-set $rd #ff5555
-set $id #ff79c6
-set $opaque #00000000
-
-set $black #000000
-set $grey #151515
-
-#                        border  background  text  indicator
-client.focused           $grey   $black      $tf     $black
-client.unfocused         $bg     $bg         $tf     $id
-client.focused_inactive  $bg     $bg         $pk     $id
-client.urgent            $yw     $yw         $tx     $id
-client.placeholder       $bg     $bg         $bg     $bg
-client.background $black
-
-default_border none
-default_floating_border none
-
-for_window [class="feh"] floating enable
-
-gaps inner 5
-
-bar {
-	#i3bar_command i3bar -t
-	status_command python /usr/share/powerline/bindings/i3/powerline-i3.py
-	#status_command i3status
-	font pango:DejaVu Sans Mono for Powerline 12
-
-	colors {
-		background 		#00000000
-		focused_workspace	#00000000 #00000000 #FFFFFF
-		active_workspace	#00000000 #00000000 #FFFFFF
-		inactive_workspace	#00000000 #00000000 #555555
-		urgent_workspace	#00000000 #FF000033 #555555
-	}
-}
-
-#exec_always --no-startup-id ~/.i3/start_polybar.sh jonny
-
-# Pulse Audio controls
-bindsym XF86AudioRaiseVolume exec --no-startup-id "pactl -- set-sink-volume 0 +5%"
-bindsym XF86AudioLowerVolume exec --no-startup-id "pactl -- set-sink-volume 0 -5%"
-bindsym XF86AudioMute exec --no-startup-id "pactl set-sink-mute 0 toggle"
-bindsym XF86AudioMicMute exec --no-startup-id "pactl set-source-mute 1 toggle)'"
-
-#Mediacontrol
-bindsym XF86AudioPlay exec --no-startup-id playerctl play-pause
-bindsym XF86AudioStop exec --no-startup-id playerctl stop
-bindsym XF86AudioPrev exec --no-startup-id playerctl previous
-bindsym XF86AudioNext exec --no-startup-id playerctl next
-
-# Sreen brightness controls
-# Use acpilight with arch!!
-# https://gitlab.com/wavexx/acpilight
-bindsym XF86MonBrightnessUp exec --no-startup-id xbacklight -inc 5 -fps 30 # increase screen brightness
-bindsym XF86MonBrightnessDown exec --no-startup-id xbacklight -dec 5 -fps 30 # decrease screen brightness
-
-exec --no-startup-id twmnd
-
-#start autostart.sh
-exec --no-startup-id random_background
+include config.d/*.conf
diff --git a/sway/config.d/00-sway.conf b/sway/config.d/00-sway.conf
new file mode 100644
index 0000000..32d3d37
--- /dev/null
+++ b/sway/config.d/00-sway.conf
@@ -0,0 +1,8 @@
+input * {
+    xkb_layout "de"
+}
+
+input type:touchpad {
+    tap enabled
+    natural_scroll enabled
+}
diff --git a/sway/config.d/10-workspace.conf b/sway/config.d/10-workspace.conf
new file mode 120000
index 0000000..1225047
--- /dev/null
+++ b/sway/config.d/10-workspace.conf
@@ -0,0 +1 @@
+../../i3/config.d/10-workspace.conf
\ No newline at end of file
diff --git a/sway/config.d/20-visual.conf b/sway/config.d/20-visual.conf
new file mode 120000
index 0000000..22c8b02
--- /dev/null
+++ b/sway/config.d/20-visual.conf
@@ -0,0 +1 @@
+../../i3/config.d/20-visual.conf
\ No newline at end of file
diff --git a/sway/config.d/30-modes.conf b/sway/config.d/30-modes.conf
new file mode 120000
index 0000000..d2152f0
--- /dev/null
+++ b/sway/config.d/30-modes.conf
@@ -0,0 +1 @@
+../../i3/config.d/30-modes.conf
\ No newline at end of file
diff --git a/sway/config.d/40-app-settings.conf b/sway/config.d/40-app-settings.conf
new file mode 120000
index 0000000..a856b3c
--- /dev/null
+++ b/sway/config.d/40-app-settings.conf
@@ -0,0 +1 @@
+../../i3/config.d/40-app-settings.conf
\ No newline at end of file
diff --git a/sway/config.d/40-app-shortcuts.conf b/sway/config.d/40-app-shortcuts.conf
new file mode 100644
index 0000000..1f6b639
--- /dev/null
+++ b/sway/config.d/40-app-shortcuts.conf
@@ -0,0 +1,24 @@
+# vi: ft=i3config
+
+bindsym $mod+Return exec "alacritty"
+bindsym $mod+Shift+Return exec "alacritty -t termite_floating"
+
+bindsym $mod+o exec "dolphin"
+
+bindsym  $mod+b exec "firefox"
+bindsym  $mod+Shift+b exec "firefox --private-window"
+
+# TODO Lockscreen
+#bindsym $mod+Shift+w exec "XSECURELOCK_PASSWORD_PROMPT=kaomoji xsecurelock"
+#"i3lock -p win -i ~/vimconfig/pictures/lock.png"
+
+# TODO Screenshot
+#Screenshot on mod+p
+#bindsym $mod+p exec "flameshot gui"
+#"scrot ~/Screenshots/Screenshot%Y-%m-%d%H:%M:%S.png"
+
+# rofi
+bindsym $mod+d exec j4-dmenu-desktop --dmenu='bemenu -i --nb "#3f3f3f" --nf "#dcdccc" --fn "pango:DejaVu Sans Mono 12"' --term='alacritty'
+
+# notifications
+bindsym $mod+n exec "kill -s USR1 $(pidof deadd-notification-center)"
diff --git a/sway/config.d/40-sway-shortcuts.conf b/sway/config.d/40-sway-shortcuts.conf
new file mode 100644
index 0000000..1fa956d
--- /dev/null
+++ b/sway/config.d/40-sway-shortcuts.conf
@@ -0,0 +1,6 @@
+# vi: ft=i3config
+
+bindsym $mod+Shift+e exec "wofi --show fb -modi fb:rofi-exit-menu.sh"
+
+bindsym XF86MonBrightnessUp exec --no-startup-id brightnessctl s +5%
+bindsym XF86MonBrightnessDown exec --no-startup-id brightnessctl s 5%-
diff --git a/sway/config.d/40-wm-shortcuts.conf b/sway/config.d/40-wm-shortcuts.conf
new file mode 120000
index 0000000..1b4912e
--- /dev/null
+++ b/sway/config.d/40-wm-shortcuts.conf
@@ -0,0 +1 @@
+../../i3/config.d/40-wm-shortcuts.conf
\ No newline at end of file
diff --git a/sway/config.d/99-launch.conf b/sway/config.d/99-launch.conf
new file mode 100644
index 0000000..7ee3721
--- /dev/null
+++ b/sway/config.d/99-launch.conf
@@ -0,0 +1,4 @@
+# vi: ft=i3config
+
+exec --no-startup-id "waybar"
+exec --no-startup-id "random_background_sway"