From cf2116b197627504c514b5c84b73bd178f8c600e Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lyte.dev>
Date: Thu, 2 Jul 2020 11:17:42 -0500
Subject: [PATCH] Wippy

---
 apps/de/sway/config            |  1 +
 apps/de/x/resources            |  2 +-
 apps/shell/fish/aliases.fish   |  5 +++++
 apps/shell/fish/config.fish    |  2 +-
 bin/lock-and-sleep             |  8 ++++++++
 env/desktop/sway/config.d/main | 17 ++++++++++++-----
 env/desktop/x/resources        |  2 +-
 7 files changed, 29 insertions(+), 8 deletions(-)
 create mode 100755 bin/lock-and-sleep

diff --git a/apps/de/sway/config b/apps/de/sway/config
index cfa95a5..384337a 100644
--- a/apps/de/sway/config
+++ b/apps/de/sway/config
@@ -120,6 +120,7 @@ bindsym $mod+Control+Alt+k gaps vertical current plus 5
 bindsym $mod+Control+equal gaps inner current set $default_gap
 
 bindsym $mod+Control+Shift+l exec swaylock
+bindsym $mod+Control+Shift+s exec lock-and-sleep
 
 mode "resize" {
 	bindsym $left resize shrink width 10 px or 10 ppt
diff --git a/apps/de/x/resources b/apps/de/x/resources
index 3e631f2..3d47fe4 100755
--- a/apps/de/x/resources
+++ b/apps/de/x/resources
@@ -77,7 +77,7 @@ bspwm.start_bar: 1
 ! polybar
 polybar.primary_font: mono_font:pixelsize=bar_font_size;1
 polybar.secondary_font: icon_font:style=Regular:pixelsize=icon_font_size;1
-polybar.display_monitor: HDMI-1
+polybar.display_monitor: DisplayPort-0
 polybar.bottom_of_display: 1
 polybar.margin: window_margin
 polybar.storage_volume: /
diff --git a/apps/shell/fish/aliases.fish b/apps/shell/fish/aliases.fish
index 4b1d1f0..91efb4d 100755
--- a/apps/shell/fish/aliases.fish
+++ b/apps/shell/fish/aliases.fish
@@ -188,6 +188,11 @@ function chat
 	env WEECHAT_PASSPHRASE=$pass weechat
 end
 
+function rgl
+	# ripgrep | less
+	rg --color always $argv | less -r
+end
+
 # grep aliases
 alias rg "rg --text"
 alias grep "rg"
diff --git a/apps/shell/fish/config.fish b/apps/shell/fish/config.fish
index 9e35cf3..7b326c6 100755
--- a/apps/shell/fish/config.fish
+++ b/apps/shell/fish/config.fish
@@ -16,6 +16,7 @@ set -Ux _JAVA_AWT_WM_NONREPARENTING 1
 set -Ux TERMINAL kitty
 set -Ux BROWSER firefox-developer-edition
 set -Ux ERL_AFLAGS "-kernel shell_history enabled -kernel shell_history_file_bytes 1024000" # iex history
+set -Ux LESS "-r"
 
 # set our EDITOR to neovim if we've got it
 set -Ux EDITOR vim
@@ -64,4 +65,3 @@ mkdir -p $NOTES_PATH $USER_LOGS_PATH $SCROTS_PATH
 if has_command tmux && string match -v -q '*tmux*' $TERM && string match -v -q '*screen*' $TERM
 	tmux attach -t default || tmux new -s default
 end
-
diff --git a/bin/lock-and-sleep b/bin/lock-and-sleep
new file mode 100755
index 0000000..9716996
--- /dev/null
+++ b/bin/lock-and-sleep
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+if is_wayland; then
+	swaylock &
+else
+	dm-tool switch-to-greeter &
+fi
+sudo systemctl suspend
diff --git a/env/desktop/sway/config.d/main b/env/desktop/sway/config.d/main
index bd72942..790d314 100644
--- a/env/desktop/sway/config.d/main
+++ b/env/desktop/sway/config.d/main
@@ -3,10 +3,10 @@ workspace 1 output DP-1
 workspace 2 output DP-1
 workspace 3 output DP-1
 
-# H-format
-output DP-1 res 3440x1440@100Hz pos 1440 560
-output DP-2 res 2560x1440@60Hz  pos 0    0   transform 90
-output DP-4 res 2560x1440@60Hz  pos 4880 0   transform 270
+# --I format
+# output DP-1 res 3440x1440@100Hz pos 2560 720
+# output DP-2 res 2560x1440@60Hz  pos 0    0
+# output DP-4 res 2560x1440@60Hz  pos 6000 0   transform 270
 workspace 4 output DP-2
 workspace 5 output DP-2
 workspace 6 output DP-2
@@ -14,7 +14,14 @@ workspace 7 output DP-4
 workspace 8 output DP-4
 workspace 9 output DP-4
 
-# iIi-format
+# H format
+output DP-1 res 3440x1440@100Hz pos 1440 560
+output DP-2 res 2560x1440@60Hz  pos 0    0   transform 90
+output DP-3 res 2560x1440@60Hz  pos 0    0   transform 90
+output DP-4 res 2560x1440@60Hz  pos 4880 0   transform 270
+output DP-5 res 2560x1440@60Hz  pos 4880 0   transform 270
+
+# iIi format
 # output DP-1 res 3440x1440@100Hz pos 1440 0 transform 90
 # output DP-2 res 2560x1440@60Hz  pos 0    0 transform 90
 # output DP-4 res 2560x1440@60Hz  pos 2880 0 transform 270
diff --git a/env/desktop/x/resources b/env/desktop/x/resources
index 16cae4c..c809d1a 100755
--- a/env/desktop/x/resources
+++ b/env/desktop/x/resources
@@ -1,7 +1,7 @@
 #define bar_font_size 12
 # TODO: this needs fixing
 polybar.primary_font: iosevka\-lyte:pixelsize=bar_font_size;1
-bspwm.num_desktops_per_monitor: 4
+bspwm.num_desktops_per_monitor: 3
 bspwm.reverse_desktop_ordering: 0
 bspwm.reverse_monitor_desktops: 0
 polybar.display_monitor: DisplayPort-0