Compare commits

..

8 Commits

Author SHA1 Message Date
7f507ec4c3 vim: Suppress startup messages 2022-07-05 22:27:10 +02:00
4073ac5930 tmux: Rearrange config options 2022-07-05 22:27:10 +02:00
a7d23f06c4 Start ssh agent for some users 2022-07-05 22:27:10 +02:00
e5d23adcab i3: Make urgentcy colors consistent 2022-07-05 22:27:10 +02:00
db329973ec alacritty: Make black actually black
Otherwise, "black" output is just invisible. Mainly visible with ansible
DEBUG output, which is "dark gray", which is "1;30", which is black,
which was until now the same as the background color.
2022-07-05 22:27:10 +02:00
e2395d12cf Add proper script to toggle workspace window 2022-07-05 22:27:10 +02:00
40ef2ad2fd i3: Make active workspace background consistent 2022-07-05 22:27:10 +02:00
c0a2e34fd5 i3: Use nice icons for workspaces 2022-07-05 22:27:10 +02:00
9 changed files with 102 additions and 48 deletions

View File

@@ -26,6 +26,7 @@ users:
bigger_font: true
mail: hannes@hkoerber.de
git_gpg_sign: false
ssh_agent: false
gpg_agent: true
gpg_agent_for_ssh: true
gpg_key:
@@ -54,9 +55,9 @@ screen:
screencfgs: []
workspace:
1: www
9: comm
10: music
1: ""
9: ""
10: ""
environment:
MACHINE_TYPE: "workstation"

View File

@@ -18,6 +18,7 @@ users:
manage_css: false
mail: hannes.koerber@tradebyte.com
git_gpg_sign: false
ssh_agent: true
gpg_agent: false
gpg_agent_for_ssh: false
environment:
@@ -42,6 +43,7 @@ users:
manage_css: true
mail: hannes@hkoerber.de
git_gpg_sign: false
ssh_agent: false
gpg_agent: true
gpg_agent_for_ssh: true
gpg_key:
@@ -71,14 +73,14 @@ screen:
0: eDP-1
workspace:
1: www
2: www
3: term-local
4: term-remote
7: comm
8: pass
9: music
10: pim
1: ""
2: ""
3: " local"
4: " remote"
7: ""
8: ""
9: ""
10: ""
screencfgs:
- name: three-screens

View File

@@ -18,6 +18,7 @@ users:
manage_css: false
mail: hannes.koerber@tradebyte.com
git_gpg_sign: false
ssh_agent: true
gpg_agent: false
gpg_agent_for_ssh: false
environment:
@@ -46,6 +47,7 @@ users:
manage_css: true
mail: hannes@hkoerber.de
git_gpg_sign: false
ssh_agent: false
gpg_agent: true
gpg_agent_for_ssh: true
gpg_key:
@@ -75,14 +77,14 @@ screen:
0: eDP-1
workspace:
1: www
2: www
3: term-local
4: term-remote
7: comm
8: pass
9: music
10: pim
1: ""
2: ""
3: " local"
4: " remote"
7: ""
8: ""
9: ""
10: ""
screencfgs:
- name: three-screens

View File

@@ -184,7 +184,7 @@ colors:
# Normal colors
normal:
black: '#272822'
black: '#000000'
red: '#F92672'
green: '#A6E22E'
yellow: '#F4BF75'

View File

@@ -226,27 +226,7 @@ assign [class="^Wine$"] $workspace10
bindsym $mod+Shift+v exec --no-startup-id redshift-toggle
# bindsym $mod+$pim_toggle \
# mark --add _source; \
# focus output eDP-1; \
# mark --add _origin; \
# workspace $workspace10; \
# mark --add _destination; \
# [con_mark="^_destination$"] swap container with mark "_source"; \
# [con_mark="^_source$"] focus; unmark _source; \
# [con_mark="^_origin$"] focus; unmark _origin; \
# [con_mark="^_destination$"] focus; unmark _destination; \
bindsym $mod+$pim_toggle \
unmark _destination; \
mark _source; \
workspace $workspace10; \
mark --add _destination; \
[con_mark="^_destination$"] swap container with mark "_source"; \
[con_mark="^_source$"] focus; \
unmark _source; \
[con_mark="^_destination$"] focus; \
unmark _destination;
bindsym $mod+$pim_toggle exec --no-startup-id ~/.i3/scripts/swap-from-workspace.sh $workspace10
################################################################################
### MODES ######################################################################
@@ -322,7 +302,7 @@ assign [class="^Wine$"] $workspace10
client.focused #e5b567 #e5b567 #000000 #FF0000
client.focused_inactive #272822 #5f676a #ffffff #484e50
client.unfocused #1C1C1C #272822 #cccccc #292d2e
client.urgent #272822 #900000 #ffffff #900000
client.urgent #272822 #ff7777 #000000 #900000
################################################################################
### APPLICATION SPECIFIC SETTINGS ##############################################
@@ -386,10 +366,11 @@ bar {
# focused_background #303030
# focused_separator #272822
focused_workspace #e5b567 #272822 #ffffff
active_workspace #272822 #5f676a #ffffff
# border bg text
focused_workspace #e5b567 #4f676a #ffffff
active_workspace #272822 #4f676a #ffffff
inactive_workspace #272822 #272822 #dddddd
urgent_workspace #D00000 #D00000 #272822
urgent_workspace #272822 #ff7777 #272822
binding_mode #272822 #e5b567 #272822
}

