summaryrefslogtreecommitdiff
path: root/archsetup
diff options
context:
space:
mode:
Diffstat (limited to 'archsetup')
-rwxr-xr-xarchsetup17
1 files changed, 2 insertions, 15 deletions
diff --git a/archsetup b/archsetup
index 08b4b8d..9a9a04e 100755
--- a/archsetup
+++ b/archsetup
@@ -1517,7 +1517,6 @@ desktop_environment() {
pacman_install gnupg
pacman_install polkit
pacman_install gnome-keyring
- pacman_install python-secretstorage # for init-keyring script (empty password keyring)
pacman_install seahorse
pacman_install pass
@@ -1528,25 +1527,13 @@ desktop_environment() {
find /home/"$username"/.gnupg -type f -exec chmod 600 {} \;
find /home/"$username"/.gnupg -type d -exec chmod 700 {} \;
- # pre-create gnome-keyring structure so it uses 'login' keyring
- # (auto-unlocks at login) instead of creating 'Default_keyring' (prompts for password)
+ # pre-create gnome-keyring directory; empty-password login.keyring comes from dotfiles
+ # this allows auto-unlock without password prompt (works with autologin)
keyring_dir="/home/$username/.local/share/keyrings"
mkdir -p "$keyring_dir"
- echo "login" > "$keyring_dir/default"
chown -R "$username": "/home/$username/.local/share/keyrings"
chmod 700 "$keyring_dir"
- # configure PAM to auto-unlock gnome-keyring on console login
- # this passes the login password to gnome-keyring-daemon at session start
- action="configuring PAM for gnome-keyring auto-unlock" && display "task" "$action"
- pam_login="/etc/pam.d/login"
- if ! grep -q "pam_gnome_keyring.so" "$pam_login"; then
- # add auth line after the last auth line
- sed -i '/^auth.*system-local-login/a auth optional pam_gnome_keyring.so' "$pam_login"
- # add session line after the last session line
- sed -i '/^session.*system-local-login/a session optional pam_gnome_keyring.so auto_start' "$pam_login"
- fi
-
# Power Management
action="Power Management" && display "subtitle" "$action"