feat: swapping over to wayland

7 files changed, 246 insertions, 89 deletions

diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml
index bfcdaf8..cb0a960 100644
--- a/.config/alacritty/alacritty.yml
+++ b/.config/alacritty/alacritty.yml
@@ -182,83 +182,33 @@ font:
 # If `true`, bold text is drawn using the bright color variants.
 #draw_bold_text_with_bright_colors: true
 
-# Colors 
 colors:
   # Default colors
   primary:
-    background: '0x002b36'
-    foreground: '0x657b83'
-
-    # Bright and dim foreground colors
-    #
-    # The dimmed foreground color is calculated automatically if it is not present.
-    # If the bright foreground color is not set, or `draw_bold_text_with_bright_colors`
-    # is `false`, the normal foreground color will be used.
-    #dim_foreground: '0x9a9a9a'
-    #bright_foreground: '0xffffff'
-
-  # Cursor colors
-  #
-  # Colors which should be used to draw the terminal cursor. If these are unset,
-  # the cursor color will be the inverse of the cell color.
-  cursor:
-  #  text: '0x000000'
-    cursor: '0xeee8d5'
-
-  # Selection colors
-  #
-  # Colors which should be used to draw the selection area. If selection
-  # background is unset, selection color will be the inverse of the cell colors.
-  # If only text is unset the cell text color will remain the same.
-  #selection:
-  #  text: '0xeaeaea'
-  #  background: '0x404040'
+    background: '0x142436'
+    foreground: '0xffffff'
 
   # Normal colors
   normal:
-    black:   '0x073642'
-    red:     '0xdc322f'
-    green:   '0x859900'
-    yellow:  '0xb58900'
-    blue:    '0x268bd2'
-    magenta: '0xd33682'
-    cyan:    '0x2aa198'
-    white:   '0xeee8d5'
+    black:   '0x687580'
+    red:     '0xfe8282'
+    green:   '0x3d7d84'
+    yellow:  '0xe6bc8e'
+    blue:    '0x2d4e76'
+    magenta: '0x616d8e'
+    cyan:    '0x3f938d'
+    white:   '0x93a1a1'
 
   # Bright colors
   bright:
-    black:   '0x586e75'
-    red:     '0xcb4b16'
-    green:   '0x586e75'
-    yellow:  '0x657b83'
-    blue:    '0x839496'
-    magenta: '0x6c71c4'
-    cyan:    '0x93a1a1'
-    white:   '0xfdf6e3'
-
-  # Dim colors
-  #
-  # If the dim colors are not set, they will be calculated automatically based
-  # on the `normal` colors.
-  #dim:
-  #  black:   '0x000000'
-  #  red:     '0x8c3336'
-  #  green:   '0x7a8530'
-  #  yellow:  '0x97822e'
-  #  blue:    '0x506d8f'
-  #  magenta: '0x80638e'
-  #  cyan:    '0x497e7a'
-  #  white:   '0x9a9a9a'
-
-  # Indexed Colors
-  #
-  # The indexed colors include all colors from 16 to 256.
-  # When these are not set, they're filled with sensible defaults.
-  #
-  # Example:
-  #   `- { index: 16, color: '0xff00ff' }`
-  #
-  #indexed_colors: []
+    black:   '0x687580'
+    red:     '0xfe8282'
+    green:   '0x3d7d84'
+    yellow:  '0xe6bc8e'
+    blue:    '0x2d4e76'
+    magenta: '0x616d8e'
+    cyan:    '0x3f938d'
+    white:   '0x93a1a1'
 
 # Visual Bell
 #
diff --git a/.config/i3/config b/.config/i3/config
index 2fe84cc..c680269 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -8,16 +8,16 @@ set $sigaudio pkill -75 i3blocks
 
 #workspace_auto_back_and_forth yes
 
-set $ws1  "1:󱆃"
-set $ws2  "2:󰈹"
-set $ws3  "3:󰗰"
+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 $ws9  "9:󰲰"
+set $ws10 "10:󰲞"
 
 workspace $ws1 output  primary
 workspace $ws2 output  primary
@@ -42,6 +42,7 @@ bindsym Mod1+8 workspace $ws8
 bindsym Mod1+9 workspace $ws9
 bindsym Mod1+0 workspace $ws10
 bindsym Mod1+Tab workspace back_and_forth
