Merge remote-tracking branch 'origin/master'

This commit is contained in:
Valentin Boettcher 2018-11-13 22:32:39 +01:00
commit c0f6f0af06
2 changed files with 2 additions and 1 deletions

View file

@ -384,7 +384,6 @@
(global-set-key (kbd "M-g f") 'avy-goto-line)
(global-set-key (kbd "C-'") 'avy-goto-char-2)
;;; IRC
(setq circe-network-options
'(("Freenode"
@ -394,3 +393,4 @@
:sasl-password "valentin981"
:channels ("#emacs-circe")
)))

View file

@ -267,3 +267,4 @@ exec --no-startup-id ~/.scripts ec -e ''
exec --no-startup-id setxkbmap -layout us -option ctrl:nocaps
exec --no-startup-id setxkbmap -option ctrl:nocaps
exec --no-startup-id kdeconnect-indicator
exec --no-startup-id xset dpms 600