diff --git a/.config/cosmic/com.system76.CosmicSettings.Shortcuts/v1/custom b/.config/cosmic/com.system76.CosmicSettings.Shortcuts/v1/custom index c5af782..f959675 100644 --- a/.config/cosmic/com.system76.CosmicSettings.Shortcuts/v1/custom +++ b/.config/cosmic/com.system76.CosmicSettings.Shortcuts/v1/custom @@ -1,50 +1,4 @@ { - ( - modifiers: [ - Super, - Shift, - ], - key: "7", - ): Disable, - ( - modifiers: [], - key: "Print", - ): Disable, - ( - modifiers: [ - Super, - Ctrl, - ], - key: "2", - ): MoveToWorkspace(2), - ( - modifiers: [ - Super, - Shift, - ], - key: "3", - ): Disable, - ( - modifiers: [ - Super, - Ctrl, - ], - key: "7", - ): MoveToWorkspace(7), - ( - modifiers: [ - Super, - Ctrl, - ], - key: "0", - ): MoveToLastWorkspace, - ( - modifiers: [ - Super, - Ctrl, - ], - key: "6", - ): MoveToWorkspace(6), ( modifiers: [ Super, @@ -57,22 +11,16 @@ Super, Shift, ], - key: "8", - ): Disable, - ( - modifiers: [ - Super, - Shift, - ], - key: "4", - ): Disable, + key: "y", + description: Some("Get OTP"), + ): Spawn("zsh -c \"$HOME/.config/scripts/ssh.sh\""), ( modifiers: [ Super, Ctrl, ], - key: "4", - ): MoveToWorkspace(4), + key: "2", + ): MoveToWorkspace(2), ( modifiers: [ Super, @@ -80,13 +28,6 @@ ], key: "1", ): Disable, - ( - modifiers: [ - Super, - Shift, - ], - key: "9", - ): Disable, ( modifiers: [ Super, @@ -99,22 +40,15 @@ Super, Shift, ], - key: "2", + key: "5", ): Disable, ( modifiers: [ Super, - Ctrl, + Shift, ], - key: "8", - ): MoveToWorkspace(8), - ( - modifiers: [ - Super, - Ctrl, - ], - key: "5", - ): MoveToWorkspace(5), + key: "7", + ): Disable, ( modifiers: [ Super, @@ -127,6 +61,84 @@ ], key: "3", ): MoveToWorkspace(3), + ( + modifiers: [ + Super, + Shift, + ], + key: "8", + ): Disable, + ( + modifiers: [ + Super, + Ctrl, + ], + key: "6", + ): MoveToWorkspace(6), + ( + modifiers: [ + Super, + Shift, + ], + key: "4", + ): Disable, + ( + modifiers: [ + Super, + ], + key: "n", + description: Some("New Session"), + ): Spawn(" zsh -c \"$HOME/.config/scripts/sessions.sh new\""), + ( + modifiers: [ + Super, + Shift, + ], + key: "9", + ): Disable, + ( + modifiers: [ + Super, + Ctrl, + ], + key: "4", + ): MoveToWorkspace(4), + ( + modifiers: [ + Super, + Shift, + ], + key: "3", + ): Disable, + ( + modifiers: [ + Super, + Ctrl, + ], + key: "5", + ): MoveToWorkspace(5), + ( + modifiers: [ + Super, + Ctrl, + ], + key: "9", + ): MoveToWorkspace(9), + ( + modifiers: [ + Super, + Ctrl, + ], + key: "8", + ): MoveToWorkspace(8), + ( + modifiers: [ + Super, + Shift, + ], + key: "p", + description: Some("Grim Screenshot"), + ): Spawn("zsh -c \"grim -g '$(slurp)' - | wl-copy\""), ( modifiers: [ Super, @@ -134,7 +146,7 @@ ], key: "n", description: Some("New Goland Session"), - ): Spawn(" zsh -c \"$HOME/.config/scripts/sessions.sh goland-new\""), + ): Spawn("zsh -c \"$HOME/.config/scripts/sessions.sh goland-new\""), ( modifiers: [ Super, @@ -143,21 +155,6 @@ key: "o", description: Some("Get OTP"), ): Spawn("zsh -c \"$HOME/.config/scripts/otp.sh\""), - ( - modifiers: [ - Super, - Shift, - ], - key: "y", - description: Some("Get OTP"), - ): Spawn("zsh -c \"$HOME/.config/scripts/ssh.sh\""), - ( - modifiers: [ - Super, - Shift, - ], - key: "5", - ): Disable, ( modifiers: [ Super, @@ -170,19 +167,20 @@ Super, Ctrl, ], - key: "9", - ): MoveToWorkspace(9), + key: "0", + ): MoveToLastWorkspace, ( modifiers: [ Super, + Ctrl, ], - key: "n", - description: Some("New Session"), - ): Spawn(" zsh -c \"$HOME/.config/scripts/sessions.sh new\""), + key: "7", + ): MoveToWorkspace(7), ( modifiers: [ Super, + Shift, ], - key: "p", - ): System(Screenshot), + key: "2", + ): Disable, } diff --git a/.config/nvim/lua/plugins/misc.lua b/.config/nvim/lua/plugins/misc.lua index 26c4c2c..5d595d1 100644 --- a/.config/nvim/lua/plugins/misc.lua +++ b/.config/nvim/lua/plugins/misc.lua @@ -67,6 +67,12 @@ return { }, { "folke/zen-mode.nvim", - opts = {}, + opts = { + window = { + backdrop = 0.95, + width = 180, + height = 1, + }, + }, }, } diff --git a/.config/scripts/sessions.sh b/.config/scripts/sessions.sh index 94915c1..af51ca5 100755 --- a/.config/scripts/sessions.sh +++ b/.config/scripts/sessions.sh @@ -176,6 +176,24 @@ scratch() { tmux attach-session -t "$name" } +test() { + +menu_items=$( + i=1 + local items=() + tmux list-windows -F '#{window_name}' | + while read -r window_name; do + items+=("$(printf '%s %d "select-window -t %s"' "$window_name" "$i" "$window_name")") + i=$((i + 1)) + done + printf '%s\n' "${items[@]}" +) + + # Execute the command using tmux command-prompt + printf "tmux display-menu -x 20 -y 8 $(printf $menu_items)" + eval $(printf "tmux display-menu -x 20 -y 8 $(printf $menu_items)") +} + case "$1" in new) new $2 ;; switch) switch ;; @@ -185,5 +203,6 @@ notes) notes ;; popup) popup ;; scratch) scratch ;; goland-new) goland-new $2 ;; +test) test ;; *) echo "Please enter an action" ;; esac diff --git a/ansible/roles/packages/vars/Archlinux.yml b/ansible/roles/packages/vars/Archlinux.yml index 03fa72d..d69548b 100644 --- a/ansible/roles/packages/vars/Archlinux.yml +++ b/ansible/roles/packages/vars/Archlinux.yml @@ -121,6 +121,7 @@ required_packages_pacman: - libfido2 - yubikey-manager - zenity + - proton-vpn-gtk-app flatpak_remote: - { name: "flathub", url: "https://dl.flathub.org/repo/flathub.flatpakrepo" }