mmk2410/dotfiles
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

merge

Browse source
This commit is contained in:
Marcel Kapfer 2017-07-21 10:13:45 +02:00
parent 33d8124b2f
commit 541556461a
4 changed files with 28 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
emacs/emacs.el
View file

@ -74,7 +74,7 @@
'(org-agenda-files (quote ("~/ownCloud/todo.org"))) '(org-agenda-files (quote ("~/ownCloud/todo.org")))
'(package-selected-packages '(package-selected-packages
(quote (quote
(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))) (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)))) '(safe-local-variable-values (quote ((TeX-Engine . luatex))))
'(send-mail-function (quote smtpmail-send-it)) '(send-mail-function (quote smtpmail-send-it))
'(standard-indent 2) '(standard-indent 2)
@ -88,7 +88,8 @@
;; If you edit it by hand, you could mess it up, so be careful. ;; If you edit it by hand, you could mess it up, so be careful.
;; Your init file should contain only one such instance. ;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right. ;; 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 ;; edit-server
@ -217,3 +218,6 @@
;;; syntax highlighting ;;; syntax highlighting
(setq org-src-fontify-natively t) (setq org-src-fontify-natively t)
;; WIP: set cursor coloer
(set-cursor-color "#ebdbb2")

2
shells/fish/config.fish
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 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 -x ARCHFLAGS -arch_x86_64
set -Ux GPG_TTY (tty) set -x GPG_TTY (tty)
eval (thefuck --alias | tr '\n' ';') eval (thefuck --alias | tr '\n' ';')
alias l="ls" alias l="ls"

19
stumpwm/stumpwmrc
View file

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

8
x/xinitrc
View file

@ -22,9 +22,15 @@ if [ -f "$userresources" ]; then
fi fi
if [ -f "$usermodmap" ]; then if [ -f "$usermodmap" ]; then
echo "Found a user modmap at $usermodpad"
xmodmap "$usermodmap" xmodmap "$usermodmap"
fi 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 # start some nice programs
if [ -d /etc/X11/xinit/xinitrc.d ] ; then if [ -d /etc/X11/xinit/xinitrc.d ] ; then
@ -65,5 +71,3 @@ case $session in
# No known session, try to run it as command # No known session, try to run it as command
*) exec "$1";; *) exec "$1";;
esac esac
export PATH="${PATH}:/usr/local/texlive/2015/bin/x86_64-linux"