Permalink
Browse files

Fix shit

  • Loading branch information...
1 parent 4060ad0 commit db65fb0118cff9377f66b9a5b2057e6164994c45 @sooheon committed Feb 17, 2017
View
@@ -29,10 +29,10 @@
(set-fontset-font "fontset-default" 'hangul '("NanumGothic" . "unicode-bmp"))
;;** decorations
(when window-system (set-frame-size (selected-frame) 91 50))
-(csetq tool-bar-mode nil)
-(csetq menu-bar-mode nil)
-(csetq scroll-bar-mode nil)
-(csetq line-spacing 0.1)
+(setq tool-bar-mode nil)
+(setq menu-bar-mode nil)
+(setq scroll-bar-mode nil)
+(setq line-spacing 0.1)
(setq inhibit-startup-screen t
initial-scratch-message ";; You have power over your mind - not outside events. Realize this, and you \n;; will find strength.\n\n"
create-lockfiles nil
@@ -578,12 +578,13 @@ Keep M-n and M-p reserved for history."
;;** Git and version control
(use-package magit
- :config
+ :general
(nvmap :prefix "SPC"
"g" 'magit-status)
(:keymaps 'magit-mode-map
"SPC" 'scroll-up
"DEL" 'scroll-down)
+ :config
(evil-set-initial-state 'magit-submodule-list-mode 'insert)
(setq magit-display-buffer-function 'magit-display-buffer-fullframe-status-v1
magit-popup-show-common-commands nil)
View
@@ -65,7 +65,7 @@
'(org-preview-latex-default-process (quote dvisvgm))
'(package-selected-packages
(quote
- (farmhouse-theme yaml-mode doom-themes ace-window rainbow-mode org-download htmlize rust-mode haskell-mode org-pomodoro ess-smart-equals ess ess-site pamparam lpy tex cdlatex texmathp magithub suggest wgrep general hungry-delete hungry-delete-mode toml-mode soap atom-one-dark-theme ggtags cpputils-cmake irony clang-format company-statistics osx-trash ox help evil-cleverparens-text-objects dired racer cargo golden-ratio jade yasnippet evil-evilified-state artbollocks-mode company-quickhelp evil-exchange clj-refactor lispy with-editor undo-tree swiper smartparens queue pyenv-mode projectile magit ivy hydra flycheck finalize evil diminish dash counsel company closql clojure-mode avy anaconda-mode ace-link lispyville auctex exec-path-from-shell org-bullets evil-mc git-modes function-args zenburn-theme ws-butler worf window-numbering which-key use-package typo term-manager super-save speck spacemacs-theme solarized-theme smex shm shell-pop shackle sentence-navigation reveal-in-osx-finder rainbow-delimiters pyenv-mode-auto py-yapf pdf-tools pandoc-mode osx-dictionary multiple-cursors markdown-mode jedi ivy-hydra intero inf-clojure hindent highlight-escape-sequences gist flyspell-correct flx expand-region evil-visualstar evil-textobj-anyblock evil-surround evil-snipe evil-numbers evil-multiedit evil-matchit evil-magit evil-commentary evil-cleverparens epkg elisp-slime-nav diff-hl counsel-projectile company-anaconda circe cider bind-map auto-compile)))
+ (vlf hl-todo ivy-rich base16-theme farmhouse-theme yaml-mode doom-themes ace-window rainbow-mode org-download htmlize rust-mode haskell-mode org-pomodoro ess-smart-equals ess ess-site pamparam lpy tex cdlatex texmathp magithub suggest wgrep general hungry-delete hungry-delete-mode toml-mode soap atom-one-dark-theme ggtags cpputils-cmake irony clang-format company-statistics osx-trash ox help evil-cleverparens-text-objects dired racer cargo golden-ratio jade yasnippet evil-evilified-state artbollocks-mode company-quickhelp evil-exchange clj-refactor lispy with-editor undo-tree swiper smartparens queue pyenv-mode projectile magit ivy hydra flycheck finalize evil diminish dash counsel company closql clojure-mode avy anaconda-mode ace-link lispyville auctex exec-path-from-shell org-bullets evil-mc git-modes function-args zenburn-theme ws-butler worf window-numbering which-key use-package typo term-manager super-save speck spacemacs-theme solarized-theme smex shm shell-pop shackle sentence-navigation reveal-in-osx-finder rainbow-delimiters pyenv-mode-auto py-yapf pdf-tools pandoc-mode osx-dictionary multiple-cursors markdown-mode jedi ivy-hydra intero inf-clojure hindent highlight-escape-sequences gist flyspell-correct flx expand-region evil-visualstar evil-textobj-anyblock evil-surround evil-snipe evil-numbers evil-multiedit evil-matchit evil-magit evil-commentary evil-cleverparens epkg elisp-slime-nav diff-hl counsel-projectile company-anaconda circe cider bind-map auto-compile)))
'(pdf-view-midnight-colors (quote ("#DCDCCC" . "#383838")))
'(pos-tip-background-color "#eee8d5")
'(pos-tip-foreground-color "#586e75")
@@ -71,20 +71,6 @@
(cider-jack-in-clojurescript))
(general-define-key :keymaps 'cider-mode-map
"C-c C-M-j" 'cider-figwheel-repl)
-
-<<<<<<< variant A
- ;; (defadvice cider-jump-to-var (before add-evil-jump activate)
- ;; (evil-set-jump))
- (add-hook 'cider-repl-mode-hook (lambda () (toggle-truncate-lines 1)))
- (add-hook 'cider-repl-mode-hook 'company-mode)
- (evil-define-key 'normal cider-mode-map "K" 'cider-doc)
- (evil-set-initial-state 'cider-repl-mode 'emacs)
- (evil-set-initial-state 'cider-docview-mode 'insert)
- (evil-set-initial-state 'cider-stacktrace-mode 'insert)
- (evil-set-initial-state 'cider-macroexpansion-mode 'insert)
- (evil-set-initial-state 'cider-browse-ns-mode 'insert)
- (evil-set-initial-state 'cider-test-report-mode 'insert)
->>>>>>> variant B
(defun soo-cider-repl-hook ()
(toggle-truncate-lines 1)
(company-mode)
@@ -97,7 +83,6 @@
(evil-set-initial-state 'cider-macroexpansion-mode 'emacs)
(evil-set-initial-state 'cider-browse-ns-mode 'emacs)
(evil-set-initial-state 'cider-test-report-mode 'emacs)
-======= end
(advice-add 'cider-find-var :after #'recenter-top-bottom))
(use-package inf-clojure
@@ -109,3 +94,5 @@
"C-c C-k" 'inf-clojure-eval-buffer
"C-c C-e" 'inf-clojure-eval-last-sexp
"C-M-x" 'inf-clojure-eval-defun))
+
+(provide 'soo-clojure)
@@ -50,3 +50,5 @@
:init
(add-hook 'ess-mode-hook 'ess-smart-equals-mode)
(add-hook 'inferior-ess-mode-hook 'ess-smart-equals-mode))
+
+(provide 'soo-ess)
@@ -124,3 +124,5 @@
(use-package evil-multiedit
:defer t)
+
+(provide 'soo-evil)
@@ -112,3 +112,5 @@
(use-package ivy-rich :after 'ivy)
(use-package flx)
+
+(provide 'soo-ivy)
@@ -211,3 +211,5 @@ _h_tml ^ ^ ^ ^ _A_SCII:
(sp-local-pair 'org-mode "\\left[" " \\right]")
(sp-local-pair 'org-mode "\\left{" " \\right}")
(sp-local-pair 'org-mode "\\left|" " \\right|"))
+
+(provide 'soo-org)
@@ -113,3 +113,5 @@ buffer."
(region-end))
(ora-python-shell-send-region (point-min)
(point-max))))
+
+(provide 'soo-python)
@@ -30,3 +30,5 @@
(with-eval-after-load 'smartparens
(sp-local-pair 'rust-mode "'" nil :actions nil))
+
+(provide 'soo-rust)

0 comments on commit db65fb0

Please sign in to comment.