X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=states%2Fsway%2Ffiles%2Fconfig.jinja;h=30724ae742049f54a3c484a7371c6f84d2482c49;hb=cc380a1eeb2fd611cfb96574b44dd00e2e168b92;hp=735766dd7dc9314e9ca393c702b9cdfa981ef9e3;hpb=61bf6d4c92ff54a2b381e2c8617af8cfcc70f4b5;p=max%2Fsaltfiles.git

diff --git a/states/sway/files/config.jinja b/states/sway/files/config.jinja
index 735766d..30724ae 100644
--- a/states/sway/files/config.jinja
+++ b/states/sway/files/config.jinja
@@ -27,179 +27,74 @@ set $white_super #ffffff
 client.focused $black $yellow_super $black $black $black
 client.focused_inactive $black $black_super $white $black $black 
 
+# Slight gaps around windows
+gaps inner 6
 
-set $mod Mod4
-
-# Slight gaps between windows
-gaps inner 5
-gaps outer 5
-
-# Use Mouse+$mod to drag floating windows to their wanted position
-floating_modifier $mod
-
-bindsym Control+t mode "$ratpoison"
-
-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"
-
-set $music "Music"
-set $chat "Chat"
-
-mode "$ratpoison" {
-# All/most commands in this mode should revert to the default mode on comleption.
-# We are emulating ratpoison (kinda) here
-
-# Moving to workspaces
-#  bindsym n workspace next mode "default"
-#    bindsym Shift+n workspace prev mode "default"
-
-    bindsym 1 exec 'swaymsg mode "default"; swaymsg workspace $ws1'
-    bindsym 2 exec 'swaymsg mode "default"; swaymsg workspace $ws2'
-    bindsym 3 exec 'swaymsg mode "default"; swaymsg workspace $ws3'
-    bindsym 4 exec 'swaymsg mode "default"; swaymsg workspace $ws4'
-    bindsym 5 exec 'swaymsg mode "default"; swaymsg workspace $ws5'
-    bindsym 6 exec 'swaymsg mode "default"; swaymsg workspace $ws6'
-    bindsym 7 exec 'swaymsg mode "default"; swaymsg workspace $ws7'
-    bindsym 8 exec 'swaymsg mode "default"; swaymsg workspace $ws8'
-    bindsym 9 exec 'swaymsg mode "default"; swaymsg workspace $ws9'
-    bindsym 0 exec 'swaymsg mode "default"; swaymsg workspace $ws10'
-    bindsym m exec 'swaymsg mode "default"; swaymsg workspace $music'
-    bindsym a exec 'swaymsg mode "default"; swaymsg workspace $chat'
-
-
-    bindsym Shift+1 exec 'swaymsg mode "default"; swaymsg move container to workspace $ws1'
-    bindsym Shift+2 exec 'swaymsg mode "default"; swaymsg move container to workspace $ws2'
-    bindsym Shift+3 exec 'swaymsg mode "default"; swaymsg move container to workspace $ws3'
-    bindsym Shift+4 exec 'swaymsg mode "default"; swaymsg move container to workspace $ws4'
-    bindsym Shift+5 exec 'swaymsg mode "default"; swaymsg move container to workspace $ws5'
-    bindsym Shift+6 exec 'swaymsg mode "default"; swaymsg move container to workspace $ws6'
-    bindsym Shift+7 exec 'swaymsg mode "default"; swaymsg move container to workspace $ws7'
-    bindsym Shift+8 exec 'swaymsg mode "default"; swaymsg move container to workspace $ws8'
-    bindsym Shift+9 exec 'swaymsg mode "default"; swaymsg move container to workspace $ws9'
-    bindsym Shift+0 exec 'swaymsg mode "default"; swaymsg move container to workspace $ws10'
-    bindsym Shift+m exec 'swaymsg mode "default"; swaymsg move container to workspace $music'
-    bindsym Shift+a exec 'swaymsg mode "default"; swaymsg move container to workspace $chat'
-
-# Moving focus
-#    bindsym Tab focus right mode "default"
-#    bindsym Shift+Tab focus left mode "default"
-
-    bindsym h exec 'swaymsg mode "default"; swaymsg focus left'
-    bindsym j exec 'swaymsg mode "default"; swaymsg focus down' 
-    bindsym k exec 'swaymsg mode "default"; swaymsg focus up' 
-    bindsym l exec 'swaymsg mode "default"; swaymsg focus right' 
-
-
-# Moving windows
-    bindsym Shift+h exec 'swaymsg mode "default"; swaymsg move left'
-    bindsym Shift+j exec 'swaymsg mode "default"; swaymsg move down'
-    bindsym Shift+k exec 'swaymsg mode "default"; swaymsg move up'
-    bindsym Shift+l exec 'swaymsg mode "default"; swaymsg move right'
-
-# Changing split modes
-    bindsym v exec 'swaymsg mode "default"; swaymsg split v'
-    bindsym o exec 'swaymsg mode "default"; swaymsg split h'
-
-
-    bindsym c exec 'swaymsg mode "default"; swaymsg exec termite'
-    bindsym q exec 'swaymsg mode "default"; swaymsg kill'
-
-    bindsym Shift+e exec 'swaymsg mode "default"; swaymsg exec dmenu_run'
-
-    bindsym $mod+l exec 'swaymsg mode "default"; "lock.nosmartcard"' 
-    bindsym Escape mode "default"
-}
-
-
-
-# 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
-
-# enter fullscreen mode for the focused container
-bindsym $mod+t fullscreen toggle
-
-# change container layout (stacked, tabbed, toggle split)
-bindsym $mod+r layout stacking
-bindsym $mod+w layout tabbed
-bindsym $mod+f 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
-
-#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'"
-
-# 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 h resize shrink width 10 px or 10 ppt
-    bindsym j resize grow height 10 px or 10 ppt
-    bindsym k resize shrink height 10 px or 10 ppt
-    bindsym l 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+p mode "default"
-}
-
-bindsym $mod+p mode "resize"
-
-bindsym XF86MonBrightnessUp exec "brightnessctl set +100"
-bindsym XF86MonBrightnessDown exec "brightnessctl set 100-"
-
-bindsym XF86ScreenSaver exec "lock.nosmartcard"
-
-hide_edge_borders both 
-
-focus_follows_mouse no
+# Read `man 5 sway` for a complete reference.
 
