add difftastic

dot_cargo/config.toml

@@ -0,0 +1,4 @@
+[target.'cfg(target_os = "linux")']
+linker = "clang"
+rustflags = ["-C", "link-arg=--ld-path=/home/joe/.local/share/mise/shims/mold"]
+

dot_config/alacritty/alacritty.toml

@@ -13,7 +13,6 @@ size = 10
 padding.x = 14
 padding.y = 14
 decorations = "None"
-opacity = 0.98
 
 [keyboard]
 bindings = [

dot_config/hypr/autostart.conf

@@ -9,4 +9,3 @@ exec = ~/.local/bin/assign-workspace-monitors
 # autostart various apps in their own special workspaces
 exec-once = [workspace special:slack silent] slack
 exec-once = [workspace special:1password silent] 1password
-exec-once = [workspace special:creddy silent; float; size 800 600] uwsm app -- creddy

dot_config/hypr/bindings.conf

@@ -21,25 +21,29 @@ bindd = SUPER, O, modgoffice, exec, omarchy-launch-webapp "https://office.modg.o
 # lazy apps: Launch if not currently running, otherwise just switch to that app
 bindd = SUPER, D, Open/focus DataGrip, exec, ~/.local/bin/lazy-app class:jetbrains-datagrip ~/.local/share/JetBrains/Toolbox/apps/datagrip/bin/datagrip
 
-# Overwrite existing bindings, like putting Omarchy Menu on Super + Space
+# omarchy uses swapwindow for these binds, but I prefer movewindow so that it can cross monitor boundaries
-# unbind = SUPER, Space
+unbind = SUPER SHIFT, left
-# bindd = SUPER, SPACE, Omarchy menu, exec, omarchy-menu
+unbind = SUPER SHIFT, right
+unbind = SUPER SHIFT, up
+unbind = SUPER SHIFT, down
+bindd = SUPER SHIFT, left, Move window to the left, movewindow, l
+bindd = SUPER SHIFT, right, Move window to the right, movewindow, r
+bindd = SUPER SHIFT, up, Move window up, movewindow, u
+bindd = SUPER SHIFT, down, Move window down, movewindow, d
 
-# I have my own screnshot script now
+bindd = SUPER ALT, left, Move current workspace to the left, movecurrentworkspacetomonitor, l
-unbind = , PRINT
+bindd = SUPER ALT, right, Move current workspace to the right, movecurrentworkspacetomonitor, r
-bindd = , PRINT, Screenshot of region, exec, ~/.local/bin/freezeshot
+bindd = SUPER ALT, up, Move current workspace up, movecurrentworkspacetomonitor, u
-unbind = SHIFT, PRINT
+bindd = SUPER ALT, down, Move current workspace down, movecurrentworkspacetomonitor, d
-bindd = SHIFT, PRINT, Screenshot of window, exec, ~/.local/bin/freezeshot window
-unbind = CTRL, PRINT
-bindd = CTRL, PRINT, Screenshot of display, exec, ~/.local/bin/freezeshot output
 
 # create a new workspace
 bindd = SUPER, grave, Create a mew workspace, exec, ~/.local/bin/new-workspace
 
-# keybinds for special workspaces
+# keybinds for background apps
 bindd = SUPER, S, Show/hide Slack, togglespecialworkspace, slack
-bindd = SUPER, period, Show/hide 1Password, togglespecialworkspace, 1password
+bindd = SUPER, period, 1Password quick access, exec, 1password --quick-access
-bindd = SUPER, Z, Show/hide Creddy, togglespecialworkspace, creddy
+bindd = SUPER CTRL, period, Show/hide 1Password, togglespecialworkspace, 1password
+bindd = SUPER, Z, Show Creddy, exec, creddy shortcut show-window
 
 # I'm used to super+L to lock screen
 bindd = SUPER, L, Lock screen, exec, omarchy-lock-screen
@@ -48,3 +52,15 @@ bindd = SUPER, L, Lock screen, exec, omarchy-lock-screen
 unbind = CTRL ALT, DELETE
 bindd = CTRL ALT, DELETE, Close all windows (except special), exec, ~/.local/bin/close-non-special-windows
 
+# for WHATEVER reason, hyprland refuses to use the numeric symbols for keypad keys,
+# so we have to use the navigation symbols instead
+bindd = SUPER, KP_End, Switch to workspace 1, workspace, 1
+bindd = SUPER, KP_Down, Switch to workspace 2, workspace, 2
+bindd = SUPER, KP_Next, Switch to workspace 3, workspace, 3
+bindd = SUPER, KP_Left, Switch to workspace 4, workspace, 4
+bindd = SUPER, KP_Begin, Switch to workspace 5, workspace, 5
+bindd = SUPER, KP_Right, Switch to workspace 6, workspace, 6
+bindd = SUPER, KP_Home, Switch to workspace 7, workspace, 7
+bindd = SUPER, KP_Up, Switch to workspace 8, workspace, 8
+bindd = SUPER, kp_Prior, Switch to workspace 9, workspace, 9
+

dot_config/hypr/input.conf

@@ -13,6 +13,9 @@ input {
   # Increase sensitity for mouse/trackpack (default: 0)
   sensitivity = -0.25
 
+  # enable numlock automatically
+  numlock_by_default = true
+
   touchpad {
     # Use natural (inverse) scrolling
     # natural_scroll = true

dot_config/hypr/windows.conf

@@ -5,8 +5,14 @@ windowrule = workspace name:DataGrip, class:jetbrains-datagrip
 windowrule = workspace special:creddy, class:creddy
 windowrule = float, class:creddy
 windowrule = size 800 600, class:creddy
+# this just gets ignored when monitor 2 isn't present, which is perfect
+windowrule = monitor 2, class:creddy
 
 windowrule = workspace special:slack, class:Slack
 
-windowrule = workspace special:1password, class:1Password
+# excluding floating windows allows the unlock and quick-access popups to show in any workspace
+windowrule = workspace special:1password, class:1Password, floating:0
+# quick-access popup doesn't resize automatically when its content changes
+# windowrule = size 550 404, class:1Password, title:Quick.*
+windowrule = persistentsize, class:1Password, title:Quick.*
 

dot_config/mise/config.toml

@@ -16,6 +16,12 @@ yay = "latest"
 k9s = "latest"
 awscli = "latest"
 kubectl = "latest"
+difftastic = "latest"
+
+[tools."gitlab:tools/setconf"]
+version = "latest"
+api_url = "https://gitlab.modg.net/api/v4"
+bin = "setconf"
 
 [tools."pipx:harlequin"]
 version = "latest"

dot_config/zed/settings.json

@@ -50,5 +50,22 @@
   },
   "file_types": {
     "Markdown": ["svx"]
-  }
+  },
+  "experimental.theme_overrides": {
+      // use with One Dark Pro theme
+      // "editor.document_highlight.read_background": "#74ade81a",
+      "syntax": {
+        "operator": {
+          "color": "#fa428f"
+        },
+        "string.doc": {
+          "color": "#a2a3a7"
+        }
+        // use with One Dark Pro theme
+        // "punctuation.special": {
+        //   "color": "#b1574b",
+        // },
+      }
+    }
+
 }

