.

1 files changed, 53 insertions, 83 deletions

diff --git a/sway/config b/sway/config
index 93f0db3..2a18165 100644
--- a/sway/config
+++ b/sway/config
@@ -1,86 +1,56 @@
-set $primary eDP-1
-set $secondary DP-6
-output $primary pos 0 0 res 1920x1080 bg ~/.pictures/bg1.jpg stretch
-output $secondary pos 1920 0 res 3840x2160 bg ~/.pictures/bg2.jpg stretch
-
-set $ws1 "1:1"
-set $ws2 "2:2"
-set $ws3 "3:3"
-set $ws4 "4:4"
-set $ws5 "5:a"
-set $ws6 "6:s"
-set $ws7 "7:d"
-set $ws8 "8:f"
-set $ws9 "9:term"
-workspace $ws1 output $primary
-workspace $ws2 output $primary
-workspace $ws3 output $primary
-workspace $ws4 output $primary
-workspace $ws5 output $secondary
-workspace $ws6 output $secondary
-workspace $ws7 output $secondary
-workspace $ws8 output $secondary
-
 set $mod Mod4
-font pango:Inter Medium 12
-floating_modifier $mod
-default_border pixel 4
-xwayland disable
-
-bindsym $mod+Return exec alacritty
-bindsym $mod+space exec wofi --show drun --allow-images --allow-markup --gtk-dark
-bindsym $mod+Tab layout toggle
-
-bindsym $mod+Shift+q kill
-bindsym $mod+Shift+r restart
-bindsym $mod+Shift+e exit
-bindsym $mod+Shift+space floating toggle
-bindsym $mod+Shift+Return fullscreen toggle
-
-bindsym $mod+h focus left
-bindsym $mod+j focus down
-bindsym $mod+k focus up
-bindsym $mod+l focus right
-bindsym $mod+Left focus left
-bindsym $mod+Down focus down
-bindsym $mod+Up focus up
-bindsym $mod+Right focus right
 
-bindsym $mod+Shift+h move left
-bindsym $mod+Shift+j move down
-bindsym $mod+Shift+k move up
-bindsym $mod+Shift+l 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
-
-bindsym $mod+1 workspace number $ws1
-bindsym $mod+2 workspace number $ws2
-bindsym $mod+3 workspace number $ws3
-bindsym $mod+4 workspace number $ws4
-bindsym $mod+a workspace number $ws5
-bindsym $mod+s workspace number $ws6
-bindsym $mod+d workspace number $ws7
-bindsym $mod+f workspace number $ws8
-
-bindsym $mod+Shift+1 move container to workspace number $ws1
-bindsym $mod+Shift+2 move container to workspace number $ws2
-bindsym $mod+Shift+3 move container to workspace number $ws3
-bindsym $mod+Shift+4 move container to workspace number $ws4
-bindsym $mod+Shift+a move container to workspace number $ws5
-bindsym $mod+Shift+s move container to workspace number $ws6
-bindsym $mod+Shift+d move container to workspace number $ws7
-bindsym $mod+Shift+f move container to workspace number $ws8
-
-bindsym F12 exec python ~/.config/sway/terminal.py
-assign [app_id="^tmux_term$"] $ws9
-
-bar {
-    swaybar_command waybar
-    position top
-    strip_workspace_numbers yes
-    tray_output $primary
+xwayland disable
+bar swaybar_command waybar
+
+exec_always ~/.config/sway/init.sh
+
+bindsym {
+    $mod+Return exec alacritty
+    $mod+space exec wofi --show drun --allow-images --allow-markup --gtk-dark
+    $mod+Tab layout toggle
+
+    $mod+Shift+q kill
+    $mod+Shift+r restart
+    $mod+Shift+e exit
+    $mod+Shift+space floating toggle
+    $mod+Shift+Return fullscreen toggle
+
+    $mod+h focus left
+    $mod+j focus down
+    $mod+k focus up
+    $mod+l focus right
+    $mod+Left focus left
+    $mod+Down focus down
+    $mod+Up focus up
+    $mod+Right focus right
+
+    $mod+Shift+h move left
+    $mod+Shift+j move down
+    $mod+Shift+k move up
+    $mod+Shift+l move right
+    $mod+Shift+Left move left
+    $mod+Shift+Down move down
+    $mod+Shift+Up move up
+    $mod+Shift+Right move right
+
+    $mod+1 workspace number "1:1"
+    $mod+2 workspace number "2:2"
+    $mod+3 workspace number "3:3"
+    $mod+4 workspace number "4:4"
+    $mod+a workspace number "5:a"
+    $mod+s workspace number "6:s"
+    $mod+d workspace number "7:d"
+    $mod+f workspace number "8:f"
+
+    $mod+Shift+1 move container to workspace number "1:1"
+    $mod+Shift+2 move container to workspace number "2:2"
+    $mod+Shift+3 move container to workspace number "3:3"
+    $mod+Shift+4 move container to workspace number "4:4"
+    $mod+Shift+a move container to workspace number "5:a"
+    $mod+Shift+s move container to workspace number "6:s"
+    $mod+Shift+d move container to workspace number "7:d"
+    $mod+Shift+f move container to workspace number "8:f"
+
+    F12 exec ~/.config/sway/terminal.sh
 }
-
-exec ~/.config/sway/load_resources.sh