diff --git a/init.el b/init.el
index a05db93abef4bbf5d6f1f4330c6e304804e84163..0cd3dd046f8f6e44539cab8320b32237d6da4c0c 100644
--- a/init.el
+++ b/init.el
@@ -23,6 +23,9 @@
:config
(tabbar-mode 1))
+;; show the current function on top
+(which-function-mode t)
+
(org-babel-load-file (expand-file-name "~/.emacs.d/myinit.org"))
(custom-set-variables
;; custom-set-variables was added by Custom.
@@ -43,7 +46,7 @@
'(org-startup-indented t)
'(package-selected-packages
(quote
- (cmake-font-lock cmake-mode magit-gerrit rainbow-delimiters alect-theme zero-dark-theme autumn-light-theme solarized-dark-theme misterioso misterioso-theme zenburn sourcerer-theme flycheck-pos-tip flycheck-clojure ox-reveal posframe processing-snippets processing-mode rg deadgrep flycheck-rust cargo racer yasnippet-classic-snippets rustic lsp-rust lsp-java company-lsp lsp-ui lsp-mode lsp yasnippet-snippets counsel-spotify exec-path-from-shell easy-kill auto-yasnippet org-pdfview pdf-tools atomic-chrome mingus simple-mpc pcre2el ag wgrep-ag wgrep haskell-mode aggressive-indent treemacs-projectile treemacs prodigy origami dumb-jump cider ggtags circe-notifications circe org-gcal mu4e-alert git-timemachine git-gutter magit hydra default-text-scale smartparens projectile auctex tern-auto-complete tern js2-refactor ac-js2 js2-mode emmet-mode web-mode iedit expand-region multiple-cursors hungry-delete beacon undo-tree virtualenvwrapper elpy flycheck doom-modeline doom-themes tao-theme poet-theme faff-theme zerodark-theme alect-themes moe-theme base16-theme zenburn-theme color-theme-modern company-jedi irony-eldoc company-irony company counsel ace-window htmlize noflet org-bullets which-key try use-package)))
+ (alect-theme zero-dark-theme autumn-light-theme solarized-dark-theme misterioso misterioso-theme zenburn sourcerer-theme flycheck-pos-tip flycheck-clojure ox-reveal posframe processing-snippets processing-mode rg deadgrep flycheck-rust cargo racer yasnippet-classic-snippets rustic lsp-rust lsp-java company-lsp lsp-ui lsp-mode lsp yasnippet-snippets counsel-spotify exec-path-from-shell easy-kill auto-yasnippet org-pdfview pdf-tools atomic-chrome mingus simple-mpc pcre2el ag wgrep-ag wgrep haskell-mode aggressive-indent treemacs-projectile treemacs prodigy origami dumb-jump cider ggtags circe-notifications circe org-gcal mu4e-alert git-timemachine git-gutter magit hydra default-text-scale smartparens projectile auctex tern-auto-complete tern js2-refactor ac-js2 js2-mode emmet-mode web-mode iedit expand-region multiple-cursors hungry-delete beacon undo-tree virtualenvwrapper elpy flycheck doom-modeline doom-themes tao-theme poet-theme faff-theme zerodark-theme alect-themes moe-theme base16-theme zenburn-theme color-theme-modern company-jedi irony-eldoc company-irony company counsel ace-window htmlize noflet org-bullets which-key try use-package)))
'(sp-escape-quotes-after-insert nil))
(setq max-lisp-eval-depth 10000)
(setq max-specpdl-size 10000)
@@ -63,8 +66,6 @@
(package-refresh-contents)
(package-install 'use-package))
-
-
(org-babel-load-file (expand-file-name "~/.emacs.d/myinit.org"))
(custom-set-faces
diff --git a/myinit.org b/myinit.org
index b86d5319a0754708cb64119ab0d8dd4d30911e7e..5354d053e96eeabf214a97f2532084f5e37fd137 100644
--- a/myinit.org
+++ b/myinit.org
@@ -30,6 +30,7 @@
(turn-on-auto-fill)
;; Disable auto-fill-mode in programming mode
(add-hook 'prog-mode-hook (lambda () (auto-fill-mode -1)))
+
#+END_SRC
* try
#+BEGIN_SRC emacs-lisp
@@ -329,8 +330,6 @@
:config
(load-theme 'sourcerer t))
- ;; More visible line
- (set-face-background 'hl-line "#372E2D")
;; Increase font size
(defvar my-font-size 140)
@@ -358,7 +357,7 @@
(add-hook 'prog-mode-hook #'rainbow-delimiters-mode))
#+END_SRC
-* Auto pairs
+* COMMENT Auto pairs
#+BEGIN_SRC emacs-lisp
(use-package autopair
:ensure t
@@ -446,6 +445,8 @@
#+BEGIN_SRC emacs-lisp
; Highlights the current cursor line
(global-hl-line-mode t)
+ ;; More visible line
+ (set-face-background 'hl-line "#372E2D")
; flashes the cursor's line when you scroll
(use-package beacon
@@ -455,11 +456,11 @@
; (setq beacon-color "#666600")
)
- ;; ; deletes all the whitespace when you hit backspace or delete
- ;; (use-package hungry-delete
- ;; :ensure t
- ;; :config
- ;; (global-hungry-delete-mode))
+ ;; deletes all the whitespace when you hit backspace or delete
+ (use-package hungry-delete
+ :ensure t
+ :config
+ (global-hungry-delete-mode))
(use-package multiple-cursors
@@ -478,11 +479,11 @@
(setq auto-revert-verbose nil) ;; or this
(global-set-key (kbd "<f5>") 'revert-buffer)
(global-set-key (kbd "<f6>") 'revert-buffer)
- #+END_SRC
+ #+END_SRC
* iedit and narrow / widen dwim
- #+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp
; mark and edit all copies of the marked region simultaniously.
(use-package iedit
:ensure t)
@@ -517,11 +518,11 @@
;; how much I like this command. Only copy it if that's what you want.
(define-key ctl-x-map "n" #'narrow-or-widen-dwim)
- #+END_SRC
+#+END_SRC
- #+RESULTS:
- : narrow-or-widen-dwim
+#+RESULTS:
+: narrow-or-widen-dwim
* Web Mode
#+BEGIN_SRC emacs-lisp
@@ -860,7 +861,7 @@
#+END_SRC
* Load other files
- #+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp
(defun load-if-exists (f)
"load the elisp file only if it exists and is readable"
(if (file-readable-p f)
@@ -869,10 +870,10 @@
(load-if-exists "~/Sync/shared/mu4econfig.el")
(load-if-exists "~/Sync/shared/not-for-github.el")
- #+END_SRC
+#+END_SRC
- #+RESULTS:
- : t
+#+RESULTS:
+: t
* Testing Stuff
#+BEGIN_SRC emacs-lisp
(add-hook 'org-mode-hook 'turn-on-flyspell)
@@ -1014,7 +1015,7 @@
#+RESULTS:
: mz/make-and-run-elfeed-hydra
-* c++
+* C++
#+BEGIN_SRC emacs-lisp
(use-package ggtags
@@ -1030,7 +1031,7 @@
#+RESULTS:
-* cmake
+* Cmake
#+BEGIN_SRC emacs-lisp
(use-package cmake-mode
:ensure t
@@ -1409,6 +1410,9 @@
(setq auto-window-vscroll nil)
+(blink-cursor-mode t)
+(setq default-frame-alist
+ '((cursor-color . "DarkGrey")))
#+END_SRC
* Keyfreq