sway refactor

home/user/.config/sway/autostart.conf

@@ -9,5 +9,3 @@ exec swayidle -w \
 # Notifications
 #systemctl --user enable --now dbus.service
 exec --no-startup-id mako
-
-exec --no-startup-id layout_change_handler

home/user/.config/sway/bar.conf

@@ -0,0 +1,10 @@
+# vim: ft=swayconfig
+# Sway bar
+
+bar {
+    position bottom
+    status_command i3blocks
+}
+
+
+exec --no-startup-id layout_change_handler

home/user/.config/sway/config

@@ -15,6 +15,7 @@
 
 include ~/.config/sway/bindings.conf
 include ~/.config/sway/autostart.conf
+include ~/.config/sway/bar.conf
 include ~/.config/sway/other.conf
 
 include ~/.config/sway/config.d/*.conf

home/user/.config/sway/other.conf

@@ -24,12 +24,6 @@ for_window [title="Picture-in-Picture"] border pixel 0
 no_focus [title="^Peek preview$"]
 no_focus [class="feh"]
 
-
-bar {
-    position bottom
-    status_command i3blocks
-}
-
 output * bg "$(find ~/.wallpaper -type f | shuf -n 1)" fill
 
 exec_always test -f ~/.Xresources && xrdb -merge ~/.Xresources

home/user/.local/bin/switch-layout

@@ -1,11 +0,0 @@
-#!/bin/bash
-
-echo "here" > /tmp/test
-
-current=$(setxkbmap -query | grep layout | awk '{print $2}')
-
-if [ "${current}" = "us" ]; then
-    setxkbmap -model pc105 -option ctrl:nocaps ru
-else
-    setxkbmap -model pc105 -option ctrl:nocaps us
-fi