sway updateHEADmain

13 files changed, 197 insertions, 182 deletions

diff --git a/.config/sway/config b/.config/sway/config
index 094504c..01a6f4a 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -1,16 +1,29 @@
-#==========================================================
-#
-#   ██╗██████╗        ██████╗  █████╗ ██████╗ ███████╗
-#   ██║╚════██╗      ██╔════╝ ██╔══██╗██╔══██╗██╔════╝
-#   ██║ █████╔╝█████╗██║  ███╗███████║██████╔╝███████╗
-#   ██║ ╚═══██╗╚════╝██║   ██║██╔══██║██╔═══╝ ╚════██║
-#   ██║██████╔╝      ╚██████╔╝██║  ██║██║     ███████║
-#   ╚═╝╚═════╝        ╚═════╝ ╚═╝  ╚═╝╚═╝     ╚══════╝
-#
-#   Please see https://i3wm.org/docs/userguide.html for a complete reference!
-#==========================================================
+set {
+	$super Mod4
+	$term foot
+	$menu rofi -show drun -show-icons
+}
+font pango:JetBrainsMono NF 9
 
+output * bg ~/.config/wallpaper.png fill
 
-# ======================== Startup ========================
+input {
+	1240:60205:liliums_Lily58 {
+		xkb_layout us
+		xkb_options compose:ralt
+	}
 
-# ============ Modkey ============
+	1:1:AT_Translated_Set_2_keyboard {
+		xkb_layout br
+		xkb_options caps:swapescape
+	}
+
+	type:touchpad {
+		tap enabled
+		drag enabled
+	}
+}
+
+include "~/.config/sway/config.d/*"
+
+exec dbus-update-activation-environment --all
diff --git a/.config/sway/config.d/00-colors b/.config/sway/config.d/00-colors
deleted file mode 100644
index 990cca4..0000000
--- a/.config/sway/config.d/00-colors
+++ /dev/null
@@ -1,16 +0,0 @@
-set $base #191724
-set $text #e0def4
-set $urgent #eb6f92
-set $border #c4a7e7
-set $indicator #31748f
-set $iborder #26233a
-set $uborder #1f1d2e
-set $sec_indicator #6e6a86
-
-set $accent #c4a7e7
-
-# client.<class>        <border> <bg>  <text> [<indicator>  [<child_border>]]
-client.focused          $border  $base $text $indicator     $border
-client.focused_inactive $iborder $base $text $sec_indicator $iborder
-client.unfocused        $uborder $base $text $sec_indicator $uborder
-client.urgent           $urgent  $base $text $indicator     $urgent
diff --git a/.config/sway/config.d/05-binds b/.config/sway/config.d/05-binds
new file mode 100644
index 0000000..e8b0619
--- /dev/null
+++ b/.config/sway/config.d/05-binds
@@ -0,0 +1,65 @@
+floating_modifier $super
+bindsym {
+	$super+Return exec $term
+	$super+p exec $menu
+
+	$super+q kill
+	$super+Ctrl+r reload
+	$super+Ctrl+Shift+e exit
+	$super+Ctrl+Shift+q exec doas poweroff
+	$super+Ctrl+Shift+r exec doas restart
+	
+	$super+u [urgent=latest] focus
+
+	$super+Shift+minus move scratchpad
+	$super+minus scratchpad show
+	$super+g [class="scrcpy"] scratchpad show
+
+	$super+Shift+S exec --no-startup-id 'grim -g "$(slurp)" - | wl-copy'
+	$super+Shift+T exec --no-startup-id 'NOTIFY=$(dmenu -l 0 -p "notification text") \
+		&& sleep $(dmenu -l 0 -p "time") && notify-send "$NOTIFY"'
+}
+
+bindsym {
+	$super+h focus left
+	$super+j focus down
+	$super+k focus up
+	$super+l focus right
+	
+	$super+Shift+h move left
+	$super+Shift+j move down
+	$super+Shift+k move up
+	$super+Shift+l move right
+	
+	$super+Ctrl+h resize shrink width 5 px or 5 ppt
+	$super+Ctrl+j resize shrink height 5 px or 5 ppt
+	$super+Ctrl+k resize grow height 5 px or 5 ppt
+	$super+Ctrl+l resize grow width 5 px or 5 ppt
+	
+	$super+b split h
+	$super+v split v
+	$super+Tab split toggle
+	$super+Escape workspace back_and_forth
+	
+	$super+t layout toggle tabbed
+	$super+Shift+Tab layout toggle split
+	
+	$super+BackSpace focus mode_toggle
+	$super+Shift+BackSpace floating toggle
+	$super+Ctrl+BackSpace sticky toggle
+	
+	$super+f fullscreen toggle
+	$super+a focus parent
+	$super+d focus child
+}
+
+bindsym {
+	XF86AudioRaiseVolume exec --no-startup-id pamixer -i 5
+	XF86AudioLowerVolume exec --no-startup-id pamixer -d 5
+	XF86AudioMute exec --no-startup-id pamixer -t
+
+	XF86AudioPlay exec --no-startup-id "mpc toggle"
+	XF86AudioNext exec --no-startup-id "mpc next"
+	XF86AudioPrev exec --no-startup-id "mpc prev"
+}
+
diff --git a/.config/sway/config.d/05-colors b/.config/sway/config.d/05-colors
new file mode 100644
index 0000000..bf2de37
--- /dev/null
+++ b/.config/sway/config.d/05-colors
@@ -0,0 +1,16 @@
+set {
+	$background #191724
+	$accent #ebbcba
+	$border #ebbcba
+	$inactive_border #6e5a86
+	$unfocused_border #26233a
+	$text #e0def4
+	$indicator #9ccfd8
+	$sec_indicator #908caa
+	$urgent #eb6f92
+}
+
+client.focused 			$border 			$background	$text	$indicator		$border
+client.focused_inactive	$inactive_border	$background	$text	$sec_indicator	$inactive_border
+client.unfocused       	$unfocused_border	$background	$text	$sec_indicator	$unfocused_border
+client.urgent          	$urgent				$background	$text	$indicator		$urgent
diff --git a/.config/sway/config.d/05-workspaces b/.config/sway/config.d/05-workspaces
new file mode 100644
index 0000000..436a0ac
--- /dev/null
+++ b/.config/sway/config.d/05-workspaces
@@ -0,0 +1,36 @@
+set {
+	$ws1   "1:一"
+	$ws2   "2:二"
+	$ws3   "3:三"
+	$ws4   "4:四"
+	$ws5   "5:五"
+	$ws6   "6:六"
+	$ws7   "7:七"
+	$ws8   "8:八"
+	$ws9   "9:九"
+	$ws0   "10:十"
+}
+
+bindsym {
+	$super+1 workspace number $ws1
+	$super+2 workspace number $ws2
+	$super+3 workspace number $ws3
+	$super+4 workspace number $ws4
+	$super+5 workspace number $ws5
+	$super+6 workspace number $ws6
+	$super+7 workspace number $ws7
+	$super+8 workspace number $ws8
+	$super+9 workspace number $ws9
+	$super+0 workspace number $ws0
+	
+	$super+Shift+1 move container to workspace number $ws1
+	$super+Shift+2 move container to workspace number $ws2
+	$super+Shift+3 move container to workspace number $ws3
+	$super+Shift+4 move container to workspace number $ws4
+	$super+Shift+5 move container to workspace number $ws5
+	$super+Shift+6 move container to workspace number $ws6
+	$super+Shift+7 move container to workspace number $ws7
+	$super+Shift+8 move container to workspace number $ws8
+	$super+Shift+9 move container to workspace number $ws9
+	$super+Shift+0 move container to workspace number $ws0
+}
diff --git a/.config/sway/config.d/10-input b/.config/sway/config.d/10-input
deleted file mode 100644
index 50d7074..0000000
--- a/.config/sway/config.d/10-input
+++ /dev/null
@@ -1,10 +0,0 @@
-input "1:1:AT_Translated_Set_2_keyboard" {
-	xkb_layout br
-	xkb_options caps:swapescape
-	xkb_numlock enabled
-}
-
-input "1739:33364:Synaptics_TM3336-004" {
-	drag enabled
-	tap enabled
-}
diff --git a/.config/sway/config.d/10-modes b/.config/sway/config.d/10-modes
new file mode 100644
index 0000000..4f4ead8
--- /dev/null
+++ b/.config/sway/config.d/10-modes
@@ -0,0 +1,19 @@
+bindsym $super+m mode "music"
+mode "music" {
+	bindsym a exec --no-startup-id "music album", mode "default"
+	bindsym m exec --no-startup-id "music title", mode "default"
+	bindsym s exec --no-startup-id "music artist", mode "default"
+
+	bindsym Escape mode "default"
+}
+
+bindsym $super+o mode "open"
+mode "open" {
+	bindsym {
+		s exec "steam", mode "default"
+		f exec "firefox", mode "default"
+		p exec "pavucontrol", mode "default"
+	}
+
+	bindsym Escape mode "default"
+}
diff --git a/.config/sway/config.d/10-window-rules b/.config/sway/config.d/10-window-rules
new file mode 100644
index 0000000..a5f38d8
--- /dev/null
+++ b/.config/sway/config.d/10-window-rules
@@ -0,0 +1,17 @@
+default_border pixel 2
+default_floating_border normal 2
+for_window {
+	[app_id="pavucontrol"] floating enable
+	[title="Picture-in-Picture"] floating enable, sticky enable, resize set 630 350, move position 1870 1050
+	[app_id="dragon-drag-and-drop"] sticky enable
+	[class=".*.exe"] floating enable
+	[app_id=".*.exe"] floating enable
+	[class="scrcpy"] floating enable, sticky enable, move scratchpad, scratchpad show
+}
+
+assign {
+	[class="(league|riot).*.exe"] $ws5
+	[class="discord"] $ws8
+	[class="^steam$"] $ws0
+	[class="^steam"] $ws9
+}
diff --git a/.config/sway/config.d/10-workspaces b/.config/sway/config.d/10-workspaces
deleted file mode 100644
index 1d9ec20..0000000
--- a/.config/sway/config.d/10-workspaces
+++ /dev/null
@@ -1,44 +0,0 @@
-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:十"
-
-# workspace $ws1 output $monlf
-# workspace $ws2 output $monlf
-# workspace $ws3 output $monlf
-# workspace $ws4 output $monlf
-# workspace $ws5 output $monlf
-# workspace $ws6 output $monrt
-# workspace $ws7 output $monrt
-# workspace $ws8 output $monrt
-# workspace $ws9 output $monrt
-# workspace $ws10 output $monrt
-
-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+5 workspace number $ws5
-bindsym $mod+6 workspace number $ws6
-bindsym $mod+7 workspace number $ws7
-bindsym $mod+8 workspace number $ws8
-bindsym $mod+9 workspace number $ws9
-bindsym $mod+0 workspace number $ws10
-
-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+5 move container to workspace number $ws5
-bindsym $mod+Shift+6 move container to workspace number $ws6
-bindsym $mod+Shift+7 move container to workspace number $ws7
-bindsym $mod+Shift+8 move container to workspace number $ws8
-bindsym $mod+Shift+9 move container to workspace number $ws9
-bindsym $mod+Shift+0 move container to workspace number $ws10
-
diff --git a/.config/sway/config.d/15-bar b/.config/sway/config.d/15-bar
new file mode 100644
index 0000000..460e771
--- /dev/null
+++ b/.config/sway/config.d/15-bar
@@ -0,0 +1,18 @@
+bar {
+	status_command i3status
+	strip_workspace_numbers yes
+	position bottom
+	colors {
+		background $background
+		statusline $text
+		separator #ff0000
+
+		# Category         Border            Background        Text
+		focused_workspace  $accent           $accent           #000000
+		active_workspace   $unfocused_border $unfocused_border $text
+		inactive_workspace $background       $background       $text
+		urgent_workspace   $urgent           $urgent           $text
+		binding_mode       $background       $background       $text
+
+	}
+}
diff --git a/.config/sway/config.d/20-keybinds b/.config/sway/config.d/20-keybinds
deleted file mode 100644
index bd8440f..0000000
--- a/.config/sway/config.d/20-keybinds
+++ /dev/null
@@ -1,73 +0,0 @@
-bindsym $mod+Ctrl+c reload
-bindsym $mod+Ctrl+r restart
-bindsym $mod+q kill
-bindsym $mod+Ctrl+Shift+q exec poweroff
-bindsym $mod+Ctrl+Shift+e exit
-bindsym $mod+Ctrl+Shift+r exec restart
-
-bindsym $mod+u [urgent=latest] focus
-
-#bindsym $mod+g gaps inner all toggle 5
-
-bindsym $mod+Return exec $term
-bindsym $mod+p exec $menu
-#bindsym $mod+Shift+x exec dm-tool lock
-
-floating_modifier $mod
-
-#bindsym $mod+Escape exec "main-menu"
-
-bindsym $mod+b split h
-bindsym $mod+v split v
-bindsym $mod+Tab split toggle
-bindsym $mod+Escape workspace back_and_forth
-
-bindsym $mod+t layout tabbed
-bindsym $mod+w layout default
-bindsym $mod+Shift+Tab layout toggle split
-
-bindsym $mod+BackSpace focus mode_toggle
-bindsym $mod+Shift+BackSpace floating toggle
-bindsym $mod+Ctrl+BackSpace sticky toggle
-
-bindsym $mod+f fullscreen toggle
-bindsym $mod+a focus parent
-bindsym $mod+Shift+a focus child
-
-# ============ Navegation & Focus Keybinds ============
-bindsym $mod+h focus left
-bindsym $mod+j focus down
-bindsym $mod+k focus up
-bindsym $mod+l 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+Ctrl+h resize shrink width 5 px or 5 ppt
-bindsym $mod+Ctrl+j resize shrink height 5 px or 5 ppt
-bindsym $mod+Ctrl+k resize grow height 5 px or 5 ppt
-bindsym $mod+Ctrl+l resize grow width 5 px or 5 ppt
-
-bindsym $mod+Shift+minus move scratchpad
-bindsym $mod+minus scratchpad show
-# bindsym $mod+tilda for_window [instace="dropdown_*"] scratchpad show
-
-# ============ Funcion Keys ============
-bindsym XF86AudioRaiseVolume exec --no-startup-id volume -i 5
-bindsym XF86AudioLowerVolume exec --no-startup-id volume -d 5
-bindsym XF86AudioMute exec --no-startup-id volume -t
-
-bindsym XF86AudioPlay exec --no-startup-id "mpc toggle"
-bindsym XF86AudioNext exec --no-startup-id "mpc next"
-bindsym XF86AudioPrev exec --no-startup-id "mpc prev"
-
-bindsym XF86MonBrightnessUp exec --no-startup-id brightnessctl s +5%
-bindsym XF86MonBrightnessDown exec --no-startup-id brightnessctl s 5%-
-
-# ============ User Keybinds ============
-bindsym $mod+Shift+S exec --no-startup-id "printedit -s"
-bindsym $mod+Control+S exec --no-startup-id "printedit"
-
-bindsym $mod+s exec --no-startup-id "i3-big-swap.py"
diff --git a/.config/sway/config.d/20-window-rules b/.config/sway/config.d/20-window-rules
deleted file mode 100644
index 0287c90..0000000
--- a/.config/sway/config.d/20-window-rules
+++ /dev/null
@@ -1,9 +0,0 @@
-for_window [class="Pavucontrol"] floating enable
-for_window [title="Picture-in-Picture"] sticky enable
-for_window [class="Dragon-drag-and-drop"] sticky enable
-for_window [class=".*.exe"] floating enable
-
-assign [class="Element"] $ws8
-assign [title="WhatsApp — Mozilla Firefox"] $ws8
-assign [class="Steam"] $ws9
-assign [class="discord"] $ws10
diff --git a/.config/sway/config.d/30-bar b/.config/sway/config.d/30-bar
deleted file mode 100644
index 76a04c0..0000000
--- a/.config/sway/config.d/30-bar
+++ /dev/null
@@ -1,17 +0,0 @@
-bar {
-	status_command i3status
-	strip_workspace_numbers yes
-	position bottom
-	colors {
-		background $base
-		statusline $text
-		separator #ff0000
-		# Category         Border            Background        Text
-		focused_workspace  $accent  $accent  #000000
-		active_workspace   $uborder $uborder $text
-		inactive_workspace $base    $base    $text
-		urgent_workspace   $urgent  $urgent  $text
-		binding_mode       $base    $base    $text
-
-	}
-}