diff options
-rw-r--r-- | config.yaml | 54 | ||||
-rw-r--r-- | dotfiles/gnupg/config_files/gnupg/gpg-agent.conf | 3 | ||||
-rw-r--r-- | dotfiles/gnupg/config_files/gnupg/gpg.conf | 7 | ||||
-rw-r--r-- | dotfiles/gnupg/systemd/dirmngr_override.conf | 3 | ||||
-rw-r--r-- | dotfiles/gnupg/systemd/gpg_agent_browser_override.conf | 3 | ||||
-rw-r--r-- | dotfiles/gnupg/systemd/gpg_agent_extra_override.conf | 3 | ||||
-rw-r--r-- | dotfiles/gnupg/systemd/gpg_agent_override.conf | 3 | ||||
-rw-r--r-- | dotfiles/gnupg/systemd/gpg_agent_ssh_override.conf | 3 | ||||
-rw-r--r-- | dotfiles/shell_bash/bashrc | 1 |
9 files changed, 80 insertions, 0 deletions
diff --git a/config.yaml b/config.yaml index 066b9dd..f33b6eb 100644 --- a/config.yaml +++ b/config.yaml | |||
@@ -49,6 +49,49 @@ dotfiles: | |||
49 | - make_git_dirs | 49 | - make_git_dirs |
50 | dst: ~/.config | 50 | dst: ~/.config |
51 | src: git/config_files | 51 | src: git/config_files |
52 | gnupg_config_files: | ||
53 | dst: ~/.config | ||
54 | src: gnupg/config_files | ||
55 | gnupg_systemd_browser_override: | ||
56 | actions: | ||
57 | - systemd_daemon_reload | ||
58 | - systemd_restart gpg-agent-browser.socket | ||
59 | dst: ~/.config/systemd/user/gpg-agent-browser.socket.d/override.conf | ||
60 | src: gnupg/systemd/gpg_agent_browser_override.conf | ||
61 | trans: | ||
62 | - gpg_socket_dir | ||
63 | gnupg_systemd_dirmngr_override: | ||
64 | actions: | ||
65 | - systemd_daemon_reload | ||
66 | - systemd_restart dirmngr.socket | ||
67 | dst: ~/.config/systemd/user/dirmngr.socket.d/override.conf | ||
68 | src: gnupg/systemd/dirmngr_override.conf | ||
69 | trans: | ||
70 | - gpg_socket_dir | ||
71 | gnupg_systemd_extra_override: | ||
72 | actions: | ||
73 | - systemd_daemon_reload | ||
74 | - systemd_restart gpg-agent-extra.socket | ||
75 | dst: ~/.config/systemd/user/gpg-agent-extra.socket.d/override.conf | ||
76 | src: gnupg/systemd/gpg_agent_extra_override.conf | ||
77 | trans: | ||
78 | - gpg_socket_dir | ||
79 | gnupg_systemd_override: | ||
80 | actions: | ||
81 | - systemd_daemon_reload | ||
82 | - systemd_restart gpg-agent.socket | ||
83 | dst: ~/.config/systemd/user/gpg-agent.socket.d/override.conf | ||
84 | src: gnupg/systemd/gpg_agent_override.conf | ||
85 | trans: | ||
86 | - gpg_socket_dir | ||
87 | gnupg_systemd_ssh_override: | ||
88 | actions: | ||
89 | - systemd_daemon_reload | ||
90 | - systemd_restart gpg-agent-ssh.socket | ||
91 | dst: ~/.config/systemd/user/gpg-agent-ssh.socket.d/override.conf | ||
92 | src: gnupg/systemd/gpg_agent_ssh_override.conf | ||
93 | trans: | ||
94 | - gpg_socket_dir | ||
52 | graphical_config_files: | 95 | graphical_config_files: |
53 | actions: | 96 | actions: |
54 | - make_xorg_link | 97 | - make_xorg_link |
@@ -131,6 +174,14 @@ profiles: | |||
131 | _git: | 174 | _git: |
132 | dotfiles: | 175 | dotfiles: |
133 | - git_config_files | 176 | - git_config_files |
177 | _gnupg: | ||
178 | dotfiles: | ||
179 | - gnupg_config_files | ||
180 | - gnupg_systemd_browser_override | ||
181 | - gnupg_systemd_extra_override | ||
182 | - gnupg_systemd_ssh_override | ||
183 | - gnupg_systemd_override | ||
184 | - gnupg_systemd_dirmngr_override | ||
134 | _graphical: | 185 | _graphical: |
135 | dotfiles: | 186 | dotfiles: |
136 | - graphical_config_files | 187 | - graphical_config_files |
@@ -164,6 +215,7 @@ profiles: | |||
164 | - pam_environment | 215 | - pam_environment |
165 | include: | 216 | include: |
166 | - _git | 217 | - _git |
218 | - _gnupg | ||
167 | - _fretlink | 219 | - _fretlink |
168 | - _lxde | 220 | - _lxde |
169 | - _shell_bash | 221 | - _shell_bash |
@@ -173,6 +225,8 @@ profiles: | |||
173 | - pam_environment | 225 | - pam_environment |
174 | trans: | 226 | trans: |
175 | gpg: gpg2 -q --for-your-eyes-only --no-tty -d {0} > {1} | 227 | gpg: gpg2 -q --for-your-eyes-only --no-tty -d {0} > {1} |
228 | gpg_socket_dir: sed -e "s/<<<>>>/$(gpgconf --list-dirs socketdir | cut -d'/' -f6)/" | ||
229 | {0} > {1} | ||
176 | variables: | 230 | variables: |
177 | features: | 231 | features: |
178 | flony: | 232 | flony: |
diff --git a/dotfiles/gnupg/config_files/gnupg/gpg-agent.conf b/dotfiles/gnupg/config_files/gnupg/gpg-agent.conf new file mode 100644 index 0000000..da0291a --- /dev/null +++ b/dotfiles/gnupg/config_files/gnupg/gpg-agent.conf | |||
@@ -0,0 +1,3 @@ | |||
1 | pinentry-program /usr/bin/pinentry-curses | ||
2 | allow-loopback-pinentry | ||
3 | enable-ssh-support | ||
diff --git a/dotfiles/gnupg/config_files/gnupg/gpg.conf b/dotfiles/gnupg/config_files/gnupg/gpg.conf new file mode 100644 index 0000000..17bc522 --- /dev/null +++ b/dotfiles/gnupg/config_files/gnupg/gpg.conf | |||
@@ -0,0 +1,7 @@ | |||
1 | # Main signing key | ||
2 | default-key DB1CFE90 | ||
3 | |||
4 | default-recipient-self | ||
5 | encrypt-to 0326A611 | ||
6 | auto-key-retrieve | ||
7 | no-greeting | ||
diff --git a/dotfiles/gnupg/systemd/dirmngr_override.conf b/dotfiles/gnupg/systemd/dirmngr_override.conf new file mode 100644 index 0000000..8b149b7 --- /dev/null +++ b/dotfiles/gnupg/systemd/dirmngr_override.conf | |||
@@ -0,0 +1,3 @@ | |||
1 | [Socket] | ||
2 | ListenStream= | ||
3 | ListenStream=%t/gnupg/<<<>>>/S.dirmngr | ||
diff --git a/dotfiles/gnupg/systemd/gpg_agent_browser_override.conf b/dotfiles/gnupg/systemd/gpg_agent_browser_override.conf new file mode 100644 index 0000000..af354a8 --- /dev/null +++ b/dotfiles/gnupg/systemd/gpg_agent_browser_override.conf | |||
@@ -0,0 +1,3 @@ | |||
1 | [Socket] | ||
2 | ListenStream= | ||
3 | ListenStream=%t/gnupg/<<<>>>/S.gpg-agent.browser | ||
diff --git a/dotfiles/gnupg/systemd/gpg_agent_extra_override.conf b/dotfiles/gnupg/systemd/gpg_agent_extra_override.conf new file mode 100644 index 0000000..ee36d77 --- /dev/null +++ b/dotfiles/gnupg/systemd/gpg_agent_extra_override.conf | |||
@@ -0,0 +1,3 @@ | |||
1 | [Socket] | ||
2 | ListenStream= | ||
3 | ListenStream=%t/gnupg/<<<>>>/S.gpg-agent.extra | ||
diff --git a/dotfiles/gnupg/systemd/gpg_agent_override.conf b/dotfiles/gnupg/systemd/gpg_agent_override.conf new file mode 100644 index 0000000..ee23ad2 --- /dev/null +++ b/dotfiles/gnupg/systemd/gpg_agent_override.conf | |||
@@ -0,0 +1,3 @@ | |||
1 | [Socket] | ||
2 | ListenStream= | ||
3 | ListenStream=%t/gnupg/<<<>>>/S.gpg-agent | ||
diff --git a/dotfiles/gnupg/systemd/gpg_agent_ssh_override.conf b/dotfiles/gnupg/systemd/gpg_agent_ssh_override.conf new file mode 100644 index 0000000..8cadc91 --- /dev/null +++ b/dotfiles/gnupg/systemd/gpg_agent_ssh_override.conf | |||
@@ -0,0 +1,3 @@ | |||
1 | [Socket] | ||
2 | ListenStream= | ||
3 | ListenStream=%t/gnupg/<<<>>>/S.gpg-agent.ssh | ||
diff --git a/dotfiles/shell_bash/bashrc b/dotfiles/shell_bash/bashrc index 8f43283..9b74341 100644 --- a/dotfiles/shell_bash/bashrc +++ b/dotfiles/shell_bash/bashrc | |||
@@ -9,6 +9,7 @@ fi | |||
9 | # If not running interactively, don't do anything | 9 | # If not running interactively, don't do anything |
10 | [[ $- != *i* ]] && return | 10 | [[ $- != *i* ]] && return |
11 | 11 | ||
12 | export GPG_TTY=$(tty) | ||
12 | export HISTFILE="$XDG_STATE_HOME/bash/history" | 13 | export HISTFILE="$XDG_STATE_HOME/bash/history" |
13 | 14 | ||
14 | alias vi=vim | 15 | alias vi=vim |