clean up
This commit is contained in:
parent
2b510df717
commit
65d3e72658
1 changed files with 14 additions and 27 deletions
|
@ -41,10 +41,6 @@
|
|||
;; Calender no Su at beginning
|
||||
(setq european-calender-style t)
|
||||
|
||||
;; Run a shell with zsh
|
||||
;;(shell)
|
||||
;;(add-hook 'shell-mode-hook 'ansi-color-for-comint-mode-on)
|
||||
|
||||
;; Display of current function (which function mode)
|
||||
(which-function-mode 1)
|
||||
|
||||
|
@ -58,7 +54,7 @@
|
|||
(global-set-key [(shift delete)] 'clipboard-kill-region)
|
||||
(global-set-key [(control insert)] 'clipboard-kill-ring-save)
|
||||
(global-set-key [(shift insert)] 'primary-yank) ;; like an an X terminal
|
||||
(setq select-active-regions t)
|
||||
(setq select-active-regions t)
|
||||
(global-set-key [mouse-2] 'mouse-yank-primary)
|
||||
|
||||
;; No, please, no tabs in my programs!
|
||||
|
@ -86,17 +82,7 @@
|
|||
(cons "." "~/.emacs.d/backups/"))
|
||||
(setq tramp-backup-directory-alist backup-directory-alist)
|
||||
|
||||
;; set screen saver
|
||||
;;(require 'zone)
|
||||
;;(zone-when-idle 60)
|
||||
;;(setq zone-timer (run-with-idle-timer 60 t 'zone))
|
||||
|
||||
;; arduino mode
|
||||
''(add-to-list 'load-path "~/.emacs.d/vendor/arduino-mode")
|
||||
(setq auto-mode-alist (cons '("\\.\\(pde\\|ino\\)$" . arduino-mode) auto-mode-alist))
|
||||
(autoload 'arduino-mode "arduino-mode" "Arduino editing mode." t)
|
||||
|
||||
(add-to-list 'load-path "~/.emacs.d/lisp")
|
||||
;; stretch cursor to correct width
|
||||
(setq-default x-stretch-cursor t)
|
||||
|
||||
;; Include other configs
|
||||
|
@ -116,19 +102,20 @@
|
|||
(if (file-exists-p "~/.emacs.d/rust-mode.el")
|
||||
(load-file "~/.emacs.d/rust-mode.el"))
|
||||
|
||||
;; puppet-mode
|
||||
(if (file-exists-p "~/.emacs.d/puppet-syntax-emacs/puppet-mode-init.el")
|
||||
(load-file "~/.emacs.d/puppet-syntax-emacs/puppet-mode-init.el"))
|
||||
(if (file-exists-p "~/.emacs.d/puppet-syntax-emacs/puppet-mode.el")
|
||||
(load-file "~/.emacs.d/puppet-syntax-emacs/puppet-mode.el"))
|
||||
;; ;; puppet-mode
|
||||
;; (if (file-exists-p "~/.emacs.d/puppet-syntax-emacs/puppet-mode-init.el")
|
||||
;; (load-file "~/.emacs.d/puppet-syntax-emacs/puppet-mode-init.el"))
|
||||
;; (if (file-exists-p "~/.emacs.d/puppet-syntax-emacs/puppet-mode.el")
|
||||
;; (load-file "~/.emacs.d/puppet-syntax-emacs/puppet-mode.el"))
|
||||
|
||||
;; puppet flymake via puppet-lint
|
||||
(if (file-exists-p "~/.emacs.d/puppet-flymake/flymake-puppet.el")
|
||||
(load-file "~/.emacs.d/puppet-flymake/flymake-puppet.el"))
|
||||
(require 'flymake-puppet)
|
||||
(add-hook 'puppet-mode-hook (lambda () (flymake-puppet-load)))
|
||||
;; ;; puppet flymake via puppet-lint
|
||||
;; (if (file-exists-p "~/.emacs.d/puppet-flymake/flymake-puppet.el")
|
||||
;; (load-file "~/.emacs.d/puppet-flymake/flymake-puppet.el"))
|
||||
;; (require 'flymake-puppet)
|
||||
;; (add-hook 'puppet-mode-hook (lambda () (flymake-puppet-load)))
|
||||
|
||||
;; tramp mode ssh (faster)
|
||||
(setq tramp-default-method "ssh")
|
||||
|
||||
|
||||
;; gpg gui fix
|
||||
(setenv “GPG_AGENT_INFO” nil)
|
||||
|
|
Loading…
Reference in a new issue