From ba6bed755f6565d5ca440d6114f7ad938e675dd8 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Fri, 21 Apr 2023 23:50:06 -0500 Subject: [PATCH 1/2] Sway stuff, new primary desktop monitor, etc. --- common/fish/config.fish | 2 +- common/git/config | 8 +------- common/helix/config.toml | 9 ++++++++- common/kitty/kitty.conf | 2 ++ host/desktop/sway/config | 14 +++++++------- os/linux/bin/begin-inhibit-sway-idle.fish | 4 ++++ os/linux/waybar/config | 2 +- 7 files changed, 24 insertions(+), 17 deletions(-) create mode 100644 os/linux/bin/begin-inhibit-sway-idle.fish diff --git a/common/fish/config.fish b/common/fish/config.fish index ab1d925..2d4ce7e 100755 --- a/common/fish/config.fish +++ b/common/fish/config.fish @@ -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 \ No newline at end of file diff --git a/common/git/config b/common/git/config index a90292f..45a1196 100644 --- a/common/git/config +++ b/common/git/config @@ -80,10 +80,4 @@ # 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/ + insteadOf = https://git.hq.bill.com/ \ No newline at end of file diff --git a/common/helix/config.toml b/common/helix/config.toml index 2474fab..bad6414 100644 --- a/common/helix/config.toml +++ b/common/helix/config.toml @@ -34,7 +34,14 @@ 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" +# O = ["select_textobject_inner WORD", ":pipe-to xargs xdg-open"] [keys.select] space = { q = ":reflow 80", Q = ":reflow 120" } diff --git a/common/kitty/kitty.conf b/common/kitty/kitty.conf index c281824..436bcd1 100644 --- a/common/kitty/kitty.conf +++ b/common/kitty/kitty.conf @@ -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 diff --git a/host/desktop/sway/config b/host/desktop/sway/config index c02293f..b451dfa 100644 --- a/host/desktop/sway/config +++ b/host/desktop/sway/config @@ -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 300 'notify-send "Idling in 30 seconds..."' timeout 330 'swaylock -f' timeout 360 '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 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 CWTM623" transform 90 scale 2.0 +output "Dell Inc. DELL U2720Q CWTM623" position -1080,0 + +output "Dell Inc. DELL U2720Q D3TM623" transform 90 scale 2.0 +output "Dell Inc. DELL U2720Q D3TM623" position 3840,0 exec firefox diff --git a/os/linux/bin/begin-inhibit-sway-idle.fish b/os/linux/bin/begin-inhibit-sway-idle.fish new file mode 100644 index 0000000..189b691 --- /dev/null +++ b/os/linux/bin/begin-inhibit-sway-idle.fish @@ -0,0 +1,4 @@ +#!/usr/bin/env fish + +fd --regex sway-ipc\.$EUID\.\\d+\.sock /var/run/user/$EUID -d 1 --max-results 1 + diff --git a/os/linux/waybar/config b/os/linux/waybar/config index 376df48..6bebd7f 100644 --- a/os/linux/waybar/config +++ b/os/linux/waybar/config @@ -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"], From 6b79aada9a05d223b6ea8f0b35efdd4dc43778d8 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Tue, 25 Apr 2023 14:13:44 -0500 Subject: [PATCH 2/2] Updates --- common/bin/nf | 2 ++ common/helix/config.toml | 1 + common/helix/languages.toml | 4 ++++ host/desktop/sway/config | 12 ++++++------ 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/common/bin/nf b/common/bin/nf index 6e007b5..9eaef3f 100755 --- a/common/bin/nf +++ b/common/bin/nf @@ -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 diff --git a/common/helix/config.toml b/common/helix/config.toml index bad6414..284b48b 100644 --- a/common/helix/config.toml +++ b/common/helix/config.toml @@ -41,6 +41,7 @@ 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] diff --git a/common/helix/languages.toml b/common/helix/languages.toml index 15b5926..c4545f2 100644 --- a/common/helix/languages.toml +++ b/common/helix/languages.toml @@ -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" } \ No newline at end of file diff --git a/host/desktop/sway/config b/host/desktop/sway/config index b451dfa..6c33619 100644 --- a/host/desktop/sway/config +++ b/host/desktop/sway/config @@ -1,14 +1,14 @@ default_border pixel 1 -exec swayidle -w timeout 300 'notify-send "Idling in 30 seconds..."' timeout 330 'swaylock -f' timeout 360 '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 -output "GIGA-BYTE TECHNOLOGY CO., LTD. AORUS FO48U 23070B000307" mode 3840x2160@120Hz position 0,0 +output "GIGA-BYTE TECHNOLOGY CO., LTD. AORUS FO48U 23070B000307" mode 3840x2160@120Hz position 1440,0 -output "Dell Inc. DELL U2720Q CWTM623" transform 90 scale 2.0 -output "Dell Inc. DELL U2720Q CWTM623" position -1080,0 +output "Dell Inc. DELL U2720Q CWTM623" transform 90 scale 1.5 +output "Dell Inc. DELL U2720Q CWTM623" position 0,0 -output "Dell Inc. DELL U2720Q D3TM623" transform 90 scale 2.0 -output "Dell Inc. DELL U2720Q D3TM623" position 3840,0 +output "Dell Inc. DELL U2720Q D3TM623" transform 90 scale 1.5 +output "Dell Inc. DELL U2720Q D3TM623" position 5280,0 exec firefox