View File

@@ -0,0 +1,59 @@
#!/usr/bin/env bash
set -o nounset
set -o errexit
set -o pipefail
set -o xtrace
cmds=()
workspacescratch="${1}"
i3msgworkspaces="$(i3-msg -t get_workspaces)"
output_of_pim=$(printf '%s' "${i3msgworkspaces}" | jq -r 'map(select(.name == "'"${workspacescratch}"'")) | .[0].output')
active_workspace_on_target_output=$(printf '%s' "${i3msgworkspaces}" | jq -r 'map(select(.output == "'"${output_of_pim}"'" and .visible)) | .[0].name')
focused_workspace_name=$(printf '%s' "${i3msgworkspaces}" | jq -r 'map(select(.focused)) | .[0].name')
focused_workspace_output=$(printf '%s' "${i3msgworkspaces}" | jq -r 'map(select(.focused)) | .[0].output')
if [[ "${focused_workspace_name}" == "${workspacescratch}" ]]; then
exit 0
fi
cmds+=('unmark _destination')
cmds+=('mark _source')
if [[ "${active_workspace_on_target_output}" != "${workspacescratch}" ]] && [[ "${output_of_pim}" != "${focused_workspace_output}" ]]; then
need_output_reset=1
else
need_output_reset=0
fi
if ((need_output_reset)); then
cmds+=('workspace "'"${active_workspace_on_target_output}"'"')
cmds+=("mark --add _origin")
fi
cmds+=('workspace "'"${workspacescratch}"'"')
cmds+=('mark --add _destination')
cmds+=('[con_mark="^_destination$"] swap container with mark "_source"')
cmds+=('[con_mark="^_source$"] focus')
cmds+=('unmark _source')
if ((need_output_reset)); then
cmds+=('[con_mark="^_origin$"] focus')
cmds+=('unmark _origin')
fi
cmds+=('[con_mark="^_destination$"] focus')
cmds+=('unmark _destination')
i3msgcmd=""
for cmd in "${cmds[@]}"; do
i3msgcmd="${i3msgcmd}${cmd};"
done
i3-msg "${i3msgcmd}"

View File

@@ -16,8 +16,6 @@ set-option -g mode-keys vi
set-option -g renumber-windows on
set-option -g bell-action any
set-option -g history-limit 50000
set-option -g base-index 1
@@ -46,6 +44,8 @@ set-option -g window-status-current-style "bg=#e5b567,fg=black"
set-option -g monitor-activity on
set-option -g visual-activity off
set-option -g window-status-activity-style "bg=#ff7777,fg=black"
set-option -g monitor-bell on
set-option -g bell-action any
set-option -g automatic-rename on
set-option -g automatic-rename-format '#{pane_current_command}'

View File

@@ -104,7 +104,7 @@ set noerrorbells
set noshowmode
set numberwidth=2
set relativenumber
set shortmess=rti
set shortmess=rtiF
set ruler
set scrolloff=7
set title

View File

@@ -19,6 +19,15 @@ elif [[ -f /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlightin
source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
fi
{% if user.ssh_agent %}
if ! pgrep -u "$USER" ssh-agent > /dev/null ; then
ssh-agent > "$XDG_RUNTIME_DIR/ssh-agent.env"
fi
if [[ ! "$SSH_AUTH_SOCK" ]]; then
source "$XDG_RUNTIME_DIR/ssh-agent.env" >/dev/null
fi
{% endif %}
{% if distro == 'ubuntu' %}
alias imv=imv-x11
{% endif %}