-focus_on_window_activation urgent
-
-for_window [class="^rdesktop"] move workspace number 9; floating disable
-for_window [class="Pinentry"] floating enable
-
-{% set lockcmd = "swaylock -e -f -i ~/Pictures/lockscreen_1080_1.png" %}
+### 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 foot
+# 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 | wofi --dmenu | xargs swaymsg exec --
+
+include /etc/sway/config-vars.d/*
+
+### 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.
+
+{% set lockcmd = "swaylock -e -f -i ~/Pictures/Backgrounds/DSC02113.jpg" %}
 
 exec swayidle -w \
 timeout 300 "{{lockcmd}}" \
   timeout 600 'systemctl suspend' \
     before-sleep "{{lockcmd}}"
 
+
+### 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.
 # This keyboard has this layout on all machines:
 input 1241:36:HOLDCHIP_USB_Keyboard {
   xkb_layout us
@@ -213,7 +108,7 @@ input 16700:8455:DELL_Dell_USB_Entry_Keyboard {
   xkb_options ctrl:nocaps
 }
 
-input 7504:24616:unspecified_ErgoDox_ergonomic_keyboard {
+input 65261:4871:TMK/Cub_Ergodox {
   xkb_layout gb
 }
 
@@ -222,6 +117,151 @@ input 9494:21:CM_Storm_Quickfire_Pro_Ultimate_6_key {
   xkb_variant colemak
   xkb_options ctrl:nocaps
 }
+
+input 1:1:AT_Translated_Set_2_keyboard {
+  xkb_layout gb
+  xkb_variant colemak
+  xkb_options ctrl:nocaps
+}
+
+input 9610:4102:Gaming_KB__Gaming_KB {
+  xkb_layout gb
+  xkb_variant colemak
+  xkb_options ctrl:nocaps
+}
+
+### Key bindings
+#
+# Basics:
+#
+    # Start a terminal
+    bindsym $mod+Return exec $term
+
+    # Kill focused window
+    bindsym $mod+Shift+q kill
+
+    # Start your launcher
+    bindsym $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 $mod+Shift+c reload
+
+    # Exit sway (logs you out of your Wayland session)
+    bindsym $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 $mod+$left focus left
+    bindsym $mod+$down focus down
+    bindsym $mod+$up focus up
+    bindsym $mod+$right focus right
+    # Or use $mod+[up|down|left|right]
+    bindsym $mod+Left focus left
+    bindsym $mod+Down focus down
+    bindsym $mod+Up focus up
+    bindsym $mod+Right focus right
+
+    # Move the focused window with the same, but add Shift
+    bindsym $mod+Shift+$left move left
+    bindsym $mod+Shift+$down move down
+    bindsym $mod+Shift+$up move up
+    bindsym $mod+Shift+$right move right
+    # Ditto, with arrow 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
+#
+# Workspaces:
+#
+    # Switch to workspace
+    {% for i in range(10) %}
+        bindsym --no-repeat $mod+{{ i }} workspace number {{ i }}; exec "echo 1 > /tmp/sovpipe"
+        bindsym --release $mod+{{ i }} exec "echo 0 > /tmp/sovpipe"
+
+        # Move focused container to workspace
+        bindsym $mod+Shift+{{ i }} move container to workspace number {{ i }}
+    {% endfor %}
+
+    bindsym --no-repeat $mod+Shift exec "echo 1 > /tmp/sovpipe"
+    bindsym --release $mod+Shift exec "echo 0 > /tmp/sovpipe"
+
+#
+# Layout stuff:
+#
+    # You can "split" the current object of your focus with
+    # $mod+b or $mod+v, for horizontal and vertical splits
+    # respectively.
+    bindsym $mod+b splith
+    bindsym $mod+v splitv
+
+    # Switch the current container between different layout styles
+    bindsym $mod+s layout stacking
+    bindsym $mod+w layout tabbed
+    bindsym $mod+e layout toggle split
+
+    # Make the current focus fullscreen
+    bindsym $mod+f fullscreen
+
+    # Toggle the current focus between tiling and floating mode
+    bindsym $mod+Shift+space floating toggle
+
+    # Swap focus between the tiling area and the floating area
+    bindsym $mod+space focus mode_toggle
+
+    # Move focus to the parent container
+    bindsym $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 $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 $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 $left resize shrink width 10px
+    bindsym $down resize grow height 10px
+    bindsym $up resize shrink height 10px
+    bindsym $right resize grow width 10px
+
+    # Ditto, with arrow keys
+    bindsym Left resize shrink width 10px
+    bindsym Down resize grow height 10px
+    bindsym Up resize shrink height 10px
+    bindsym Right resize grow width 10px
+
+    # Return to default mode
+    bindsym Return mode "default"
+    bindsym Escape mode "default"
+}
+bindsym $mod+r mode "resize"
+
+bindsym $mod+Alt+l exec '{{ lockcmd }}'
+
+
+include /etc/sway/config.d/*
 # host specific section
 {%- do salt.log.error('sway/files/' + host) -%}
 {% include 'sway/files/' + host %}
+
+exec rm -f /tmp/sovpipe && mkfifo /tmp/sovpipe && tail -f /tmp/sovpipe | sov