Merged with upstream and added dotdotfiles submodule

This commit is contained in:
Marcel Kapfer (mmk2410) 2017-02-05 19:32:37 +01:00
parent 7de59678cb
commit 6bf22519ec
5 changed files with 15 additions and 3 deletions

3
.gitmodules vendored Normal file
View file

@ -0,0 +1,3 @@
[submodule "dotdotfiles"]
path = dotdotfiles
url = git@mmk2410.org:dotdotfiles.git

View file

@ -61,6 +61,9 @@
;; xserver
(run-shell-command "xmodmap ~/.Xmodmap")
(run-shell-command "xrdb -merge ~/.Xresources")
;;; HiDPI stuff.
;;; TODO: Only run if required
(run-shell-command "xrdb -merge ~/.Xresources-hidpi")
;; dunst notify server
(run-shell-command "dunst")

4
dotdotfiles/README.md Normal file
View file

@ -0,0 +1,4 @@
# .dotfiles
A repository for certain dotfiles, that should be kept hidden from public, but
still be shared across my own computers.

View file

@ -65,11 +65,13 @@
'(custom-enabled-themes (quote (atom-one-dark)))
'(custom-safe-themes
(quote
("08b8807d23c290c840bbb14614a83878529359eaba1805618b3be7d61b0b0a32" "43bc55af3857f9e2dc14c4413739f36d758e4d75bcd9b67e9b7dc6d9fcc1db68" "6254372d3ffe543979f21c4a4179cd819b808e5dd0f1787e2a2a647f5759c1d1" "1160f5fc215738551fce39a67b2bcf312ed07ef3568d15d53c87baa4fd1f4d4e" default)))
("08b8807d23c290c840bbb14614a83878529359eaba1805618b3be7d61b0b0a32" "6254372d3ffe543979f21c4a4179cd819b808e5dd0f1787e2a2a647f5759c1d1" "1160f5fc215738551fce39a67b2bcf312ed07ef3568d15d53c87baa4fd1f4d4e" default)))
'(inhibit-startup-screen t)
'(jdee-global-classpath (quote ("/home/wilson/jdee-libs/")))
'(jdee-server-dir "/opt/jdee-emacs-server/")
'(package-selected-packages
(quote
(bash-completion awk-it auto-complete-auctex moinmoin-mode tracwiki-mode mediawiki phabricator remark-mode csv-mode gruvbox-theme ac-math 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 dart-mode coffee-mode auto-complete atom-one-dark-theme atom-dark-theme)))
(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 dart-mode coffee-mode auto-complete atom-one-dark-theme atom-dark-theme)))
'(send-mail-function (quote smtpmail-send-it)))
(custom-set-faces
;; custom-set-faces was added by Custom.

View file

@ -1,4 +1,4 @@
set -x PATH $PATH /usr/local/bin /usr/bin /bin /usr/local/games /usr/games ~/.pub/bin
set -x PATH $PATH /usr/local/bin /usr/bin /bin /usr/local/games /usr/games ~/.pub/bin ~/.gem/ruby/2.4.0/bin
set -x ARCHFLAGS -arch_x86_64