Merge remote-tracking branch 'refs/remotes/origin/master'

diff --git a/bash/.bashrc b/bash/.bashrc
index 0aa32287d5f918baf8fd8398274052befbb8b6d9..84ee2e478907d829fe2d82f340971c5c64008a3c 100644 (file)
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -8,5 +8,11 @@
 alias ls='ls --color=auto'
 PS1='[\u@\h \W]\$ '
 
+unset SSH_AGENT_PID
+if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then
+  export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"
+fi
+
 export GPG_TTY=$(tty)
 gpg-connect-agent updatestartuptty /bye >/dev/null
+

diff --git a/emacs/.emacs b/emacs/.emacs
index 6f71da326b6208e31fe865ab5536248f385da4bd..962443b60c8a4477901ea88b5c4e7cac98f5ed33 100644 (file)
--- a/emacs/.emacs
+++ b/emacs/.emacs
@@ -10,6 +10,9 @@
 ;; ESS - for working in R
 (autoload 'R-mode "ess-site.el" "Major mode for editing R source." t)
 
+;; enable autocomplete
+(add-hook 'after-init-hook 'global-company-mode)
+
 (require 'org)
 
 ;; Auctex
@@ -60,7 +63,7 @@
  ;; If there is more than one, they won't work right.
  '(org-export-backends '(ascii html icalendar latex md odt))
  '(package-selected-packages
-   '(lsp-mode elpy ## org htmlize leuven-theme lua-mode ess-smart-underscore ess-R-data-view ess)))
+   '(company magit auctex lsp-mode elpy ## org htmlize leuven-theme lua-mode ess-smart-underscore ess-R-data-view ess)))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.

diff --git a/sway/.config/sway/config b/sway/.config/sway/config
index 5c55f526adade478e4d80d2fd2ff63ea5d6873d3..90de32280a7cd1fe04e9e0e56319c7dd8db501af 100644 (file)
--- a/sway/.config/sway/config
+++ b/sway/.config/sway/config
@@ -220,4 +220,11 @@ bar {
     font pango:DejaVu Sans Mono 10
 }
 
+# Use swaylock via swayidle - lock screen after 5 minutes of inactivity
+exec swayidle -w \
+timeout 300 'swaylock -f -c 000000' \
+timeout 600 'swaymsg "output * dpms off"' \
+resume 'swaymsg "output * dpms on"' \
+before-sleep 'swaylock -f -c 000000'
+
 include /etc/sway/config.d/*

diff --git a/sway/.config/sway/config.d/special_keys b/sway/.config/sway/config.d/special_keys
new file mode 100644 (file)
index 0000000..46ea061
--- /dev/null
+++ b/sway/.config/sway/config.d/special_keys
@@ -0,0 +1,10 @@
+bindsym XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +5%
+bindsym XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ -5%
+bindsym pactl set-sink-mute `pactl list sinks short | grep RUNNING | awk '{print $1}'` toggle
+bindsym XF86AudioMicMute exec pactl set-source-mute @DEFAULT_SOURCE@ toggle
+bindsym XF86MonBrightnessDown exec brightnessctl set 5%-
+bindsym XF86MonBrightnessUp exec brightnessctl set +5%
+bindsym XF86AudioPlay exec playerctl play-pause
+bindsym XF86AudioNext exec playerctl next
+bindsym XF86AudioPrev exec playerctl previous
+

diff --git a/sway/.config/sway/scripts/gnome-keyring.sh b/sway/.config/sway/scripts/gnome-keyring.sh
new file mode 100755 (executable)
index 0000000..ac6b0a8
--- /dev/null
+++ b/sway/.config/sway/scripts/gnome-keyring.sh
@@ -0,0 +1,2 @@
+eval $(/usr/bin/gnome-keyring-daemon --start --components=gpg,pkcs11,secrets,ssh)
+export GNOME_KEYRING_CONTROL GNOME_KEYRING_PID GPG_AGENT_INFO SSH_AUTH_SOCK