rlbr
/
emacs_config
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

Removed empty lines from settings.org

ivy
Raphael Roberts 7 years ago
parent
e14093b049
commit
e115d0b283
1 changed files with 0 additions and 32 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 32
      settings.org

32
settings.org
View File

@ -20,7 +20,6 @@
(require 'elpy) (require 'elpy)
(global-set-key (kbd "M-<up>") 'elpy-nav-move-line-or-region-up) (global-set-key (kbd "M-<up>") 'elpy-nav-move-line-or-region-up)
(global-set-key (kbd "M-<down>") 'elpy-nav-move-line-or-region-down) (global-set-key (kbd "M-<down>") 'elpy-nav-move-line-or-region-down)
(global-set-key (kbd "C-c <left>") 'windmove-left) (global-set-key (kbd "C-c <left>") 'windmove-left)
(global-set-key (kbd "C-c <right>") 'windmove-right) (global-set-key (kbd "C-c <right>") 'windmove-right)
(global-set-key (kbd "C-c <up>") 'windmove-up) (global-set-key (kbd "C-c <up>") 'windmove-up)
@ -52,16 +51,13 @@
(yank)) (yank))
(global-set-key (kbd "C-c d") 'duplicate-line) (global-set-key (kbd "C-c d") 'duplicate-line)
#+end_src #+end_src
*** magit *** magit
#+begin_src emacs-lisp #+begin_src emacs-lisp
(global-set-key (kbd "C-x g") 'magit-status) (global-set-key (kbd "C-x g") 'magit-status)
#+end_src #+end_src
#+begin_src emacs-lisp #+begin_src emacs-lisp
(add-hook 'git-commit-setup-hook 'git-commit-turn-on-flyspell) (add-hook 'git-commit-setup-hook 'git-commit-turn-on-flyspell)
#+end_src #+end_src
** options ** options
*** global *** global
**** recent files **** recent files
@ -70,7 +66,6 @@
(recentf-mode 1) (recentf-mode 1)
(global-set-key (kbd "C-<tab>") 'recentf-open-files) (global-set-key (kbd "C-<tab>") 'recentf-open-files)
#+end_src #+end_src
**** backup **** backup
#+begin_src emacs-lisp #+begin_src emacs-lisp
(let ((backup-dir (concat user-emacs-directory "backup")) (let ((backup-dir (concat user-emacs-directory "backup"))
@ -86,17 +81,13 @@
(setq auto-save-file-name-transforms (setq auto-save-file-name-transforms
`((".*" , (concat auto-save-dir "/") t)))) `((".*" , (concat auto-save-dir "/") t))))
#+end_src #+end_src
**** kill buffer option **** kill buffer option
#+begin_src emacs-lisp #+begin_src emacs-lisp
(global-set-key (kbd "C-x k") 'kill-this-buffer) (global-set-key (kbd "C-x k") 'kill-this-buffer)
#+end_src #+end_src
**** inhibit start screen **** inhibit start screen
#+begin_src emacs-lisp #+begin_src emacs-lisp
(setq inhibit-startup-screen t) (setq inhibit-startup-screen t)
#+end_src #+end_src
**** save options **** save options
#+begin_src emacs-lisp #+begin_src emacs-lisp
@ -104,8 +95,6 @@
#+end_src #+end_src
**** theming **** theming
#+begin_src emacs-lisp #+begin_src emacs-lisp
(load-theme 'dracula t) (load-theme 'dracula t)
#+end_src #+end_src
**** line numbers globally **** line numbers globally
@ -117,7 +106,6 @@
(setq ls-lisp-use-insert-directory-program t) (setq ls-lisp-use-insert-directory-program t)
#+end_src #+end_src
#+begin_src emacs-lisp #+begin_src emacs-lisp
(setq dired-listing-switches "-alh") (setq dired-listing-switches "-alh")
#+end_src #+end_src
* Tramp configuration * Tramp configuration
@ -129,30 +117,21 @@
* Web things * Web things
** javascript stuff ** javascript stuff
#+begin_src emacs-lisp #+begin_src emacs-lisp
(require 'js2-mode) (require 'js2-mode)
(add-to-list 'auto-mode-alist '("\\.js\\'" . js2-mode)) (add-to-list 'auto-mode-alist '("\\.js\\'" . js2-mode))
(add-hook 'js2-mode-hook #'js2-imenu-extras-mode) (add-hook 'js2-mode-hook #'js2-imenu-extras-mode)
(require 'js2-refactor) (require 'js2-refactor)
(require 'xref-js2) (require 'xref-js2)
(add-hook 'js2-mode-hook #'js2-refactor-mode) (add-hook 'js2-mode-hook #'js2-refactor-mode)
(js2r-add-keybindings-with-prefix "C-c C-r") (js2r-add-keybindings-with-prefix "C-c C-r")
(define-key js2-mode-map (kbd "C-k") #'js2r-kill) (define-key js2-mode-map (kbd "C-k") #'js2r-kill)
(define-key js-mode-map (kbd "M-.") nil) (define-key js-mode-map (kbd "M-.") nil)
(add-hook 'js2-mode-hook (lambda () (add-hook 'js2-mode-hook (lambda ()
(add-hook 'xref-backend-functions #'xref-js2-xref-backend nil t))) (add-hook 'xref-backend-functions #'xref-js2-xref-backend nil t)))
(define-key js2-mode-map (kbd "C-k") #'js2r-kill) (define-key js2-mode-map (kbd "C-k") #'js2r-kill)
#+end_src #+end_src
** web mode ** web mode
#+begin_src emacs-lisp #+begin_src emacs-lisp
(require 'web-mode) (require 'web-mode)
(add-to-list 'auto-mode-alist '("\\.phtml\\'" . web-mode)) (add-to-list 'auto-mode-alist '("\\.phtml\\'" . web-mode))
(add-to-list 'auto-mode-alist '("\\.tpl\\.php\\'" . web-mode)) (add-to-list 'auto-mode-alist '("\\.tpl\\.php\\'" . web-mode))
@ -189,7 +168,6 @@
(add-hook 'python-django-project-root-hook 'python-shell-interpreter-refresh) (add-hook 'python-django-project-root-hook 'python-shell-interpreter-refresh)
)) ))
#+end_src #+end_src
** Linux ** Linux
#+begin_src emacs-lisp #+begin_src emacs-lisp
((string-equal system-type "gnu/linux") ((string-equal system-type "gnu/linux")
@ -209,17 +187,10 @@
#+end_src #+end_src
* Python * Python
#+begin_src emacs-lisp #+begin_src emacs-lisp
(elpy-enable) (elpy-enable)
(when (require 'flycheck nil t) (when (require 'flycheck nil t)
(setq elpy-modules (delq 'elpy-module-flymake elpy-modules)) (setq elpy-modules (delq 'elpy-module-flymake elpy-modules))
(add-hook 'elpy-mode-hook 'flycheck-mode)) (add-hook 'elpy-mode-hook 'flycheck-mode))
(require 'blacken) (require 'blacken)
(defun python-mode-keys () (defun python-mode-keys ()
"Modify python-mode local key map" "Modify python-mode local key map"
@ -227,7 +198,4 @@
(add-hook 'python-mode-hook 'python-mode-keys) (add-hook 'python-mode-hook 'python-mode-keys)
(add-hook 'elpy-mode-hook 'blacken-mode) (add-hook 'elpy-mode-hook 'blacken-mode)
(setq elpy-syntax-check-command python-check-command) (setq elpy-syntax-check-command python-check-command)
#+end_src #+end_src
Write Preview
Loading…
Cancel
Save