Skip to content

Commit 131f0e3

Browse files
committed
some custom settings
1 parent 233d29c commit 131f0e3

File tree

6 files changed

+322
-1
lines changed

6 files changed

+322
-1
lines changed

Diff for: ac-comphist.dat

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
((("v/collect-pulls" .
2+
[0 0 0 0 0 0 1 0 0 0 0 0 0 0 0])
3+
("s/valid?" .
4+
[2 0 0 0 0 0 0 0])
5+
("e/event-spec" .
6+
[1 0 0 0 0 0 0 0 0 0 0 0])
7+
("nil" .
8+
[3 0 0])
9+
("e/event-handler" .
10+
[2 0 0 0 0 0 0 0 0 0 0 0 0 0 0])
11+
("load-backend" .
12+
[1 0 0 0 0 0 0 0 0 0 0 0])
13+
("projectile-vc" .
14+
[0 0 0 0 0 0 0 0 0 1 0 0 0])
15+
("setq" .
16+
[1 0 0 0])
17+
("helm-projectile" .
18+
[0 0 0 0 0 0 0 0 0 0 0 0 0 0 1])
19+
("helm-M-x" .
20+
[0 0 0 0 1 0 0 0])
21+
("kbd" .
22+
[2 0 0])
23+
("global-set-key" .
24+
[1 0 0 0 0 0 0 0 0 0 0 0 0 1])
25+
("global-map" .
26+
[0 0 0 0 0 0 0 0 0 1])
27+
("helm-ucs" .
28+
[0 0 0 0 0 0 0 1])
29+
("cider-boot-command" .
30+
[0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0])))

Diff for: ido.last

