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

Resolved merge conflicts

Browse source
This commit is contained in:
Marcel Kapfer 2017-10-15 19:20:33 +02:00
parent 3d48bf0601
commit 824dff91c6
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
emacs/emacs.el
View file

@ -57,7 +57,7 @@
'(org-agenda-files (quote ("~/ownCloud/todo.org"))) '(org-agenda-files (quote ("~/ownCloud/todo.org")))
'(package-selected-packages '(package-selected-packages
(quote (quote
(org company company-math counsel ivy beginend 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))) (org haskell-mode haskell-tab-indent beginend 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 ghc 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 . pdftex) (TeX-Engine . luatex)))) '(safe-local-variable-values (quote ((TeX-engine . pdftex) (TeX-Engine . luatex))))
'(send-mail-function (quote smtpmail-send-it)) '(send-mail-function (quote smtpmail-send-it))
'(standard-indent 2) '(standard-indent 2)
@ -71,8 +71,7 @@
;; 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 (:inherit nil :stipple nil :background "#21242b" :foreground "#bbc2cf" :inverse-video nil :box nil :strike-through nil :overline nil :underline nil :slant normal :weight normal :height 80 :width normal :family "Fira Code")))) '(default ((t (:inherit nil :stipple nil :background "#21242b" :foreground "#bbc2cf" :inverse-video nil :box nil :strike-through nil :overline nil :underline nil :slant normal :weight normal :height 80 :width normal :family "Fira Code")))))
'(cursor ((t (:background "light gray")))))
;; edit-server ;; edit-server

4
screen/screenrc
View file

@ -14,8 +14,6 @@ term rxvt-unicode-256color
termcapinfo xterm 'Co#256:AB=\E[48;5;%dm:AF=\E[38;5;%dm' termcapinfo xterm 'Co#256:AB=\E[48;5;%dm:AF=\E[38;5;%dm'
defbce "on" defbce "on"
altscreen on
mousetrack on mousetrack on
screen -t fish 1 fish screen -t fish 1 fish
screen -t fish 2 fish screen -t fish 2 fish
@ -33,5 +31,7 @@ bind s split
defutf8 on defutf8 on
utf8 on utf8 on
altscreen on
vbell off vbell off
shell "fish" shell "fish"