Merge branch 'master' of gitlab.com:mmk2410/dotfiles

This commit is contained in:
Marcel Kapfer 2017-07-21 10:23:13 +02:00
commit b7ab531f30
4 changed files with 26 additions and 10 deletions

View File

@ -47,7 +47,7 @@
'(custom-enabled-themes (quote (atom-one-dark)))
'(custom-safe-themes
(quote
("a94f1a015878c5f00afab321e4fef124b2fc3b823c8ddd89d360d710fc2bddfc" "e9460a84d876da407d9e6accf9ceba453e2f86f8b86076f37c08ad155de8223c" "d29231b2550e0d30b7d0d7fc54a7fb2aa7f47d1b110ee625c1a56b30fea3be0f" "c7a9a68bd07e38620a5508fef62ec079d274475c8f92d75ed0c33c45fbe306bc" "eb0a314ac9f75a2bf6ed53563b5d28b563eeba938f8433f6d1db781a47da1366" "a1289424bbc0e9f9877aa2c9a03c7dfd2835ea51d8781a0bf9e2415101f70a7e" "10e231624707d46f7b2059cc9280c332f7c7a530ebc17dba7e506df34c5332c4" "08b8807d23c290c840bbb14614a83878529359eaba1805618b3be7d61b0b0a32" "43bc55af3857f9e2dc14c4413739f36d758e4d75bcd9b67e9b7dc6d9fcc1db68" "6254372d3ffe543979f21c4a4179cd819b808e5dd0f1787e2a2a647f5759c1d1" "1160f5fc215738551fce39a67b2bcf312ed07ef3568d15d53c87baa4fd1f4d4e" default)))
("e9460a84d876da407d9e6accf9ceba453e2f86f8b86076f37c08ad155de8223c" "d29231b2550e0d30b7d0d7fc54a7fb2aa7f47d1b110ee625c1a56b30fea3be0f" "c7a9a68bd07e38620a5508fef62ec079d274475c8f92d75ed0c33c45fbe306bc" "eb0a314ac9f75a2bf6ed53563b5d28b563eeba938f8433f6d1db781a47da1366" "a1289424bbc0e9f9877aa2c9a03c7dfd2835ea51d8781a0bf9e2415101f70a7e" "10e231624707d46f7b2059cc9280c332f7c7a530ebc17dba7e506df34c5332c4" "08b8807d23c290c840bbb14614a83878529359eaba1805618b3be7d61b0b0a32" "43bc55af3857f9e2dc14c4413739f36d758e4d75bcd9b67e9b7dc6d9fcc1db68" "6254372d3ffe543979f21c4a4179cd819b808e5dd0f1787e2a2a647f5759c1d1" "1160f5fc215738551fce39a67b2bcf312ed07ef3568d15d53c87baa4fd1f4d4e" default)))
'(ecb-options-version "2.50")
'(fci-rule-color "#3E4451")
'(inhibit-startup-screen t)
@ -56,7 +56,7 @@
'(org-agenda-files (quote ("~/ownCloud/todo.org")))
'(package-selected-packages
(quote
(airline-themes nlinum powerline projectile rainbow-delimiters neotree doom-themes prolog web-mode fixme-mode ob-dart ac-python ac-slime ant auctex-lua auto-compile csv-mode csv ac-haskell-process ghc haskell-mode arduino-mode json-mode gruvbox-theme focus literate-coffee-mode jdee pkgbuild-mode vala-snippets vala-mode phpunit ac-php php-completion php+-mode fish-mode hugo mips-mode stumpwm-mode slime muttrc-mode diff-hl magit wanderlust ## auctex yaml-mode typescript sass-mode php-mode monokai-theme markdown-mode fill-column-indicator edit-server dracula-theme coffee-mode auto-complete atom-one-dark-theme atom-dark-theme)))
(doom-themes neotree rainbow-delimiters projectile nlinum powerline airline-themes fic-mode markdown-preview-mode web-mode ob-dart ac-python ac-slime ant auctex-lua auto-compile auto-complete-auctex csv-mode csv ac-haskell-process ghc haskell-mode arduino-mode json-mode gruvbox-theme focus literate-coffee-mode jdee javadoc-lookup pkgbuild-mode vala-snippets vala-mode phpunit ac-php php-completion php+-mode fish-mode hugo mips-mode stumpwm-mode slime muttrc-mode diff-hl magit wanderlust ## auctex yaml-mode typescript sass-mode php-mode outlined-elisp-mode monokai-theme markdown-mode fill-column-indicator edit-server dracula-theme coffee-mode auto-complete atom-one-dark-theme atom-dark-theme)))
'(safe-local-variable-values (quote ((TeX-Engine . luatex))))
'(send-mail-function (quote smtpmail-send-it))
'(standard-indent 2)
@ -70,7 +70,8 @@
;; If you edit it by hand, you could mess it up, so be careful.
;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right.
'(default ((t (:family "Hermit" :foundry "unknown" :slant normal :weight normal :height 90 :width normal)))))
'(default ((t (:family "Hermit" :foundry "unknown" :slant normal :weight normal :height 90 :width normal))))
'(cursor ((t (:background "light gray")))))
;; edit-server

View File

@ -1,7 +1,7 @@
set -x PATH $PATH /usr/local/bin /usr/bin /bin /usr/local/games /usr/games ~/.pub-cache/bin ~/.gem/ruby/2.4.0/bin
set -x ARCHFLAGS -arch_x86_64
set -Ux GPG_TTY (tty)
set -x GPG_TTY (tty)
eval (thefuck --alias | tr '\n' ';')
alias l="ls"

View File

@ -4,6 +4,9 @@
(in-package :stumpwm)
(setf *debug-level* 10)
(redirect-all-output "/tmp/stumpwm-debug.log")
(defparameter *key-layout* "us -variant altgr-intl" "Stores the current key layout")
;; creating groups
@ -36,9 +39,9 @@
(gravity :center)
;; root keybindings
;;; browser
(define-key *root-map* (kbd "C-c") "exec /opt/firefox/firefox")
;
;; browser
(define-key *root-map* (kbd "C-c") "exec /opt/google/chrome-unstable/google-chrome-unstable --password-store=gnome")
;;; terminal
(define-key *root-map* (kbd "c") "exec urxvt")
@ -57,8 +60,11 @@
(define-key *root-map* (kbd "C-8") "change-workspace 8")
(define-key *root-map* (kbd "C-9") "change-workspace 9")
;;; mode-line key
(define-key *root-map* (kbd "Menu") "mode-line")
;; xserver
(run-shell-command "xmodmap ~/.Xmodmap")
(run-shell-command "xrdb -merge ~/.Xresources")
;;; HiDPI stuff.
;;; TODO: Only run if required
@ -162,3 +168,8 @@
(unless (eq frame old-frame)
(show-frame-indicator group))))
(load-module "stumptray")
(switch-layout-to *key-layout*)
(run-shell-command "xmodmap $HOME/.Xmodmap" t)

View File

@ -22,9 +22,15 @@ if [ -f "$userresources" ]; then
fi
if [ -f "$usermodmap" ]; then
echo "Found a user modmap at $usermodpad"
xmodmap "$usermodmap"
fi
# start gnome keyring daemon
dbus-update-activation-environment --systemd DISPLAY
eval $(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh)
export SSH_AUTH_SOCK
# start some nice programs
if [ -d /etc/X11/xinit/xinitrc.d ] ; then
@ -65,5 +71,3 @@ case $session in
# No known session, try to run it as command
*) exec "$1";;
esac
export PATH="${PATH}:/usr/local/texlive/2015/bin/x86_64-linux"