+77
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
;;; -*- coding: utf-8 -*-
2+
3+
;; ----- ido-last-directory-list -----
4+
(
5+
(#("/Users/jetzajac/Projects/on-air/diff/src/" 25 31 (face flx-highlight-face) 32 37 (face flx-highlight-face)) . "diff/")
6+
(#("/Users/jetzajac/Projects/on-air/diff/" 25 31 (face flx-highlight-face) 32 37 (face flx-highlight-face)) . "src/")
7+
("/Users/jetzajac/.live-packs/" . "jetzajac-pack/")
8+
("/Users/jetzajac/Projects/barfer/src/" . "barfer/")
9+
("/Users/jetzajac/Projects/" . #("on-air/" 0 6 (face flx-highlight-face)))
10+
)
11+
12+
;; ----- ido-work-directory-list -----
13+
(
14+
"/Users/jetzajac/Projects/datascript/"
15+
"/Users/jetzajac/Projects/on-air/diff/"
16+
#("/Users/jetzajac/Projects/on-air/diff/src/diff/" 25 31 (face flx-highlight-face) 32 37 (face flx-highlight-face))
17+
#("/Users/jetzajac/Projects/datascript/src/datascript/" 36 38 (face flx-highlight-face) 40 51 (face flx-highlight-face))
18+
"/Users/jetzajac/.live-packs/jetzajac-pack/"
19+
"/Users/jetzajac/"
20+
"/Users/jetzajac/Projects/barfer/"
21+
"/Users/jetzajac/Projects/on-air/frontend/"
22+
"/Users/jetzajac/Projects/barfer/src/barfer/"
23+
)
24+
25+
;; ----- ido-work-file-list -----
26+
(
27+
#("project.clj" 0 3 (face flx-highlight-face))
28+
#("core.cljc" 0 2 (face flx-highlight-face))
29+
"init.el"
30+
"plan.clj"
31+
".emacs-live.el"
32+
"core.cljs"
33+
)
34+
35+
;; ----- ido-dir-file-cache -----
36+
(
37+
("/Users/jetzajac/Projects/datascript/" (22387 38807 0 0) "test_node.js" "test/" "target/" "src/" "resources/" "release-js/" "README.md" "project.clj" "LICENSE" "dev.html" "dev-resources/" "dev/" "circle.yml" "CHANGELOG.md" "bench/" ".travis.yml" ".nrepl-port" ".gitignore" ".git/" "../" "./")
38+
39+
(#("/Users/jetzajac/Projects/on-air/diff/src/diff/" 25 31 (face flx-highlight-face) 32 37 (face flx-highlight-face)) (22297 4020 0 0) "utils.cljc" "core.cljc" "../" "./")
40+
41+
(#("/Users/jetzajac/Projects/on-air/diff/src/" 25 31 (face flx-highlight-face) 32 37 (face flx-highlight-face)) (22120 13592 0 0) "diff/" "../" "./")
42+
43+
(#("/Users/jetzajac/Projects/on-air/diff/" 25 31 (face flx-highlight-face) 32 37 (face flx-highlight-face)) (22357 27293 0 0) "test/" "target/" "src/" "resources/" "project.clj" "pom.xml" "diff.iml" ".gitignore" ".DS_Store" "../" "./")
44+
45+
(#("/Users/jetzajac/Projects/on-air/" 25 31 (face flx-highlight-face)) (22386 39550 0 0) "target/" "system/" "src/" "README.md" "project.clj" "out/" "ot/" "on-air.iml~" "on-air.iml" "on-air-resources/" "nrepl/" "model-nova/" "model-impl/" "model/" "manager/" "lib/" "idea-importer/" "gotty/" "frontend.zip" "frontend/" "diff/" "dev-resources/" "dashboard/" "core/" "consul/" "config/" "community/" "cluster/" "bus.log" "bus/" "build.xml" "build.txt" "build/" "bin/" "auth/" ".jps-build-data/" ".idea/" ".gitmodules" ".gitignore" ".git/" ".DS_Store" "../" "./")
46+
47+
("/Users/jetzajac/Projects/" (22387 38533 0 0) "webtorrent/" "UpsourceIdeTest/" "upsource.cljs" "upsource-ios/" "untitled2/" "untitled1/" "untitled/" "temp/" "socketIOtest/" "reagent-template/" "reactive-model/" "react-native-test/" "react-blessed/" "re-frame/" "on-air/" "lt-cljs-tutorial/" "LightTableMac.zip" "LightTable/" "jug-clojure-2015-slides/" "jet-cluster/" "javaslang/" "gitlike_vcs/" "functional-composition/" "faster-miniKanren/" "electron-quick-start/" "dst/" "disser.txt" "datascript/" "core.logic.test/" "clj-vcs/" "cityspy/" "circlet/" "barfer/" "atom-master/" "annagreta/" ".DS_Store" "../" "./")
48+
49+
("/Users/jetzajac/Projects/datascript/src/datascript/" (22387 38602 0 0) "query_v3.cljc" "query.cljc" "pull_parser.cljc" "pull_api.cljc" "parser.cljc" "lru.cljc" "js.cljs" "impl/" "externs.js" "db.cljc" "core.cljc" "btset.cljc" "arrays.cljc" ".#core.cljc" "../" "./")
50+
51+
(#("/Users/jetzajac/Projects/datascript/src/" 36 38 (face flx-highlight-face)) (22387 38538 0 0) "deps.cljs" "datascript/" "data_readers.clj" "../" "./")
52+
53+
("/Users/jetzajac/" (22378 58467 0 0) "work/" "VMware/" "tmp2/" "tmp/" "test.o" "test.hs" "test.hi" "test" "Snapshots/" "ring-ui-build/" "Public/" "Projects/" "PRIVATE/" "Pictures/" "on-air-image.tar" "Music/" "Movies/" "Library/" "IdeaProjects/" "Go/" "Dropbox (Old)/" "Dropbox/" "Downloads/" "dos/" "Documents/" "Desktop/" "cool-retro-term/" "Applications/" ".zshrc-e" ".zshrc" ".zsh_history" ".zsh-update" ".zcompdump-UNIT-732-5.0.8" ".zcompdump-UNIT-732-5.0.5" ".zcompdump-UNIT-732 (2)-5.0.5" ".yjp/" ".yandex/" ".vscode/" ".viminfo" ".v8flags.4.5.103.35.jetzajac.json" ".upsource/" ".Trash/" ".tooling/" ".terraform.d/" ".subversion/" ".ssh/" ".spacemacs" ".rnd" ".overtone/" ".oracle_jre_usage/" ".OnAir0/" ".oh-my-zsh/" ".npm/" ".node-gyp/" ".m2/" ".local/" ".lobo/" ".live-packs/" ".lein/" ".kube/" ".kotlin-daemon/" ".jmc/" ".jetpass/" ".IntelliJIdea15/" ".IntelliJIdea14/" ".IdeaIC15/" ".IdeaIC14/" ".IdeaData/" ".groovy/" ".gradle/" ".gitconfig" ".ghc/" ".emacs.d.pre-prelude.tar" ".emacs.d.backup/" ".emacs.d/" ".emacs-live.el" ".electron/" ".eclipse/" ".dvdcss/" ".DS_Store" ".dropbox/" ".docker/" ".cups/" ".config/" ".CFUserTextEncoding" ".cache/" ".bash_history" ".babel.json" ".atom/" ".#plan.clj" "../" "./")
54+
55+
("/Users/" (22085 56141 0 0) "Shared/" "jetzajac/" "jetbrains/" "Guest/" ".localized" "../" "./")
56+
57+
("/Users/jetzajac/Projects/on-air/frontend/" (22378 57810 0 0) "test/" "target/" "src/" "resources/" "public/" "project.clj" "frontend.zip" "frontend.iml" "figwheel_server.log" "devsrc/" "dev-resources/" "assets/" ".repl/" ".nrepl-port" ".gitignore" ".DS_Store" ".#project.clj" "../" "./")
58+
59+
("/Users/jetzajac/Projects/barfer/src/barfer/" (22378 55307 0 0) "tree.cljs" "doc.cljs" "core.cljs" "../" "./")
60+
61+
("/Users/jetzajac/.live-packs/jetzajac-pack/" (22378 55802 0 0) "README.md" "lib/" "init.el" "info.el" "config/" ".#init.el" "../" "./")
62+
63+
("/Users/jetzajac/Projects/barfer/" (22378 55309 0 0) "test/" "target/" "src/" "resources/" "project.clj" "package.json" "node_modules/" "figwheel_server.log" "dev-resources/" ".gitignore" ".git/" "../" "./")
64+
65+
("/Users/jetzajac/Projects/on-air/frontend/src/" (22225 45921 0 0) "re_com/" "ot/" "frontend/" ".DS_Store" "../" "./")
66+
67+
("/Users/jetzajac/Projects/on-air/frontend/src/frontend/" (22360 6216 0 0) "window.cljs" "view.cljs" "view/" "validation.cljs" "utils.cljs" "usages.cljs" "throttling.cljs" "themes.cljs" "theme-dialog.cljs" "terminal.cljs" "styles.cljs" "settings.cljs" "safe_delete_dialog.cljs" "runtime_benchmark.cljs" "project.cljs" "object.cljs" "navigation.cljs" "model.cljs" "modal.cljs" "make.cljs" "log.cljs" "log.clj" "localstorage.cljs" "layout.cljs" "keymap.cljs" "init.cljs" "hints.cljs" "handlers.cljs" "global_actions.cljs" "global.cljs" "focus.cljs" "find.cljs" "file_stucture.cljs" "file_chooser.cljs" "execution.cljs" "editor_actions.cljs" "editor/" "doc.cljs" "debug.cljs" "core.cljs" "components.cljs" "completion.cljs" "actions.cljs" ".DS_Store" "../" "./")
68+
69+
("/Users/jetzajac/.live-packs/" (22378 51287 0 0) "jetzajac-pack/" "../" "./")
70+
71+
("/Users/jetzajac/Projects/barfer/src/" (22377 11838 0 0) "barfer/" "../" "./")
72+
73+
("/Users/jetzajac/Projects/clj-vcs/" (22377 9444 0 0) "test/" "src/" "README.md" "project.clj" "LICENSE" "doc/" "CHANGELOG.md" ".gitignore" ".git/" "../" "./")
74+
)
75+
76+
;; ----- ido-unc-hosts-cache -----
77+
t

Diff for: init.el

-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ by Prelude.")
105105
(require 'prelude-mode)
106106
(require 'prelude-editor)
107107
(require 'prelude-global-keybindings)
108-
109108
;; OSX specific settings
110109
(when (eq system-type 'darwin)
111110
(require 'prelude-osx))

Diff for: personal/init.el

+189
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,189 @@
1+
(prelude-require-packages '(neotree))
2+
3+
(setq prelude-guru nil)
4+
5+
6+
(prelude-require-package 'rainbow-delimiters)
7+
8+
(add-hook 'clojure-mode-hook #'rainbow-delimiters-mode)
9+
(add-hook 'cider-repl-mode-hook #'rainbow-delimiters-mode)
10+
(add-hook 'emacs-lisp-mode-hook #'rainbow-delimiters-mode)
11+
12+
(prelude-require-package 'paredit)
13+
(add-hook 'emacs-lisp-mode-hook #'paredit-mode)
14+
(add-hook 'clojure-mode-hook #'paredit-mode)
15+
(add-hook 'helm-swoop-mode-hook #'paredit-mode)
16+
(add-hook 'cider-repl-mode-hook #'paredit-mode)
17+
18+
;;;;;;;;;;;;;;; HELM ;;;;;;;;;;;;;;;;;;;
19+
20+
(prelude-require-packages '(helm helm-swoop helm-projectile))
21+
;; http://tuhdo.github.io/helm-intro.html
22+
;; https://github.com/ShingoFukuyama/helm-swoop
23+
24+
(with-eval-after-load 'helm
25+
(helm-mode 1)
26+
(define-key helm-map (kbd "<tab>") 'helm-execute-persistent-action) ; rebind tab to run persistent action
27+
(define-key helm-map (kbd "C-i") 'helm-execute-persistent-action) ; make TAB work in terminal
28+
(define-key helm-map (kbd "C-z") 'helm-select-action) ; list actions using C-z
29+
)
30+
31+
(global-set-key (kbd "M-x") 'helm-M-x)
32+
(global-set-key (kbd "s-x") 'helm-M-x)
33+
(global-set-key (kbd "C-x b") 'helm-mini)
34+
(global-set-key (kbd "C-x C-b") 'helm-mini)
35+
(global-set-key (kbd "C-x C-f") 'helm-find-files)
36+
(global-set-key (kbd "C-x f") 'helm-projectile)
37+
(global-set-key (kbd "C-x C-r") 'helm-resume)
38+
39+
(setq helm-M-x-fuzzy-match t)
40+
(setq helm-split-window-in-side-p nil)
41+
(setq helm-split-window-default-side 'other)
42+
43+
(global-set-key (kbd "M-i") 'helm-swoop)
44+
45+
(with-eval-after-load 'helm-swoop
46+
(define-key helm-swoop-map (kbd "M-i") 'helm-multi-swoop-all-from-helm-swoop)); From helm-swoop to helm-multi-swoop-all
47+
48+
(with-eval-after-load 'isearch
49+
(define-key isearch-mode-map (kbd "M-i") 'helm-swoop-from-isearch)); When doing isearch, hand the word over to helm-swoop
50+
51+
(setq helm-swoop-split-direction 'split-window-horizontally)
52+
53+
54+
(setq projectile-indexing-method 'alien)
55+
(setq projectile-enable-caching t)
56+
57+
(setq helm-follow-mode-persistent t)
58+
(setq helm-ag-use-temp-buffer t)
59+
60+
(prelude-require-packages '(ag helm-ag))
61+
62+
(global-set-key (kbd "M-I") 'helm-projectile-ag)
63+
64+
;;;;;;;;;;;;;;;;;; CIDER ;;;;;;;;;;;;;;;
65+
66+
(prelude-require-packages '(cider eldoc))
67+
68+
(setq cider-prompt-for-symbol nil) ; try to jump to symbol under cursor without minibuffer prompt
69+
(setq cider-repl-use-pretty-printing t) ; use pretty print in repl
70+
(setq cider-prompt-save-file-on-load 'always-save) ; when reloading file just save without prompting
71+
(setq cider-font-lock-dynamically '(macro core function var)) ; colorize usages of functions and variables from any namespace
72+
(setq cider-repl-display-help-banner nil)
73+
;;;;;;;;;;;;;;;;
74+
75+
(prelude-require-packages '(company flx company-flx))
76+
(global-company-mode)
77+
(add-hook 'cider-repl-mode-hook #'company-mode)
78+
(add-hook 'cider-mode-hook #'company-mode)
79+
80+
(with-eval-after-load 'company
81+
(company-flx-mode t)
82+
(setq company-flx-limit 15))
83+
84+
(setq company-idle-delay nil) ; never start completions automatically
85+
(global-set-key (kbd "TAB") #'company-indent-or-complete-common)
86+
87+
;;;;;;;;;; BUFFER-MOVE ;;;;;;;;;;;;;;;;;
88+
89+
(prelude-require-package 'buffer-move)
90+
(global-set-key (kbd "<C-s-up>") #'buf-move-up)
91+
(global-set-key (kbd "<C-s-down>") #'buf-move-down)
92+
(global-set-key (kbd "<C-s-left>") #'buf-move-left)
93+
(global-set-key (kbd "<C-s-right>") #'buf-move-right)
94+
95+
;;;;;;;;;;; GLOBALS ;;;;;;;;;;;;;;;;;;;
96+
97+
(define-key global-map [home] 'beginning-of-line)
98+
(define-key global-map [end] 'end-of-line)
99+
100+
(global-set-key (kbd "<M-c M-p>") #'cider-eval-print-last-sexp)
101+
(global-set-key (kbd "M-k") #'paredit-copy-as-kill)
102+
103+
(set-default 'truncate-lines t)
104+
(setq truncate-lines t)
105+
106+
(setq scroll-margin 10)
107+
108+
(defun gcm-scroll-down () (interactive) (scroll-up 1))
109+
(defun gcm-scroll-up () (interactive) (scroll-down 1))
110+
111+
(global-set-key (kbd "<s-up>") 'gcm-scroll-up)
112+
(global-set-key (kbd "<s-down>") 'gcm-scroll-down)
113+
114+
;; do not show scrollbars in windowed version
115+
(if (display-graphic-p)
116+
(scroll-bar-mode -1))
117+
118+
(setq vc-follow-symlinks t)
119+
120+
(load-theme 'zenburn t)
121+
122+
(if (not (display-graphic-p))
123+
(progn
124+
;; disable current line highlight
125+
(global-hl-line-mode 0)
126+
127+
;; i like my terminal transparent, but background other than black makes it difficult to read
128+
(add-to-list 'default-frame-alist '(background-color . "black"))
129+
130+
;; i have no idea why i should change custom theme, but otherwise terminal's background flashes on opening from zenburn's grey to default black
131+
(with-eval-after-load "zenburn-theme"
132+
(zenburn-with-color-variables
133+
(custom-theme-set-faces 'zenburn `(default ((t (:foreground, zenburn-fg :background, "black")))))))))
134+
135+
(when (window-system)
136+
(set-default-font "Fira Code"))
137+
138+
(let ((alist '(
139+
;; (33 . ".\\(?:\\(?:==\\|!!\\)\\|[!=]\\)")
140+
;; (35 . ".\\(?:###\\|##\\|_(\\|[#(?[_{]\\)")
141+
;; (36 . ".\\(?:>\\)")
142+
;; (37 . ".\\(?:\\(?:%%\\)\\|%\\)")
143+
;; (38 . ".\\(?:\\(?:&&\\)\\|&\\)")
144+
;; (42 . ".\\(?:\\(?:\\*\\*/\\)\\|\\(?:\\*[*/]\\)\\|[*/>]\\)")
145+
;; (43 . ".\\(?:\\(?:\\+\\+\\)\\|[+>]\\)")
146+
;; (45 . ".\\(?:\\(?:-[>-]\\|<<\\|>>\\)\\|[<>}~-]\\)")
147+
;; (46 . ".\\(?:\\(?:\\.[.<]\\)\\|[.=-]\\)")
148+
;; (47 . ".\\(?:\\(?:\\*\\*\\|//\\|==\\)\\|[*/=>]\\)")
149+
;; (48 . ".\\(?:x[a-zA-Z]\\)")
150+
;; (58 . ".\\(?:::\\|[:=]\\)")
151+
;; (59 . ".\\(?:;;\\|;\\)")
152+
153+
;; (60 . ".\\(?:\\(?:!--\\)\\|\\(?:~~\\|->\\|\\$>\\|\\*>\\|\\+>\\|--\\|<[<=-]\\|=[<=>]\\||>\\)\\|[*$+~/<=>|-]\\)")
154+
;; (61 . ".\\(?:\\(?:/=\\|:=\\|<<\\|=[=>]\\|>>\\)\\|[<=>~]\\)")
155+
;; (62 . ".\\(?:\\(?:=>\\|>[=>-]\\)\\|[=>-]\\)")
156+
;; (63 . ".\\(?:\\(\\?\\?\\)\\|[:=?]\\)")
157+
;; (91 . ".\\(?:]\\)")
158+
159+
;; (92 . ".\\(?:\\(?:\\\\\\\\\\)\\|\\\\\\)")
160+
;; (94 . ".\\(?:=\\)")
161+
;; (119 . ".\\(?:ww\\)")
162+
;; (123 . ".\\(?:-\\)")
163+
;; (124 . ".\\(?:\\(?:|[=|]\\)\\|[=>|]\\)")
164+
;; (126 . ".\\(?:~>\\|~~\\|[>=@~-]\\)")
165+
)
166+
))
167+
(dolist (char-regexp alist)
168+
(set-char-table-range composition-function-table (car char-regexp)
169+
`([,(cdr char-regexp) 0 font-shape-gstring]))))
170+
(setq-default cursor-type 'bar)
171+
172+
173+
174+
(global-set-key (kbd "C--") 'undo)
175+
(global-set-key (kbd "M-c") 'paredit-copy-as-kill)
176+
(global-set-key "\M-p" 'cider-eval-print-last-sexp)
177+
(global-set-key "\M-n" 'gcm-scroll-down)
178+
179+
180+
(defun pretty-lambda ()
181+
"make some word or string show as pretty Unicode symbols"
182+
(setq prettify-symbols-alist
183+
'(
184+
("fn" . 955) ; λ
185+
186+
)))
187+
188+
(add-hook 'clojure-mode-hook 'pretty-lambda)
189+
(global-prettify-symbols-mode 1)

Diff for: smex-items

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
2+
;; ----- smex-history -----
3+
(
4+
cider-jack-in
5+
package-install
6+
package-list-packages
7+
cd
8+
5x5
9+
arp
10+
dbx
11+
)
12+
13+
;; ----- smex-data -----
14+
(
15+
(cider-jack-in . 5)
16+
(package-install . 4)
17+
(package-list-packages . 1)
18+
(outline-show-subtree . 1)
19+
(neotree . 1)
20+
(cider-drink-a-sip . 1)
21+
(paredit-forward-slurp-sexp . 3)
22+
(paredit-kill . 2)
23+
(live-paredit-forward-kill-sexp . 1)
24+
(paredit-copy-as-kill . 2)
25+
)

Diff for: vendor/emacs-powerline

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Subproject commit bbbbcd70641249f9dc9d3ea37997d6c60efdaf9b

0 commit comments

Comments
 (0)