configs  Check-in [f904a2dee2]

Overview
Comment:Make tmux use XDG basedir - somewhat
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: f904a2dee21ada1631b8722e03bc8d298896c4167fa27e81078af068974a08c5
User & Date: js 2020-02-26 21:49:49
Context
2020-02-26
22:52
fish: Add dlna command check-in: 223094cce0 user: js tags: trunk
21:49
Make tmux use XDG basedir - somewhat check-in: f904a2dee2 user: js tags: trunk
21:30
Make GPG use XDG basedir - somewhat check-in: 846423356a user: js tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to create_symlinks.sh.

13
14
15
16
17
18
19
20
21
22
23
24
25
26
27

mkdir -p $HOME/.config
which git >/dev/null 2>&1 && link_file git .config/git ../
if which gpg >/dev/null 2>&1 || which gpg2 >/dev/null 2>&1; then
	mkdir -p $HOME/.local/share/gnupg
	link_file gpg.conf .local/share/gnupg/gpg.conf ../../../
fi
which tmux >/dev/null 2>&1 && link_file tmux.conf .tmux.conf
which vim >/dev/null 2>&1 && link_file vim .config/vim ../
which fish >/dev/null 2>&1 && link_file fish .config/fish ../
which youtube-dl >/dev/null 2>&1 && link_file youtube-dl .config/youtube-dl ../
which zsh >/dev/null 2>&1 && link_file zshrc .zshrc

if test x"$(uname -s)" = x"Darwin"; then
	dest="$HOME/Library/Keyboard Layouts/eu_US.keylayout"







|







13
14
15
16
17
18
19
20
21
22
23
24
25
26
27

mkdir -p $HOME/.config
which git >/dev/null 2>&1 && link_file git .config/git ../
if which gpg >/dev/null 2>&1 || which gpg2 >/dev/null 2>&1; then
	mkdir -p $HOME/.local/share/gnupg
	link_file gpg.conf .local/share/gnupg/gpg.conf ../../../
fi
which tmux >/dev/null 2>&1 && link_file tmux .config/tmux ../
which vim >/dev/null 2>&1 && link_file vim .config/vim ../
which fish >/dev/null 2>&1 && link_file fish .config/fish ../
which youtube-dl >/dev/null 2>&1 && link_file youtube-dl .config/youtube-dl ../
which zsh >/dev/null 2>&1 && link_file zshrc .zshrc

if test x"$(uname -s)" = x"Darwin"; then
	dest="$HOME/Library/Keyboard Layouts/eu_US.keylayout"

Changes to fish/functions/gpg-sftp.fish.

1
2
3
4
function gpg-sftp
    set -lx SSH_AUTH_SOCK $GNUPGHOME/S.gpg-agent.ssh
    sftp $argv
end
|



1
2
3
4
function gpg-sftp --wraps sftp
    set -lx SSH_AUTH_SOCK $GNUPGHOME/S.gpg-agent.ssh
    sftp $argv
end

Changes to fish/functions/gpg-ssh-add.fish.

1
2
3
4
function gpg-ssh-add
    set -lx SSH_AUTH_SOCK $GNUPGHOME/S.gpg-agent.ssh
    ssh-add $argv
end
|



1
2
3
4
function gpg-ssh-add --wraps ssh-add
    set -lx SSH_AUTH_SOCK $GNUPGHOME/S.gpg-agent.ssh
    ssh-add $argv
end

Changes to fish/functions/gpg-ssh.fish.

1
2
3
4
function gpg-ssh
    set -lx SSH_AUTH_SOCK $GNUPGHOME/S.gpg-agent.ssh
    ssh $argv
end
|



1
2
3
4
function gpg-ssh --wraps ssh
    set -lx SSH_AUTH_SOCK $GNUPGHOME/S.gpg-agent.ssh
    ssh $argv
end

Added fish/functions/tmux.fish.







>
>
>
1
2
3
function tmux
    command tmux -f $XDG_CONFIG_HOME/tmux/tmux.conf $argv
end

Deleted tmux.conf.

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
set -g default-terminal screen-256color
setw -g mode-keys vi
set -g status-style bg=colour233,fg=colour25
set -g status-left "#[fg=colour52]#S #[fg=colour24]⧉ "
set -g status-right "#[fg=colour22]#(whoami)#[fg=colour28]@#h #[fg=colour40]#(date +%H:%M)"
set -w -g window-status-current-style fg=colour39,bg=colour236
set -w -g window-status-bell-style fg=colour233,bg=colour124
bind -r C-h select-pane -L
bind -r C-j select-pane -D
bind -r C-k select-pane -U
bind -r C-l select-pane -R
bind -r M-h resize-pane -L
bind -r M-j resize-pane -D
bind -r M-k resize-pane -U
bind -r M-l resize-pane -R
set -ag terminal-overrides ",*:XT@"
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
































Added tmux/tmux.conf.

































>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
set -g default-terminal screen-256color
setw -g mode-keys vi
set -g status-style bg=colour233,fg=colour25
set -g status-left "#[fg=colour52]#S #[fg=colour24]⧉ "
set -g status-right "#[fg=colour22]#(whoami)#[fg=colour28]@#h #[fg=colour40]#(date +%H:%M)"
set -w -g window-status-current-style fg=colour39,bg=colour236
set -w -g window-status-bell-style fg=colour233,bg=colour124
bind -r C-h select-pane -L
bind -r C-j select-pane -D
bind -r C-k select-pane -U
bind -r C-l select-pane -R
bind -r M-h resize-pane -L
bind -r M-j resize-pane -D
bind -r M-k resize-pane -U
bind -r M-l resize-pane -R
set -ag terminal-overrides ",*:XT@"

Changes to zshrc.

186
187
188
189
190
191
192


193
194
195
196
197
198
199
			MAKEFLAGS= =$(__find_command bmake make) $@
			;;
		*)
			=make $@
			;;
	esac
}



# pkgsrc does not like MAKEFLAGS including -j
which pkg_chk &>/dev/null && alias pkg_chk="MAKEFLAGS= pkg_chk"
which pkg_rolling-replace &>/dev/null &&
	alias pkg_rolling-replace="MAKEFLAGS= pkg_rolling-replace"
which url2pkg &>/dev/null && alias url2pkg="MAKEFLAGS= url2pkg"








>
>







186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
			MAKEFLAGS= =$(__find_command bmake make) $@
			;;
		*)
			=make $@
			;;
	esac
}

alias tmux="tmux -f $XDG_CONFIG_HOME/tmux/tmux.conf"

# pkgsrc does not like MAKEFLAGS including -j
which pkg_chk &>/dev/null && alias pkg_chk="MAKEFLAGS= pkg_chk"
which pkg_rolling-replace &>/dev/null &&
	alias pkg_rolling-replace="MAKEFLAGS= pkg_rolling-replace"
which url2pkg &>/dev/null && alias url2pkg="MAKEFLAGS= url2pkg"