From 786f67041ccc88988e68a065002f29087fd6bfb5 Mon Sep 17 00:00:00 2001 From: Josha von Gizycki Date: Fri, 28 Sep 2018 10:01:23 +0200 Subject: [PATCH] some cleanup --- init.el | 55 ++++++------------------------------------------------- 1 file changed, 6 insertions(+), 49 deletions(-) diff --git a/init.el b/init.el index 90625cd..984810a 100644 --- a/init.el +++ b/init.el @@ -3,30 +3,6 @@ '("melpa-stable" . "http://stable.melpa.org/packages/") t) (package-initialize) -(defvar my-packages - '(better-defaults projectile clojure-mode cider)) -(dolist (p my-packages) - (unless (package-installed-p p) - (package-install p))) - -(require 'rcirc) -(add-hook 'rcirc-mode-hook - (lambda () - (set (make-local-variable 'scroll-conservatively) - 8192))) -(setq rcirc-default-nick "jsha") -(setq rcirc-default-user-name "jsha") -(setq rcirc-default-full-name "jsha") -(setq rcirc-server-alist - '(("irc.quakenet.org" :channels ("#warofmadness")) - ("irc.freenode.org" :channels ("#stratum0")))) - -(global-set-key (kbd "C-x g") 'magit-status) - -(global-linum-mode) -; (windmove-default-keybindings) -; (git-auto-commit-mode) - (defun indent-buffer () (interactive) (save-excursion @@ -45,8 +21,11 @@ (add-hook 'lisp-mode-hook #'enable-paredit-mode) (add-hook 'emacs-lisp-mode-hook #'enable-paredit-mode) (add-hook 'eval-expression-minibuffer #'enable-paredit-mode) -(add-hook 'clojure-mode-hook #'enable-paredit-mode #'hs-minor-mode) +(add-hook 'clojure-mode-hook #'enable-paredit-mode) +(add-hook 'clojure-mode-hook #'hs-minor-mode) +(add-hook 'clojure-mode-hook #'company-mode) (add-hook 'less-css-mode-hook #'hs-minor-mode) +(add-hook 'before-save-hook 'delete-trailing-whitespace) (custom-set-variables ;; custom-set-variables was added by Custom. @@ -58,7 +37,7 @@ '(custom-enabled-themes (quote (misterioso))) '(package-selected-packages (quote - (less-css-mode sass-mode paredit markdown-mode hy-mode yaml-mode editorconfig php-mode magit auto-complete parinfer git-commit rainbow-delimiters cyberpunk-theme flatui-dark-theme paper-theme cider clojure-mode projectile better-defaults)))) + (ac-cider company js3-mode less-css-mode sass-mode paredit markdown-mode yaml-mode editorconfig auto-complete parinfer git-commit cider clojure-mode projectile better-defaults)))) (custom-set-faces ;; custom-set-faces was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful. @@ -67,26 +46,4 @@ '(default ((t (:inherit nil :stipple nil :background "#2d3743" :foreground "#e1e1e0" :inverse-video nil :box nil :strike-through nil :overline nil :underline nil :slant normal :weight normal :height 128 :width normal :foundry "DAMA" :family "Ubuntu Mono"))))) (global-auto-complete-mode) - -;; CUA OS copypasta even in ncurses mode -;case system-type -; ('darwin (unless window-system -; (setq interprogram-cut-function -; (lambda (text &optional push) -; (let* ((process-connection-type nil) -; (pbproxy (start-process "pbcopy" "pbcopy" "/usr/bin/pbcopy"))) -; (process-send-string pbproxy text) -; (process-send-eof pbproxy)))))) -; ('gnu/linux (progn -; (setq x-select-enable-clipboard t) -; (defun xsel-cut-function (text &optional push) -; (with-temp-buffer -; (insert text) -; (call-process-region (point-min) (point-max) "xsel" nil 0 nil "--clipboard" "--input"))) -; (defun xsel-paste-function() -; -; (let ((xsel-output (shell-command-to-string "xsel --clipboard --output"))) -; (unless (string= (car kill-ring) xsel-output) -; xsel-output ))) -; (setq interprogram-cut-function 'xsel-cut-function) -; (setq interprogram-paste-function 'xsel-paste-function)))) +(global-linum-mode)