diff --git a/.config/dunst/dunstrc b/.config/dunst/dunstrc index d344829..0b9802d 100644 --- a/.config/dunst/dunstrc +++ b/.config/dunst/dunstrc @@ -50,7 +50,7 @@ class = Dunst corner_radius = 0 - ignore_dbusclose = true + ignore_dbusclose = false mouse_left_click = close_current mouse_middle_click = do_action, close_current diff --git a/.config/tmux/keybinds.conf b/.config/tmux/keybinds.conf index d9e3d93..09161df 100644 --- a/.config/tmux/keybinds.conf +++ b/.config/tmux/keybinds.conf @@ -3,27 +3,41 @@ unbind-key C-b set-option -g prefix C-a bind-key C-a send-prefix -# moving +# Moving bind u previous-window bind i next-window bind n "new-window -c '#{pane_current_path}'" -# splits +# Splits bind h "split-window -hb -c '#{pane_current_path}'" bind j "split-window -v -c '#{pane_current_path}'" bind k "split-window -v -b -c '#{pane_current_path}'" bind l "split-window -h -c '#{pane_current_path}'" -# Rebind command key to ; bind ';' "command-prompt" -# Reload config on C-r +# Reload config bind C-r "source-file ~/.config/tmux/tmux.conf" -# session binds +# Session binds bind C-n "new-session -c '#{pane_current_path}' -s '#{b:pane_current_path}'" bind C-x "set-option -g detach-on-destroy on; kill-session" bind X "set-option -g detach-on-destroy off; kill-session; set-option -g detach-on-destroy on" +# Select mode +unbind-key -T copy-mode-vi y +unbind-key -T copy-mode-vi v +unbind-key -T copy-mode-vi V +unbind-key -T copy-mode-vi C-v +unbind-key -T copy-mode-vi C-c +unbind-key -T copy-mode-vi Escape + +bind-key -T copy-mode-vi y send-keys -X copy-pipe-and-cancel +bind-key -T copy-mode-vi v send-keys -X begin-selection +bind-key -T copy-mode-vi V send-keys -X select-line +bind-key -T copy-mode-vi C-v send-keys -X rectangle-toggle +bind-key -T copy-mode-vi C-c send-keys -X cancel +bind-key -T copy-mode-vi Escape send-keys -X clear-selection + # vim: ft=tmux diff --git a/.config/zsh/.zshenv b/.config/zsh/.zshenv index 775dbc9..360248b 100644 --- a/.config/zsh/.zshenv +++ b/.config/zsh/.zshenv @@ -33,5 +33,6 @@ XDG_SESSION_DESKTOP="$XDG_CURRENT_DESKTOP" WINDOW_MANAGER="dwm" SUDO_ASKPASS="${HOME}/.local/bin/scripts/dmenu_askpass" +SSH_ASKPASS="${HOME}/.local/bin/scripts/ssh-askpass" set +a diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index f4e346c..57e4040 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -1,5 +1,7 @@ [[ $- != *i* ]] && return +[ "$TERM" = "linux" ] && export TERM=fbterm + . ~/.cargo/env # ls colors @@ -95,6 +97,7 @@ bc() { unbuffer "$@" | bat; }; compdef _command bc alias gitignore="cp ${HOME}/.local/share/gitignore-template ./.gitignore" alias gs="git status" alias gc="git commit" +alias gca="git commit --amend --no-edit" alias gp="git push" alias gl="git log" alias ga="git add" @@ -106,6 +109,8 @@ alias gcl="git clone" # docker aliases alias dc="docker compose" +alias docker!="DOCKER_HOST=ssh://docker /usr/bin/docker" +alias dc!="docker! compose" # tmux aliases tn() { diff --git a/.fonts/MononokiNerdFontMono-Regular.ttf b/.fonts/MononokiNerdFontMono-Regular.ttf new file mode 100644 index 0000000..0a627cb Binary files /dev/null and b/.fonts/MononokiNerdFontMono-Regular.ttf differ diff --git a/.local/bin/scripts/gdt b/.local/bin/scripts/gdt index e633b34..b310452 100755 --- a/.local/bin/scripts/gdt +++ b/.local/bin/scripts/gdt @@ -50,4 +50,4 @@ fi export GIT_AUTHOR_DATE="${date}" export GIT_COMMITTER_DATE="${date}" -git commit -am "$@" +git commit -m "$@" diff --git a/.local/bin/scripts/ssh-askpass b/.local/bin/scripts/ssh-askpass new file mode 100755 index 0000000..98ba4e5 --- /dev/null +++ b/.local/bin/scripts/ssh-askpass @@ -0,0 +1,30 @@ +#!/bin/bash + +log() { + echo "$@" >> /home/wzray/out +} + +exec {OUTPUT_PIPE}<> <(:) + +DESC="${1:-"Please enter your authentication passphrase:"}" + +CMD=$(cat <<-EOF + SETDESC $DESC + SETPROMPT + GETPIN +EOF +) + +{ + while read -r out <&$OUTPUT_PIPE; do + log "$out" + if [[ "$out" = "D "* ]]; then + echo "${out#"D "}" + break + fi + done +} & + +pinentry-curses -T "${GPG_TTY}" -C "en_US.UTF-8" -M "en_US.UTF-8" -g <<<"$CMD" >&$OUTPUT_PIPE + +# vim: ft=sh diff --git a/.xinitrc b/.xinitrc index 1ac76e4..cb967ae 100644 --- a/.xinitrc +++ b/.xinitrc @@ -1,9 +1,15 @@ . "${HOME}"/.config/X11/xprofile -[ -z "$DBUS_SESSION_BUS_ADDRESS" ] && eval $(/usr/bin/dbus-launch --exit-with-session --sh-syntax) +[ -z "$DBUS_SESSION_BUS_ADDRESS" ] && eval "$(/usr/bin/dbus-launch --exit-with-session --sh-syntax)" dbus-update-activation-environment --verbose --all xr . "${HOME}"/.config/X11/autostart +gpg-agent -d + +export XDG_CURRENT_DESKTOP="gtk" +export XDG_SESSION_DESKTOP="$XDG_CURRENT_DESKTOP" +export WINDOW_MANAGER="dwm" + exec ssh-agent "${HOME}"/.local/src/dwm/dwm # exec ssh-agent /usr/bin/dwm