dot_local/bin/executable_freezeshot

@@ -1,32 +0,0 @@
-#!/bin/bash
-
-# adapted from ~/.local/share/omarchy/bin/omarchy-cmd-screenshot
-
-[[ -f ~/.config/user-dirs.dirs ]] && source ~/.config/user-dirs.dirs
-OUTPUT_DIR="${OMARCHY_SCREENSHOT_DIR:-${XDG_PICTURES_DIR:-$HOME/Pictures}}"
-
-if [[ ! -d "$OUTPUT_DIR" ]]; then
-  notify-send "Screenshot directory does not exist: $OUTPUT_DIR" -u critical -t 3000
-  exit 1
-fi
-
-# if we are in the process of screenshotting, cancel that and exit
-pkill slurp && exit 0
-
-# freeze display(s)
-wayfreeze &
-sleep 0.1
-
-# use process substitution to send to satty rather than piping so that we can kill wayfreeze as soon as hyprshot finishes
-hyprshot -m ${1:-region} --raw > >(
-  satty --filename - \
-    --output-filename "$output_dir/screenshot-$(date +'%y-%m-%d_%h-%m-%s').png" \
-    --early-exit \
-    --actions-on-enter save-to-clipboard \
-    --save-after-copy \
-    --copy-command 'wl-copy'
-) &
-
-wait $(jobs -p %hyprshot)
-kill $(jobs -p %wayfreeze)
-# satty is still running at this point, but we don't particularly care

private_dot_docker/config.json

@@ -1,3 +1,6 @@
 {
-  "credsStore": "creddy"
+	"auths": {
-}
+		"686562827170.dkr.ecr.us-east-1.amazonaws.com": {}
+	},
+	"credsStore": "creddy"
+}