From 5253c7e9deacb417407dbe844070311631f7a664 Mon Sep 17 00:00:00 2001 From: maudin Date: Tue, 8 Nov 2022 14:58:23 +0100 Subject: [PATCH] rofi call bug fixe, minor changes --- bin/create_workspaces | 26 -------------------------- bin/menu_workspace_name | 2 +- bin/menu_workspace_switch | 2 +- bin/move_to_workspace | 4 +++- config | 8 ++++---- i3status/config | 3 +-- 6 files changed, 10 insertions(+), 35 deletions(-) delete mode 100755 bin/create_workspaces diff --git a/bin/create_workspaces b/bin/create_workspaces deleted file mode 100755 index 14467ee..0000000 --- a/bin/create_workspaces +++ /dev/null @@ -1,26 +0,0 @@ -#! /bin/bash - -. ~/.config/i3/env - -usage() { - echo "usage: create_workspaces" -} - -if [ $# -ne 0 ]; then - usage; exit 1 -fi - -if [ -n "${SECONDARY_OUTPUT}" ]; then - for i in $(seq 11 19); do - i3-msg -q workspace number $i - i3-msg -q move workspace to output ${SECONDARY_OUTPUT} - done - i3-msg -q workspace number 11 -fi -if [ -n "${PRIMARY_OUTPUT}" ]; then - for i in $(seq 1 9); do - i3-msg -q workspace number $i - i3-msg -q move workspace to output ${SECONDARY_OUTPUT} - done -fi -i3-msg -q workspace number 1 diff --git a/bin/menu_workspace_name b/bin/menu_workspace_name index fcde7ee..40ed33c 100755 --- a/bin/menu_workspace_name +++ b/bin/menu_workspace_name @@ -1,6 +1,6 @@ #! /bin/bash -NEW_NAME=$(rofi -p "Tag name" -lines 1 -dmenu) +NEW_NAME=$(rofi -p "Tag name" -lines 1 -dmenu -config ~/.config/rofi/config) OLD_NAME=$(i3-msg -t get_workspaces | jq '.[] | select(.focused==true).name') WORKSPACE_NUMBER=$(i3-msg -t get_workspaces | jq '.[] | select(.focused==true).num') diff --git a/bin/menu_workspace_switch b/bin/menu_workspace_switch index 1ee9f5b..cc86671 100755 --- a/bin/menu_workspace_switch +++ b/bin/menu_workspace_switch @@ -1,3 +1,3 @@ #!/bin/bash -ROFI_INPUT=1 ~/.config/i3/bin/focus_workspace $(i3-msg -t get_workspaces | jq '.[]' | jq -r '.name' | sort -n | rofi -dmenu -p "Select workspace:" | sed 's/:.*//') +ROFI_INPUT=1 ~/.config/i3/bin/focus_workspace $(i3-msg -t get_workspaces | jq '.[]' | jq -r '.name' | sort -n | rofi -dmenu -p "Select workspace:" -config ~/.config/rofi/config | sed 's/:.*//') diff --git a/bin/move_to_workspace b/bin/move_to_workspace index b680964..087139f 100755 --- a/bin/move_to_workspace +++ b/bin/move_to_workspace @@ -18,5 +18,7 @@ if [ $1 -gt 0 ] && [ $1 -lt 43 ]; then else usage; exit 1 fi +NEXT_WORKSPACE_NAME=$(i3-msg -t get_workspaces | jq -r ".[] | select(.num==${NEXT_WORKSPACE}).name") +if [ -z "${NEXT_WORKSPACE_NAME}" ]; then NEXT_WORKSPACE_NAME=${NEXT_WORKSPACE}; fi -i3-msg -q "move container to workspace ${NEXT_WORKSPACE}" +i3-msg -q "move container to workspace ${NEXT_WORKSPACE_NAME}" diff --git a/config b/config index aef1372..7c202ef 100644 --- a/config +++ b/config @@ -2,12 +2,11 @@ set $mod Mod4 floating_modifier $mod exec --no-startup-id ~/.config/i3/bin/auto-outputs -exec --no-startup-id ~/.config/i3/bin/create_workspaces ########## # Visual # ########## -font pango:Ubuntu Mono 16 +font pango:DejaVu Sans Mono 12 exec --no-startup-id feh --bg-scale ~/.wallpaper hide_edge_borders smart default_border pixel 1 @@ -38,8 +37,9 @@ bindsym $mod+Return exec kitty bindsym $mod+e exec emacsclient -c -n # Some menus bindsym $mod+F1 exec ~/.config/i3/bin/menu_workspace_name -bindsym $mod+F2 exec rofi -modi run -show run -bindsym $mod+F3 exec ~/.scripts/generate-rofi-ssh && rofi -lines 50 -modi ssh -show ssh +bindsym $mod+F2 exec rofi -modi run -show run -config ~/.config/rofi/config +bindsym $mod+F3 exec ~/.scripts/generate-rofi-ssh && rofi -lines 50 -modi ssh -show ssh -config ~/.config/rofi/config +bindsym $mod+Control+F3 exec ~/.scripts/generate-rofi-ssh && SSH_OPTIONS=-A rofi -lines 50 -modi ssh -show ssh -config ~/.config/rofi/config bindsym $mod+j exec ~/.config/i3/bin/menu_workspace_switch # change container layout (tabbed, toggle split) bindsym $mod+space layout toggle tabbed splith diff --git a/i3status/config b/i3status/config index 5c730e6..9b8340b 100644 --- a/i3status/config +++ b/i3status/config @@ -19,6 +19,5 @@ battery all { } tztime local { - format = "%time" - format_time = "%d-%m-%Y %H:%M" + format = "%d-%m-%Y %H:%M" }