+bindsym Mod1+Shift+Tab exec rofi -show window
 
 # move focused container to workspace
 bindsym Mod1+shift+1 move container to workspace $ws1
@@ -56,8 +57,8 @@ bindsym Mod1+shift+9 move container to workspace $ws9
 bindsym Mod1+shift+0 move container to workspace $ws10
 
 # move workspaces between outputs on dock
-bindsym Mod1+d			exec xrandr --output DP-3 --auto --primary --output eDP-1 --auto --panning 2560x1440 
-bindsym Mod1+shift+d	exec xrandr --output eDP-1 --auto --primary --panning 0x0 --output DP-3 --mode 1920x1080 
+bindsym Mod1+d			exec xrandr --output DP-3 --mode 2560x1440 --primary --output eDP-1 --mode 1920x1080 --panning 2560x1440 
+bindsym Mod1+shift+d	exec xrandr --output eDP-1 --auto --primary --fb 1920x1080 --output DP-3 --mode 1920x1080 --same-as eDP-1
 
 ## WINDOWS
 
@@ -113,10 +114,11 @@ bindsym Mod1+Return 			split horizontal; exec $term
 bindsym Mod1+shift+Return		split vertical; exec $term
 bindsym Mod4+p					exec arandr
 bindsym Mod4+l					exec xautolock -locknow
-bindsym Mod1+F1					exec rofi -show run
-bindsym Mod1+shift+F1			workspace $ws9 ; exec rofi -show ssh
-bindsym Mod1+F2					workspace $ws2 ; exec firefox
-bindsym Mod1+F3					workspace $ws3 ; exec thunderbird
+bindsym Mod1+F1					exec rofi -show combi
+bindsym Mod1+Escape				exec rofi -show filebrowser
+bindsym Mod1+F2					workspace $ws1 ; exec firefox
+bindsym Mod1+Shift+F2					exec thunderbird
+#bindsym Mod1+F3					workspace $ws3 ; exec thunderbird
 #bindsym Mod1+F4  exec
 #bindsym Mod1+F5  exec
 #bindsym Mod1+F1  exec
