Merge remote-tracking branch 'origin/master'

This commit is contained in:
Daniel Flanagan 2023-04-30 10:38:20 -05:00
commit 0dca0141cf
Signed by: lytedev
GPG key ID: 5B2020A0F9921EF4
9 changed files with 30 additions and 16 deletions

View file

@ -2,4 +2,6 @@
SUBDIR="${2:-./}"
mkdir -p "$NOTES_PATH/$SUBDIR"
cd "$NOTES_PATH/$SUBDIR" || exit 1
"$EDITOR" "$NOTES_PATH/$SUBDIR/$1"
cd - || exit 1

View file

@ -60,5 +60,5 @@ end
# end
if status is-interactive; and not set -q TMUX; and not string match '/dev/tty*' (tty)
tmux
tmux att -t default || tmux new -s default
end

View file

@ -79,11 +79,5 @@
# pushOption = merge_request.remove_source_branch
# pushOption = merge_request.assign="daniel.flanagan"
[url "git@git.hq.bill.com:"]
insteadOf = https://git-p1ap1.divvy.co/
[url "git@git.hq.bill.com:"]
insteadOf = https://git.hq.bill.com/
[url "git@git.hq.bill.com:"]
insteadOf = ssh://git@git-p1ap1.divvy.co/

View file

@ -31,7 +31,15 @@ D = "kill_to_line_end"
"C-h" = "jump_view_left"
"C-l" = "jump_view_right"
"L" = "repeat_last_motion"
space = { q = ":reflow 80", Q = ":reflow 120", v = ":run-shell-command fish -c 'env > /tmp/env'", J = ":bp", K = ":bn" }
[keys.normal.space]
q = ":reflow 80"
Q = ":reflow 120"
v = ":run-shell-command fish -c 'env > /tmp/env'"
J = ":bp"
K = ":bn"
C = ":bc"
# O = ["select_textobject_inner WORD", ":pipe-to xargs xdg-open"]
[keys.select]
space = { q = ":reflow 80", Q = ":reflow 120" }

View file

@ -77,6 +77,10 @@ language-server = { command = "nimlangserver" }
indent = { tab-width = 2, unit = " " }
auto-format = true
[[language]]
name = "html"
auto-format = false
[[grammar]]
name = "nim"
source = { git = "https://github.com/aMOPel/tree-sitter-nim", rev = "8ce3627827e45a5835004391ff5ffcfe029ae6cf" }

View file

@ -20,6 +20,8 @@ adjust_line_height 0
window_padding_width 10.0
window_margin_width 0.0
confirm_os_window_close 0
enabled_layouts tall:bias=50;full_size=1;mirrored=true
map ctrl+shift+1 change_font_size all 12.5

View file

@ -1,14 +1,14 @@
default_border pixel 1
exec swayidle -w timeout 300 'swaylock -f' timeout 330 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' before-sleep 'swaylock -f'
exec swayidle -w timeout 600 'notify-send "Idling in 30 seconds..."' timeout 630 'swaylock -f' timeout 660 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' before-sleep 'swaylock -f'
output "Samsung Electric Company SyncMaster H1AK500000" position 0,0
# whichever dell monitor is plugged in
output "Dell Inc. DELL U2720Q CWTM623" transform 90 scale 1.5
output "Dell Inc. DELL U2720Q CWTM623" position -1440,200
output "GIGA-BYTE TECHNOLOGY CO., LTD. AORUS FO48U 23070B000307" mode 3840x2160@120Hz position 1440,0
output "Dell Inc. DELL U2720Q CWTM623" transform 90 scale 1.5
output "Dell Inc. DELL U2720Q CWTM623" position 0,0
# whichever dell monitor is plugged in
output "Dell Inc. DELL U2720Q D3TM623" transform 90 scale 1.5
output "Dell Inc. DELL U2720Q D3TM623" position 3840,200
output "Dell Inc. DELL U2720Q D3TM623" position 5280,0
exec firefox

View file

@ -0,0 +1,4 @@
#!/usr/bin/env fish
fd --regex sway-ipc\.$EUID\.\\d+\.sock /var/run/user/$EUID -d 1 --max-results 1

View file

@ -1,7 +1,7 @@
{
"layer": "top",
"position": "bottom",
"output": ["eDP-1", "DP-3"],
"output": ["eDP-1", "DP-3", "DP-1"],
"height": 32,
"modules-left": ["clock", "sway/title"],
"modules-center": ["sway/workspaces"],