14 files changed, 132 insertions, 41 deletions
diff --git a/home-config/sway/config b/home/config/sway/config
index 497b549..d8526ad 100755..100644
--- a/home-config/sway/config
+++ b/home/config/sway/config
@@ -1,20 +1,20 @@
-# xdg desktop portal fix
-exec dbus-update-activation-environment DISPLAY I3SOCK SWAYSOCK WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway
-
 # Set super key
 set $mod Mod4
 
 # Set terminal
-set $term alacritty
+set $term kitty
 
 # Set app launcher
 set $menu wofi --allow-images --show=drun --prompt "Search Program"
 
 # Set scale
-set $scale 1.5
+set $scale 1.25
 
 # Set background
-set $bg ~/.config/sway/wallpapers/blue.jpg
+set $bg ~/.config/desktop-common/wallpapers/davekat.png
+
+# Set lockscreen
+set $lock hyprlock
 
 # Set Efects
 set $gaps 10
@@ -22,14 +22,20 @@ set $radius 0
 set $shadows on
 set $shadow_blur 15
 set $blur enable
-set $blur_radius 4
-set $blur_passes 2
+set $blur_radius 10
+set $blur_passes 3
 
 # Set browser
-set $browser firefox
+set $browser librewolf
 
-# Autostart apps
-exec $HOME/.config/sway/scripts.d/auto.sh
+# System configs
+include /etc/sway/config.d/*
 
 # Local configs
 include $HOME/.config/sway/config.d/*
+
+# Nwg
+include $HOME/.config/sway/outputs
+
+# Autostart apps
+exec $HOME/.config/sway/scripts.d/auto.sh
diff --git a/home-config/sway/config.d/gestures b/home/config/sway/config.d/gestures
index 4bdb136..4bdb136 100644
--- a/home-config/sway/config.d/gestures
+++ b/home/config/sway/config.d/gestures
diff --git a/home-config/sway/config.d/input b/home/config/sway/config.d/input
index a02f6d6..9cb7156 100644
--- a/home-config/sway/config.d/input
+++ b/home/config/sway/config.d/input
@@ -6,6 +6,7 @@ input * xkb_numlock enable
 # Keyboard layout, change as you wish
 input * {
     xkb_layout "us"
+    xkb_options compose:ralt
 }
 
 # Touchpad input settings
@@ -16,5 +17,4 @@ input type:touchpad {
 }
 
 # Screen settings
-#exec swaymsg output $screen resolution $resolution scale $scale
-output eDP-1 resolution 3072x1920 scale $scale
+# output eDP-1 resolution 3072x1920 scale $scale
diff --git a/home-config/sway/config.d/keybinds b/home/config/sway/config.d/keybinds
index bfc6f56..214be98 100644
--- a/home-config/sway/config.d/keybinds
+++ b/home/config/sway/config.d/keybinds
@@ -13,13 +13,10 @@ bindsym $mod+d exec $menu
 bindsym $mod+w exec $browser
 
 # Lock screen
-bindsym $mod+Shift+l exec $lock
+bindsym $mod+l exec $lock
 
 # Exit sway
-bindsym Ctrl+Alt+Delete exec killall sway
-
-# Power menu
-bindsym $mod+L exec killall wlogout || wlogout --css ~/.config/sway/logout.d/power/style.css -l ~/.config/sway/logout.d/power/layout
+bindsym $mod+Shift+l exit
 
 # Drag floating windows by holding down $mod and left mouse button.
 # Resize them with right mouse button + $mod.
@@ -34,12 +31,10 @@ bindsym $mod+F5 reload
 # Audio keybinds
 bindsym XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +5%
 bindsym XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ -5%
+bindsym Shift+XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ 10000%
+bindsym Shift+XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ 0%
 bindsym XF86AudioMute exec pactl set-sink-mute @DEFAULT_SINK@ toggle
 bindsym XF86AudioMicMute exec pactl set-source-mute @DEFAULT_SOURCE@ toggle
-bindsym F3 exec pactl set-sink-volume @DEFAULT_SINK@ +5%
-bindsym F2 exec pactl set-sink-volume @DEFAULT_SINK@ -5%
-bindsym F1 exec pactl set-sink-mute @DEFAULT_SINK@ toggle
-bindsym F4 exec pactl set-source-mute @DEFAULT_SOURCE@ toggle
 
 # Brightness keybinds
 bindsym XF86MonBrightnessDown exec brightnessctl set 5%-
@@ -51,6 +46,12 @@ bindsym XF86AudioNext exec playerctl next
 bindsym XF86AudioPrev exec playerctl previous
 
 # Screenshot
-bindsym Print exec grim -g "$(slurp)" - | wl-copy   
-bindsym Alt+Print exec grim - | wl-copy
+bindsym $mod+Shift+s exec grim -g "$(slurp)" - | wl-copy -t image/png && notify-send -t 3000 "Sway" "Screenshot copied to clipboard"
+bindsym Print exec grim - | wl-copy -t iamge/png && notify-send -t 3000 "Sway" "Full screen copied to clipboard"
 bindsym Shift+Print exec slurp -p | grim -g - - | convert - txt:- | tail -n 1 | awk '{print $3}' | wl-copy
+
+# Michelsoft Binbows
+bindsym Ctrl+$mod+Shift+L exec $browser "https://linkedin.com"
+bindsym Ctrl+$mod+Shift+S exec $term -e sl
+bindsym Ctrl+$mod+Shift+T exec electron28 "https://twitter.com"
+bindsym Ctrl+$mod+Shift+M exec electron28 "https://www.tumblr.com"
diff --git a/home-config/sway/config.d/project b/home/config/sway/config.d/project
index 3cb1049..5f74a43 100644
--- a/home-config/sway/config.d/project
+++ b/home/config/sway/config.d/project
@@ -1,6 +1,6 @@
 ### Project
 
-bindsym $mod+Alt+Left exec ~/.config/sway/scripts.d/project.sh LEFT
-bindsym $mod+Alt+Right exec ~/.config/sway/scripts.d/project.sh RIGHT
-bindsym $mod+Alt+Up exec ~/.config/sway/scripts.d/project.sh EXTERNAL_ONLY
-bindsym $mod+Alt+Down exec ~/.config/sway/scripts.d/project.sh PRIMARY_ONLY
+bindsym $mod+Alt+Left exec ~/.config/sway/scripts.d/project.sh LEFT $scale
+bindsym $mod+Alt+Right exec ~/.config/sway/scripts.d/project.sh RIGHT $scale
+bindsym $mod+Alt+Up exec ~/.config/sway/scripts.d/project.sh EXTERNAL_ONLY $scale
+bindsym $mod+Alt+Down exec ~/.config/sway/scripts.d/project.sh PRIMARY_ONLY $scale
diff --git a/home-config/sway/config.d/scratch b/home/config/sway/config.d/scratch
index 0337319..bdafcf6 100644
--- a/home-config/sway/config.d/scratch
+++ b/home/config/sway/config.d/scratch
@@ -7,8 +7,12 @@ bindsym $mod+Shift+minus move scratchpad
 # If there are multiple scratchpad windows, this command cycles through them.
 bindsym $mod+minus scratchpad show
 
+exec ~/.config/sway/scripts.d/scratchpads.sh
+
 for_window [app_id="scratch_term"] move scratchpad, resize set 960 640
 for_window [app_id="scratch_htop"] move scratchpad, resize set 960 640
+for_window [app_id="scratch_calc"] move scratchpad, resize set 960 640
 
 bindsym $mod+y exec ~/.config/sway/scripts.d/scratchpads.sh scratch_term zsh
 bindsym $mod+h exec ~/.config/sway/scripts.d/scratchpads.sh scratch_htop htop
+bindsym $mod+c exec ~/.config/sway/scripts.d/scratchpads.sh scratch_calc matrix
diff --git a/home-config/sway/config.d/theme b/home/config/sway/config.d/theme
index e8d2822..3d93752 100644
--- a/home-config/sway/config.d/theme
+++ b/home/config/sway/config.d/theme
@@ -1,8 +1,8 @@
 ### Set borders
 gaps inner $gaps
-for_window [class="^.*"] border pixel 2
-default_border pixel 2
-default_floating_border pixel 2
+for_window [class="^.*"] border pixel 0
+default_border pixel 0
+default_floating_border pixel 0
 
 ### Colors
 
@@ -25,8 +25,11 @@ shadow_color #14171dff
 blur $blur
 blur_radius $blur_radius
 blur_passes $blur_passes
-layer_effects "waybar" blur enable; shadows enable
+layer_effects "waybar" blur disable; shadows disable
 layer_effects "wofi" blur enable; shadows enable
 
 ### Output configuration
 output * bg $bg fill
+
+### Bar
+bar swaybar_command waybar
diff --git a/home-config/sway/config.d/workspaces b/home/config/sway/config.d/workspaces
index fe87bc1..5fac86b 100644
--- a/home-config/sway/config.d/workspaces
+++ b/home/config/sway/config.d/workspaces
@@ -21,7 +21,6 @@ bindsym $mod+6 workspace number 6
 bindsym $mod+7 workspace number 7
 bindsym $mod+8 workspace number 8
 bindsym $mod+9 workspace number 9
-bindsym $mod+0 workspace number 10
 
 # Move focused container to workspace
 bindsym $mod+Shift+1 move container to workspace number 1
@@ -33,11 +32,11 @@ bindsym $mod+Shift+6 move container to workspace number 6
 bindsym $mod+Shift+7 move container to workspace number 7
 bindsym $mod+Shift+8 move container to workspace number 8
 bindsym $mod+Shift+9 move container to workspace number 9
-bindsym $mod+Shift+0 move container to workspace number 10
 
 # Layout stuff:
 
 # Set the new window positioning mode
+bindsym $mod+Shift+d layout default
 bindsym $mod+Shift+b layout splith
 bindsym $mod+Shift+v layout splitv
 bindsym $mod+Shift+c layout tabbed
diff --git a/home/config/sway/outputs b/home/config/sway/outputs
new file mode 100644
index 0000000..08b8c77
--- /dev/null
+++ b/home/config/sway/outputs
@@ -0,0 +1,20 @@
+# Generated by nwg-displays on 2024-06-15 at 16:21:56. Do not edit manually.
+
+output "eDP-1" {
+    mode  2560x1600@90.003Hz
+    pos 2560 160
+    transform normal
+    scale 1.25
+    scale_filter linear
+    adaptive_sync off
+    dpms on
+}
+output "DP-2" {
+    mode  2560x1440@59.951Hz
+    pos 0 0
+    transform normal
+    scale 1.0
+    scale_filter linear
+    adaptive_sync off
+    dpms on
+}
diff --git a/home/config/sway/scripts.d/auto.sh b/home/config/sway/scripts.d/auto.sh
new file mode 100755
index 0000000..07a61fd
--- /dev/null
+++ b/home/config/sway/scripts.d/auto.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+nm-applet --indicator &
+autotiling-rs &
+
+/usr/bin/gnome-keyring-daemon --foreground &
+wl-clip-persist --clipboard both &
+
+#gtk-launch discord &
+#gtk-launch io.element.Element &
+#gtk-launch org.gajim.Gajim &
+#gtk-launch org.mozilla.Thunderbird &
+
+hypridle &
diff --git a/home-config/sway/scripts.d/project.sh b/home/config/sway/scripts.d/project.sh
index afb8507..84e1a8d 100755
--- a/home-config/sway/scripts.d/project.sh
+++ b/home/config/sway/scripts.d/project.sh
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+PID=$$
+
 get_mode() {
     swaymsg -t get_outputs -r | jq ".[$1].modes[0]"
 }
@@ -56,24 +58,25 @@ get_id() {
     i=0
     while true; do
         NAME="$(get_name $i)"
-        if [ "$NAME" == "$1" ]; then
+        if [ $(echo "$NAME" | grep "^$1") ]; then
             echo "$i"
-            exit 0
+            return 0
         elif [ "$NAME" == "null" ]; then
-            exit 1
+            return 1
         fi
         ((i=i+1))
     done
 }
 
 die() {
-    notify-send -u critical -t 3000 "Sway" "Failed to get display"
+    notify-send -u critical -t 3000 "Sway" "$1"
+    kill $PID
 }
 
-PRIMARY=$(get_id "eDP-1")
-EXTERNAL=$(get_id "DP-1" || get_id "HDMI-1")
+PRIMARY=$(get_id "eDP-1" || die "Failed to get primary display")
+EXTERNAL=$(get_id "DP" || get_id "HDMI" || die "Failed to get external display")
 
-PRIMARY_SCALE=1.5
+PRIMARY_SCALE=$2
 EXTERNAL_SCALE=1
 
 set_monitors() {
diff --git a/home-config/sway/scripts.d/scratchpads.sh b/home/config/sway/scripts.d/scratchpads.sh
index bb8e361..bb8e361 100755
--- a/home-config/sway/scripts.d/scratchpads.sh
+++ b/home/config/sway/scripts.d/scratchpads.sh
diff --git a/home/config/sway/workspaces b/home/config/sway/workspaces
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/home/config/sway/workspaces
diff --git a/home/config/swaylock/config b/home/config/swaylock/config
new file mode 100644
index 0000000..9dd0202
--- /dev/null
+++ b/home/config/swaylock/config
@@ -0,0 +1,41 @@
+screenshots
+effect-blur=7x5
+indicator
+clock
+timestr=%H:%M
+datestr=%Y-%m-%d
+font=monospace
+font-size=40
+
+indicator-radius=75
+indicator-thickness=7
+
+inside-color=14171dd8
+inside-clear-color=ada0a8d8
+inside-caps-lock-color=14171dd8
+inside-ver-color=97bd5ed8
+inside-wrong-color=cc5c5cd8
+
+line-color=14171dff
+line-clear-color=14171dff
+line-caps-lock-color=14171dff
+line-ver-color=14171dff
+line-wrong-color=14171dff
+separator-color=14171dff
+
+ring-color=4d4754d8
+ring-clear-color=4d4754d8
+ring-caps-lock-color=4d4754d8
+ring-ver-color=4d4754d8
+ring-wrong-color=4d4754d8
+
+key-hl-color=82bfb3d8
+bs-hl-color=f0c767d8
+caps-lock-key-hl-color=82bfb3d8
+caps-lock-bs-hl-color=a97fb3d8
+
+text-color=c7c6c3ff
+text-clear-color=14171dff
+text-caps-lock-color=14171dff
+text-ver-color=14171dff
+text-wrong-color=14171dff