diff --git a/.config/mpv/mpv.conf b/.config/mpv/mpv.conf
index cb5403d..0563b98 100644
--- a/.config/mpv/mpv.conf
+++ b/.config/mpv/mpv.conf
@@ -1 +1,2 @@
-vo=xv
+#vo=xv
+vo=gpu
diff --git a/.config/rofi/config.rasi b/.config/rofi/config.rasi
index 0892037..7ff37c2 100644
--- a/.config/rofi/config.rasi
+++ b/.config/rofi/config.rasi
@@ -1,12 +1,12 @@
 @theme "solarized"
 configuration {
-/*	modi: "window,run,ssh";*/
+	modi: "combi,filebrowser";
 /*	font: "mono 12";*/
 /*	location: 0;*/
 /*	yoffset: 0;*/
 /*	xoffset: 0;*/
 /*	fixed-num-lines: true;*/
-/*	show-icons: false;*/
+	show-icons: true;
 /*	terminal: "rofi-sensible-terminal";*/
 /*	ssh-client: "ssh";*/
 /*	ssh-command: "{terminal} -e {ssh-client} {host} [-p {port}]";*/
@@ -27,13 +27,13 @@ configuration {
 /*	sorting-method: "normal";*/
 /*	case-sensitive: false;*/
 /*	cycle: true;*/
-/*	sidebar-mode: false;*/
+	sidebar-mode: true;
 /*	hover-select: false;*/
 /*	eh: 1;*/
 /*	auto-select: false;*/
 /*	parse-hosts: false;*/
 /*	parse-known-hosts: true;*/
-/*	combi-modi: "window,run";*/
+	combi-modi: "run,ssh";
 /*	matching: "normal";*/
 /*	tokenize: true;*/
 /*	m: "-5";*/
@@ -144,5 +144,6 @@ configuration {
   filebrowser {
       directories-first: true;
       sorting-method:    "name";
+      directory: "/home/atc";
   }
 }
diff --git a/.config/sway/config b/.config/sway/config
new file mode 100644
index 0000000..8011c8a
--- /dev/null
+++ b/.config/sway/config
@@ -0,0 +1,199 @@
+# Read `man 5 sway` for a complete reference.
+
+### Output configuration
+output eDP-1 {
+	background ~/.local/share/wallpaper.svg tile
+	resolution 1920x1080
+}
+
+output DP-3 {
+	background ~/.local/share/wallpaper.svg tile
+	resolution 2560x1440
+}
+
+## GENERAL 
+
+font pango:sans-serif 13
+set $term alacritty
+set $sigaudio pkill -75 i3blocks
+
+## WORKSPACES
+
+#workspace_auto_back_and_forth yes
+
+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  primary
+workspace $ws2 output  primary
+workspace $ws3 output  primary
+workspace $ws4 output  primary
+workspace $ws5 output  primary
+workspace $ws6 output  primary
+workspace $ws7 output  primary
+workspace $ws8 output  primary
+workspace $ws9 output  primary
+workspace $ws10 output primary
+
+# switch to workspace
+bindsym Mod1+1 workspace $ws1
+bindsym Mod1+2 workspace $ws2
+bindsym Mod1+3 workspace $ws3
+bindsym Mod1+4 workspace $ws4
+bindsym Mod1+5 workspace $ws5
+bindsym Mod1+6 workspace $ws6
+bindsym Mod1+7 workspace $ws7
+bindsym Mod1+8 workspace $ws8
+bindsym Mod1+9 workspace $ws9
+bindsym Mod1+0 workspace $ws10
+bindsym Mod1+Tab workspace back_and_forth
+bindsym Mod1+Shift+Tab exec rofi -show window
+
+# move focused container to workspace
+bindsym Mod1+shift+1 move container to workspace $ws1
+bindsym Mod1+shift+2 move container to workspace $ws2
+bindsym Mod1+shift+3 move container to workspace $ws3
+bindsym Mod1+shift+4 move container to workspace $ws4
+bindsym Mod1+shift+5 move container to workspace $ws5
+bindsym Mod1+shift+6 move container to workspace $ws6
+bindsym Mod1+shift+7 move container to workspace $ws7
+bindsym Mod1+shift+8 move container to workspace $ws8
+bindsym Mod1+shift+9 move container to workspace $ws9
+bindsym Mod1+shift+0 move container to workspace $ws10
+
+# move workspaces between outputs on dock
+bindswitch --reload --locked lid:on  output eDP-1 disable ; output DP-3 enable;
+bindswitch --reload --locked lid:off output eDP-1 enable  ; output DP-3 disable;
+
+## WINDOWS
+
+default_border pixel
+hide_edge_borders smart
+title_align center
+floating_modifier Mod1
+bindsym Mod1+shift+p move scratchpad
+bindsym Mod1+p scratchpad show
+
+# movement
+set $down j
+set $left h
+set $right l
+set $up k
+
+# change focus
+bindsym Mod1+$down focus down
+bindsym Mod1+$left focus left
+bindsym Mod1+$right focus right
+bindsym Mod1+$up focus up
+bindsym Mod1+space focus mode_toggle
+
+# move focused window
+bindsym Mod1+shift+$down move down
+bindsym Mod1+shift+$left move left
+bindsym Mod1+shift+$right move right
+bindsym Mod1+shift+$up move up
+
+# resize
+bindsym Mod1+i 				resize grow height 
+bindsym Mod1+o 				resize grow width 
+bindsym Mod1+u 				resize shrink height 
+bindsym Mod1+y				resize shrink width 
+
+## LAYOUT
+
+bindsym Mod1+f fullscreen toggle
+bindsym Mod1+shift+space floating toggle
+bindsym Mod1+shift+s floating enable; sticky toggle
+
+## CONTROLS
+
+bindsym Mod1+shift+q			kill
+bindsym Mod1+shift+e			exit
+bindsym Mod1+shift+c			reload
+#bindsym Mod1+shift+r 			restart
+
+## SHORTCUTS
+
+bindsym Mod1+Return 			split horizontal; exec $term
+bindsym Mod1+shift+Return		split vertical; exec $term
+#bindsym Mod4+p					exec arandr
+#bindsym Mod4+l					exec xautolock -locknow
+bindsym Mod1+F1					exec rofi -show combi
+bindsym Mod1+F2					workspace $ws1 ; exec firefox
+bindsym Mod1+F3  exec			exec thunderbird
+bindsym Mod1+F4					exec passmenu.sh
+#bindsym Mod1+F5  exec
+#bindsym Mod1+F1  exec
+#bindsym Mod1+F1  exec
+#bindsym Mod1+F1  exec
+#bindsym Mod1+F6  exec
+#bindsym Mod1+F7  exec
+#bindsym Mod1+F8  exec
+#bindsym Mod1+F9					exec passmenu.sh
+bindsym Mod1+F10				exec mixer vol -5 && $sigaudio
+bindsym Mod1+F11				exec mixer vol +5 && $sigaudio
+bindsym Mod1+F12				exec mixer vol 0 && $sigaudio
+bindsym XF86AudioLowerVolume	exec mixer vol -5 && $sigaudio
+bindsym XF86AudioRaiseVolume 	exec mixer vol +5 && $sigaudio
+bindsym XF86AudioMute			exec mixer vol 0 && $sigaudio
+#bindsym --release Print			exec import -window root ~/`date +"%Y-%m-%d-%H-%M-%S"`.png
+#bindsym --release shift+Print	exec import -monitor ~/`date +"%Y-%m-%d-%H-%M-%S"`.png
+bindsym Mod1+Pause				exec swaylock ; exec doas acpiconf -s3
+
+## COLORS
+
+# class border background foreground
+client.focused #A2E5C6 #A2E5C6 #000000
+client.focused_inactive #1C433F #3F938D #ffffff
+client.unfocused #1C433F #3F938D #ffffff
+
+## BARS
+
+bar {
+	modifier Mod1
+	strip_workspace_numbers yes
+	position bottom
+	status_command i3blocks
+
+	colors {
+		background #3F938D
+		statusline #ffffff
+		separator #ffffff
+		# class border background foreground
+		focused_workspace #A2E5C6 #A2E5C6 #000000
+		inactive_workspace #1C433F #3F938D #ffffff
+		urgent_workspace #1C433F #3F938D #ffffff
+	}
+}
+
+## MODES
+
+set $mode_record "󱊫 webcam 󱊬 record"
+mode $mode_record {
+	bindsym Mod1+Escape mode default
+	bindsym Mod1+F1		exec killall pwcview || pwcview -s vga
+	bindsym Mod1+F2		exec killall -INT wf-recorder || wf-recorder --audio=oss_input.dsp4 -f ~/recording-$(date +%Y-%m-%d-%T).mp4 ; mode default
+}
+
+set $mode_modes "󱊷 default 󱊫 recording"
+bindsym Mod1+Escape		mode $mode_modes
+mode $mode_modes {
+	bindsym Mod1+Escape mode default
+	bindsym Mod1+F1		mode $mode_record
+}
+
+## ASSIGNMENTS
+
+assign [class="Firefox"] 2
+assign [class="Thunderbird"] 3
+for_window [class="pwcview"] floating enable
+
+include /usr/local/etc/sway/config.d/*
diff --git a/.xinitrc b/.xinitrc
index 8c2ebe6..2f0d803 100755
--- a/.xinitrc
+++ b/.xinitrc
@@ -1,9 +1,9 @@
 #!/bin/sh
-#&& dunst \
-xrandr --output DP-2 --auto --output DP-3 --auto --below DP-2
+xrandr --output eDP-1 --auto --primary --fb 1920x1080 --output DP-3 --mode 1920x1080 --same-as eDP-1
 xrdb .Xresources
 xset b off
 urxvtd -q -f -o
 wal.sh
-#xautolock -locker "i3lock -n -f -c 002b36" &
+dunst &
+xautolock -locker "i3lock -n -f -c 002b36" &
 exec i3 2>&1 > /var/log/xinit/i3wm.log
diff --git a/.zprofile b/.zprofile
index 0e90900..b627262 100644
--- a/.zprofile
+++ b/.zprofile
@@ -1,2 +1,6 @@
-export XCURSOR_PATH=${XCURSOR_PATH}:~/.local/share/icons
-[ -z $DISPLAY ] && [ $(tty) = /dev/ttyv0 ] && exec startx
+export XDG_RUNTIME_DIR=/var/run/user/`id -u` \
+	XCURSOR_PATH=${XCURSOR_PATH}:~/.local/share/icons \
+	MOZ_ENABLE_WAYLAND=1 \
+	GDK_BACKEND=wayland \
+	MOZ_DBUS_REMOTE=1 
+[ -z $DISPLAY ] && [ $(tty) = /dev/ttyv0 ] && exec sway