Skip to content

Commit e2caf86

Browse files
committed
Updates after laptop change
1 parent ae9382e commit e2caf86

37 files changed

Lines changed: 11131 additions & 66 deletions

.bash/10-vars.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ if test -f ~/.domainname; then
44
EMAIL="juanleon.lahoz@$(cat ~/.domainname)"
55
fi
66

7-
PATH=/home/juanleon/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/home/juanleon/.local/bin
7+
PATH=/home/juanleon/bin:/snap/bin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/home/juanleon/.local/bin:/usr/local/go/bin/
88
GREP_COLORS="ms=01;31:mc=01;31:sl=:cx=34:fn=35:ln=32:bn=32:se=36"
99

1010
if test -e /usr/share/virtualenvwrapper/virtualenvwrapper.sh; then
@@ -19,5 +19,6 @@ export DEBEMAIL=$EMAIL
1919
export MANPAGER="sh -c 'col -bx | bat -l man -p'"
2020
# eval $(ssh-agent)
2121

22-
export PEX_ROOT=/home/plain/pex
22+
export PEX_ROOT=/home/juanleon/.cache/pex
2323
export TS_WORK_ON_ALL_REPOS=true
24+
export NODE_OPTIONS=--no-experimental-fetch

.emacs.d/init-loader/05-customize.el

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@
3535
(name 30 -1)
3636
" " filename)))
3737
'(jedi:tooltip-method nil)
38+
'(lsp-file-watch-ignored-directories
39+
'("[/\\\\]\\.git\\'" "[/\\\\]\\.github\\'" "[/\\\\]\\.circleci\\'" "[/\\\\]\\.hg\\'" "[/\\\\]\\.bzr\\'" "[/\\\\]_darcs\\'" "[/\\\\]\\.svn\\'" "[/\\\\]_FOSSIL_\\'" "[/\\\\]\\.idea\\'" "[/\\\\]\\.ensime_cache\\'" "[/\\\\]\\.eunit\\'" "[/\\\\]node_modules" "[/\\\\]\\.yarn\\'" "[/\\\\]\\.fslckout\\'" "[/\\\\]\\.tox\\'" "[/\\\\]dist\\'" "[/\\\\]dist-newstyle\\'" "[/\\\\]\\.stack-work\\'" "[/\\\\]\\.bloop\\'" "[/\\\\]\\.metals\\'" "[/\\\\]target\\'" "[/\\\\]\\.ccls-cache\\'" "[/\\\\]\\.vscode\\'" "[/\\\\]\\.venv\\'" "[/\\\\]\\.mypy_cache\\'" "[/\\\\]\\.deps\\'" "[/\\\\]build-aux\\'" "[/\\\\]autom4te.cache\\'" "[/\\\\]\\.reference\\'" "bazel-[^/\\\\]+\\'" "[/\\\\]\\.meta\\'" "[/\\\\]Library\\'" "[/\\\\]\\.lsp\\'" "[/\\\\]\\.clj-kondo\\'" "[/\\\\]\\.shadow-cljs\\'" "[/\\\\]\\.babel_cache\\'" "[/\\\\]\\.cpcache\\'" "[/\\\\]\\checkouts\\'" "[/\\\\]\\.gradle\\'" "[/\\\\]\\.m2\\'" "[/\\\\]bin/Debug\\'" "[/\\\\]obj\\'" "[/\\\\]_opam\\'" "[/\\\\]\\.cache\\'" "[/\\\\]\\.elixir_ls\\'" "[/\\\\]\\.direnv\\'"))
40+
'(lsp-pyls-plugins-flake8-config "/home/juanleon/.flake8")
3841
'(magit-log-arguments '("-n48"))
3942
'(magit-push-arguments nil)
4043
'(magit-rebase-arguments '("--keep-empty" "--autosquash"))
@@ -81,4 +84,4 @@
8184
'(git-timemachine-minibuffer-detail-face ((t (:foreground "deep sky blue"))))
8285
'(org-agenda-date-weekend ((t (:inherit org-agenda-date :foreground "dark gray"))))
8386
'(org-journal-dir "~/Dropbox/org/journal/")
84-
'(stripe-highlight ((t (:background "#e4e4d4")))))
87+
'(stripe-highlight ((t (:background "#e4e4d4"))) t))

