From e463d35dd61a5bd4277ceae1ddca97d5b60a25b8 Mon Sep 17 00:00:00 2001
From: Tyrel Souza <tsouza@redlattice.com>
Date: Mon, 20 May 2024 10:07:28 -0400
Subject: [PATCH] desktop changes

---
 home/config/i3/config   | 39 +++++++++++++++------------------------
 home/gitconfig          |  3 ++-
 home/jobs/redlattice.sh | 10 ++++++++++
 home/shell_funcs        |  3 +++
 4 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/home/config/i3/config b/home/config/i3/config
index 4b453ce..75c0b98 100644
--- a/home/config/i3/config
+++ b/home/config/i3/config
@@ -1,13 +1,5 @@
-# This file has been auto-generated by i3-config-wizard(1).
-# It will not be overwritten, so edit it as you like.
-#
-# Should you change your keyboard layout some time, delete
-# this file and re-run i3-config-wizard(1).
-#
-
-# i3 config file (v4)
-#
-# Please see https://i3wm.org/docs/userguide.html for a complete reference!
+include catppuccin-frappe
+include tyrel-colors
 
 set $mod Mod4
 
@@ -26,14 +18,14 @@ exec --no-startup-id dex --autostart --environment i3
 # The combination of xss-lock, nm-applet and pactl is a popular choice, so
 # they are included here as an example. Modify as you see fit.
 
-# xss-lock grabs a logind suspend inhibit lock and will use i3lock to lock the
-# screen before suspend. Use loginctl lock-session to lock your screen.
-exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork
-
 # NetworkManager is the most popular way to manage wireless networks on Linux,
 # and nm-applet is a desktop environment-independent system tray GUI for it.
 exec --no-startup-id nm-applet
 
+# xss-lock grabs a logind suspend inhibit lock and will use i3lock to lock the
+# screen before suspend. Use loginctl lock-session to lock your screen.
+exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork
+
 # Use pactl to adjust volume in PulseAudio.
 set $refresh_i3status killall -SIGUSR1 i3status
 bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +10% && $refresh_i3status
@@ -45,7 +37,7 @@ bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOU
 floating_modifier $mod
 
 # start a terminal
-bindsym $mod+Return exec i3-sensible-terminal
+bindsym $mod+Return exec terminator -u
 
 # kill focused window
 bindsym $mod+Shift+q kill
@@ -54,7 +46,8 @@ bindsym $mod+Shift+q kill
 # bindsym $mod+d exec --no-startup-id dmenu_run
 bindsym $mod+d exec rofi -show run
 bindsym $mod+Shift+d exec rofi -show drun
-bindsym $mod+Shift+Tab exec rofi -show window -p '[window] '
+bindsym $mod+Tab exec rofi -show window -p '[window] '
+bindsym $mod+t split toggle; layout tabbed; exec notify-send 'Tabbed'
 # A more modern dmenu replacement is rofi:
 # bindcode $mod+40 exec "rofi -modi drun,run -show drun"
 # There also is i3-dmenu-desktop which only displays applications shipping a
@@ -103,9 +96,6 @@ bindsym $mod+space focus mode_toggle
 # focus the parent container
 bindsym $mod+a focus parent
 
-# focus the child container
-#bindsym $mod+d focus child
-
 # Define names for default workspaces for which we configure key bindings later on.
 # We use variables to avoid repeating the names in multiple places.
 set $ws1 "1"
@@ -179,13 +169,14 @@ bindsym $mod+r mode "resize"
 
 # Start i3bar to display a workspace bar (plus the system information i3status
 # finds out, if available)
-bar {
-  position bottom
-  status_command i3status -c ~/.config/i3status/config
-  tray_output primary
-}
+#bar {
+#  position bottom
+#  status_command i3status -c ~/.config/i3status/config
+#  tray_output primary
+#}
 
 exec --no-startup-id feh --bg-scale /home/tyrel/Pictures/wallpapers/uw_vibes.png
 exec --no-startup-id ~/bin/startup_i3.sh
 
 bindsym $mod+Shift+l exec dm-tool switch-to-greeter
+
diff --git a/home/gitconfig b/home/gitconfig
index 3f866d6..5a96ec5 100644
--- a/home/gitconfig
+++ b/home/gitconfig
@@ -39,7 +39,8 @@
     logtree=  "log --graph --oneline --decorate --all" # show a tree with branches merging
     noop="!git commit --allow-empty -m 'no op'"
     ob = "!$EDITOR $(git diff --name-only origin/main)" # Open all files in editor that differ between origin/main and staged/unstaged
-    od = "!$EDITOR $(git diff --name-only HEAD)" # Open all changed files differ from current HEAD
+    od = "!$EDITOR $(git diff --name-only origin/devel)" # Open all files in editor that differ between origin/main and staged/unstaged
+    oh = "!$EDITOR $(git diff --name-only HEAD)" # Open all changed files differ from current HEAD
     p = push
     recent = "!git for-each-ref --format=\"%(committerdate:relative) | %(refname)\" --sort=-committerdate refs/heads | sed '/main/d' | head -n 15" # get the most 10 recent branches worked on
     scrum = log --since='1 day ago' --author='Tyrel Souza' --oneline
diff --git a/home/jobs/redlattice.sh b/home/jobs/redlattice.sh
index e06a998..11293ad 100644
--- a/home/jobs/redlattice.sh
+++ b/home/jobs/redlattice.sh
@@ -16,6 +16,9 @@ function rl-gsub() {
 function rl-portalshell() {
   docker compose -f /home/tsouza/rl/vail-dev/docker-compose.yml exec portald bash
 }
+function rl-portalrunshell() {
+  docker compose -f /home/tsouza/rl/vail-dev/docker-compose.yml run --rm -it portald bash
+}
 function rl-dbshell() {
   docker compose -f /home/tsouza/rl/vail-dev/docker-compose.yml exec portal-db bash
 }
@@ -25,3 +28,10 @@ function rl-syncnode() {
 function rl-redisshell() {
   docker compose -f /home/tsouza/rl/vail-dev/docker-compose.yml exec portal-redis bash
 }
+
+function rl-bash() {
+  docker compose -f /home/tsouza/rl/vail-dev/docker-compose.yml exec $1 bash
+}
+function rl-runbash() {
+  docker compose -f /home/tsouza/rl/vail-dev/docker-compose.yml run --rm -it $1 bash
+}
diff --git a/home/shell_funcs b/home/shell_funcs
index 2a3b94b..4d91b6d 100644
--- a/home/shell_funcs
+++ b/home/shell_funcs
@@ -37,3 +37,6 @@ function new_dock_space (){
 }
 
 
+function agr (){
+  ag -0 -l "$1" | xargs -0 perl -pi.bak -e "s/$1/$2/g";
+}