.emacs.d/init-loader/15-preferences.el

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
(mapc (lambda (mode) (funcall mode 1))
33
'(column-number-mode auto-image-file-mode show-paren-mode size-indication-mode))
44

5-
65
(fset 'yes-or-no-p 'y-or-n-p)
76

87
(setq-default

.emacs.d/init-loader/25-org.el

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@
8888
("l" "Today I learned" entry (file+datetree "info/til.org") "* %<%R:> %?")
8989
("k" "Trick " entry (file "info/tricks.org") "* %?\n")
9090
("K" "Trick with code" entry (file "info/tricks.org") "* %? \n#+BEGIN_SRC %^{language}\n\n#+END_SRC")
91+
("E" "Eleo" entry (file "agenda/Kids.org") "* TODO %? \n %U\n")
9192
("f" "Follow up" entry (file "agenda/agenda.org")
9293
"* TODO Follow up %?\n SCHEDULED: %(org-insert-time-stamp (org-read-date nil t \"+3d\"))")
9394
("s" "scheduled" entry (file "agenda/agenda.org")
@@ -101,6 +102,8 @@
101102
(tags "PRIORITY=\"C\"" ((org-agenda-overriding-header "Reviewed this weekly:")))
102103
(tags "PRIORITY=\"D\"" ((org-agenda-overriding-header "To be classified:"))))
103104
((org-agenda-files '("~/Dropbox/org/agenda/Inbox.org"))))
105+
("E" "Interesting stuff to check out" ((alltodo ""))
106+
((org-agenda-files '("~/Dropbox/org/agenda/Kids.org"))))
104107
("p" "Projects"
105108
((todo "TODO"
106109
((org-agenda-overriding-header "Ongoing projects:"))))

.emacs.d/init-loader/35-git.el

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@
4545

4646

4747
(use-package magit
48-
:bind (([(super ?0)] . magit-status))
48+
:bind (([(super ?0)] . magit-status)
49+
([(control ?\))] . magit-status))
4950
:commands magit-git-repo-p magit-status
5051
:ensure t
5152
:init
@@ -116,7 +117,7 @@
116117

117118
(defun juanleon/assign-mr ()
118119
(interactive)
119-
(insert "\n/assign juanleon.lahoz\n/reviewer"))
120+
(insert "\n/assign susana.ledesma\n/reviewer quimey.vivas"))
120121

121122
(add-hook 'forge-post-mode-hook (lambda ()
122123
(local-set-key [(super ?a)] 'juanleon/assign-mr))))

.emacs.d/init-loader/45-editing.el

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99

1010
(use-package expand-region
1111
:ensure t
12-
:bind (([(super ?1)] . er/expand-region)))
12+
:bind (([(super ?1)] . er/expand-region)
13+
([(super ?e)] . er/expand-region)))
1314

1415

1516
(use-package easy-kill

.emacs.d/init-loader/50-prog.el

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
(add-hook 'text-mode-hook #'ws-butler-mode)
4444
;; Why are those below not inheriting from prog-mode?
4545
(add-hook 'toml-mode-hook #'ws-butler-mode)
46+
(add-hook 'svelte-mode-hook #'delete-trailing-whitespace)
4647
(add-hook 'protobuf-mode-hook #'ws-butler-mode)
4748
:config
4849
(setq ws-butler-global-exempt-modes nil))
@@ -128,6 +129,11 @@
128129
;; Monkey patch function to avoid buffer modified file flag bug
129130
(defun php-syntax-propertize-function (start end) nil))
130131

132+
;; (use-package svelte-mode
133+
;; :ensure t
134+
;; :defer t
135+
;; :mode ("\\.svelte\\'" . svelte-mode)
136+
;; :hook ((svelte-mode . prog-mode)))
131137

132138
(use-package json-mode
133139
:mode ("\\.js\\.template\\'" . json-mode))
@@ -183,6 +189,7 @@
183189
:init
184190
(setq lsp-keymap-prefix "s-l")
185191
:hook ((go-mode . lsp)
192+
(rustic-mode . lsp)
186193
(lsp-mode . lsp-enable-which-key-integration))
187194
:commands lsp)
188195

@@ -204,6 +211,7 @@
204211

205212
(use-package rustic
206213
:ensure t
214+
:mode ("\\.rs\\'" . rustic-mode)
207215
:bind (:map rustic-mode-map
208216
("M-j" . lsp-ui-imenu)
209217
("M-?" . lsp-find-references)

.emacs.d/init-loader/unused.el

Lines changed: 8 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,20 @@
22
;; using, or things I do not use anymore but I do not discard using again, since
33
;; future is opaque.
44

5-
5+
;; Rarely used; not worth the key binding
66
(use-package locate
77
:defer t
88
:bind (([(super l)] . locate)
99
([(super L)] . locate-with-filter)))
1010

1111

12+
;; rg is enough (projectile-ripgrep and deadgrep cover all my needs)
1213
(use-package ag
1314
:ensure t
1415
:commands ag ag-regexp)
1516

17+
18+
;; Going the lsp way for python too
1619
(use-package jedi
1720
:disabled
1821
:ensure t
@@ -23,15 +26,7 @@
2326
'("virtualenv" "-p" "python3.7" "--system-site-packages" "--quiet")))
2427

2528

26-
27-
; Part of projectile now
28-
(use-package projectile-ripgrep
29-
:ensure t
30-
:after projectile)
31-
32-
3329
;; load-theme-buffer-local is not polished enough to be worth using it
34-
3530
(add-hook 'inferior-python-mode-hook
3631
(lambda nil
3732
(load-theme-buffer-local 'tango-dark (current-buffer))))
@@ -43,7 +38,6 @@
4338
(load-theme-buffer-local 'tango-dark (current-buffer))))
4439

4540

46-
4741
;; This is nice, and I leave here as example, but always end using
4842
;; 'dired-at-other-repo
4943

@@ -53,36 +47,9 @@
5347
(require 'popwin)
5448
(require 'button)
5549
(popwin-mode 1)
56-
(setq git-repositories
57-
(list
58-
"~/www/debhelpers"
59-
"~/www/githooktools"
60-
"~/www/iats/code"
61-
"~/www/iatsadmin"
62-
"~/www/iatsgithooks"
63-
"~/www/iatsreqs"
64-
"~/www/iatstesttools"
65-
"~/www/iatstools"
66-
"~/www/mergequeue"
67-
"~/www/sibyl"
68-
"~/www/squealer"
69-
"~/www/vagrant"
70-
"~/repos/git"
71-
)
72-
)
73-
74-
(defun select-git-repository-from-list()
75-
(interactive)
76-
(with-output-to-temp-buffer "*git-repositories*"
77-
(with-current-buffer "*git-repositories*"
78-
(dolist (repo git-repositories)
79-
(insert-text-button repo 'action `(lambda (x) (delete-window) (magit-status ,repo)))
80-
(newline)))))
81-
(global-set-key (kbd "C-c \\") 'select-git-repository-from-list)
8250

8351

8452
;; Useful, but I am using projectile for most of the stuff I need tags for.
85-
8653
(defun recreate-tags()
8754
(interactive)
8855
(projectile-with-default-dir (projectile-project-root)
@@ -92,7 +59,6 @@
9259

9360

9461
;; I am not using gdb nowadays
95-
9662
(global-set-key [(f12)] 'gdb)
9763
(eval-after-load "gdb-mi"
9864
'(progn
@@ -127,9 +93,6 @@
12793

12894

12995
;; I am not using java/maven nowadays
130-
131-
132-
13396
(global-set-key [(meta f5)]
13497
(command (java-compile "pom.xml" "mvn clean install")))
13598
(global-set-key [(meta f6)]
@@ -139,6 +102,7 @@
139102
(global-set-key [(meta f8)]
140103
(command (java-compile "build.xml" "ant undeploy ; mvn install && ant deploy")))
141104

105+
142106
;; Remove maven false positives
143107
(add-hook 'compilation-mode-hook
144108
(lambda ()
@@ -151,7 +115,7 @@
151115
compilation-message nil help-echo nil mouse-face nil) t)))
152116
'append)))
153117

154-
118+
;; ??? This looks for inserting vars into golang based binaries at compile time
155119
(add-hook 'compilation-mode-hook
156120
(lambda ()
157121
(font-lock-add-keywords nil
@@ -161,7 +125,6 @@
161125
'append)))
162126

163127

164-
165128
;; This is fixed, but my faith on PHP mode is not great
166129
(eval-after-load "php-mode"
167130
'(progn
@@ -304,9 +267,7 @@
304267
(start-process "zeal" nil "zeal" "--query" (concat lang ":" symbol)))
305268

306269

307-
308270
;; I rarely used that anymore, replace bindings by move-line
309-
310271
(global-set-key [(super up)] 'prev-function-name-face)
311272
(global-set-key [(super down)] 'next-function-name-face)
312273

@@ -353,7 +314,6 @@
353314

354315

355316
;; packages disabled for a long timer
356-
357317
(use-package ctags
358318
:ensure t
359319
:disabled
@@ -562,7 +522,8 @@
562522
(autoload 'sdcv-search "sdcv")
563523
:bind ([(control c) ?d] . sdcv-search))
564524

565-
;; Thunderlink is not working well
525+
526+
;; Thunderlink is not working well :-(
566527
(defun juanleon/open-mail-at-point ()
567528
(interactive)
568529
(let ((link (thing-at-point 'line)))

0 commit comments

Comments
 (0)