Skip to content

Commit 2cb9d3b

Browse files
a13a13
committed
update
1 parent fd9c986 commit 2cb9d3b

File tree

2 files changed

+199
-168
lines changed

2 files changed

+199
-168
lines changed

‎README.org‎

Lines changed: 102 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,8 @@
123123
:custom
124124
(system-packages-noconfirm t))
125125

126-
(use-package use-package-ensure-system-package
127-
:ensure t)
126+
;; (use-package use-package-ensure-system-package
127+
;; :ensure t)
128128
#+END_SRC
129129
*** [[https://github.com/quelpa/quelpa][Quelpa]] "is a tool to compile and install Emacs Lisp packages locally from local or remote source code"
130130

@@ -373,8 +373,8 @@
373373
#+BEGIN_SRC emacs-lisp
374374
(use-package exec-path-from-shell
375375
:ensure t
376-
:defer t
377-
;; :config
376+
;; :defer t
377+
:config
378378
;; (let ((inject-env-vars
379379
;; '("MT2_ENV"
380380
;; "MT2_CLUSTER"
@@ -386,7 +386,7 @@
386386
;; "AWS_DEFAULT_PROFILE")))
387387
;; (dolist (var inject-env-vars)
388388
;; (add-to-list 'exec-path-from-shell-variables var)))
389-
;; (exec-path-from-shell-initialize)
389+
(exec-path-from-shell-initialize)
390390
)
391391

392392
(use-package xr
@@ -664,11 +664,6 @@
664664
:custom
665665
(olivetti-body-width 95))
666666

667-
(use-package font-lock+
668-
:defer t
669-
:quelpa
670-
(font-lock+ :repo "emacsmirror/font-lock-plus" :fetcher github))
671-
672667
(use-package all-the-icons
673668
:ensure t
674669
:defer t
@@ -996,6 +991,22 @@
996991
(use-package elec-pair
997992
:config
998993
(electric-pair-mode))
994+
(add-hook 'clojure-mode-hook #'aggressive-indent-mode)
995+
(add-hook 'emacs-lisp-mode-hook #'aggressive-indent-mode)
996+
(add-hook 'lisp-mode-hook #'aggressive-indent-mode)
997+
(add-hook 'scheme-mode-hook #'aggressive-indent-mode)
998+
999+
(use-package aggressive-indent
1000+
:ensure t
1001+
:hook
1002+
((clojure-mode lisp-data-mode scheme-mode) . aggressive-indent-mode))
1003+
1004+
(use-package adjust-parens
1005+
:ensure t
1006+
:custom
1007+
(adjust-parens-fallback-indent-function company-indent-or-complete-common)
1008+
:hook
1009+
((clojure-mode lisp-data-mode scheme-mode) . adjust-parens-mode))
9991010

10001011
(use-package edit-indirect
10011012
:ensure t
@@ -1006,9 +1017,7 @@
10061017

10071018
(use-package clipmon
10081019
:ensure t
1009-
:defer 0.1
1010-
:config
1011-
(clipmon-mode))
1020+
:hook (after-init . clipmon-mode-start))
10121021

10131022
(use-package copy-as-format
10141023
:ensure t
@@ -1145,13 +1154,13 @@
11451154

11461155
** Slack
11471156
#+BEGIN_SRC emacs-lisp
1148-
(use-package slack
1149-
:ensure t
1150-
:defer t
1151-
:commands (slack-start)
1152-
:custom
1153-
(slack-buffer-emojify t "enable emoji")
1154-
(slack-prefer-current-team t))
1157+
;; (use-package slack
1158+
;; :ensure t
1159+
;; :defer t
1160+
;; :commands (slack-start)
1161+
;; :custom
1162+
;; (slack-buffer-emojify t "enable emoji")
1163+
;; (slack-prefer-current-team t))
11551164

11561165
;; (use-package secrets-slack
11571166
;; :load t
@@ -1591,6 +1600,7 @@
15911600

15921601
(use-package avy-flycheck
15931602
:ensure t
1603+
:after avy flycheck
15941604
:defer t
15951605
:config
15961606
(avy-flycheck-setup))
@@ -1731,7 +1741,6 @@
17311741
(clojurec-mode . anakondo-minor-mode))
17321742

17331743
(use-package flycheck-clj-kondo
1734-
:defer t
17351744
:after cider
17361745
:ensure t)
17371746

@@ -1779,7 +1788,15 @@
17791788

17801789
(use-package cider-storm
17811790
:defer t
1782-
:quelpa (cider-storm :fetcher github :repo "flow-storm/cider-storm"))
1791+
:quelpa
1792+
(cider-storm :fetcher github :repo "flow-storm/cider-storm"))
1793+
1794+
(use-package data-navigator
1795+
:defer t
1796+
:quelpa
1797+
(data-navigator :fetcher github :repo "a13/data-navigator.el")
1798+
:config
1799+
(require 'data-navigator-tap))
17831800
#+END_SRC
17841801

17851802
*** Common Lisp
@@ -1802,6 +1819,7 @@
18021819
#+BEGIN_SRC emacs-lisp
18031820
(use-package erlang
18041821
:ensure t
1822+
:disabled
18051823
:defer t
18061824
:custom
18071825
(erlang-compile-extra-opts '(debug_info))
@@ -1811,6 +1829,7 @@
18111829

18121830
(use-package company-erlang
18131831
:ensure t
1832+
:disabled
18141833
:hook
18151834
(erlang-mode #'company-erlang-init))
18161835
#+END_SRC
@@ -1826,15 +1845,6 @@
18261845
*** JS
18271846

18281847
#+BEGIN_SRC emacs-lisp
1829-
(use-package conkeror-minor-mode
1830-
:ensure t
1831-
:disabled
1832-
:defer t
1833-
:hook
1834-
(js-mode . (lambda ()
1835-
(when (string-match "conkeror" (or (buffer-file-name) ""))
1836-
(conkeror-minor-mode 1)))))
1837-
18381848
(use-package json-mode
18391849
:ensure t
18401850
:defer t)
@@ -1864,11 +1874,12 @@
18641874
*** Configuration files
18651875
#+BEGIN_SRC emacs-lisp
18661876
(use-package apt-sources-list
1877+
:defer t
18671878
:ensure t)
18681879

18691880
(use-package ssh-config-mode
18701881
:ensure t
1871-
:init
1882+
:init ; do we still need this one?
18721883
(autoload 'ssh-config-mode "ssh-config-mode" t)
18731884
:mode
18741885
(("/\\.ssh/config\\'" . ssh-config-mode)
@@ -1891,14 +1902,14 @@
18911902
(markdown-fontify-code-blocks-natively t)
18921903
(markdown-command "markdown"))
18931904

1894-
(use-package jira-markup-mode
1895-
:ensure t
1896-
:defer t
1897-
:after atomic-chrome
1898-
:mode ("\\.confluence$" . jira-markup-mode)
1899-
:custom-update
1900-
(atomic-chrome-url-major-mode-alist
1901-
'(("atlassian\\.net$" . jira-markup-mode))))
1905+
;; (use-package jira-markup-mode
1906+
;; :ensure t
1907+
;; :defer t
1908+
;; :after atomic-chrome
1909+
;; :mode ("\\.confluence$" . jira-markup-mode)
1910+
;; :custom-update
1911+
;; (atomic-chrome-url-major-mode-alist
1912+
;; '(("atlassian\\.net$" . jira-markup-mode))))
19021913

19031914
#+END_SRC
19041915

@@ -1909,55 +1920,55 @@
19091920
:mode
19101921
(("\\.[Cc][Ss][Vv]\\'" . csv-mode)))
19111922

1912-
(use-package groovy-mode
1913-
:defer t
1914-
:ensure t
1915-
:custom
1916-
(groovy-indent-offset 2))
1917-
1918-
(use-package jenkinsfile-mode
1919-
:defer t
1920-
:quelpa
1921-
(jenkinsfile-mode :repo "john2x/jenkinsfile-mode" :fetcher github))
1923+
;; (use-package groovy-mode
1924+
;; :defer t
1925+
;; :ensure t
1926+
;; :custom
1927+
;; (groovy-indent-offset 2))
19221928

1923-
(use-package aql-mode
1924-
:defer t
1925-
:quelpa
1926-
(aql-mode :repo "a13/aql-mode" :fetcher github)
1927-
:mode
1928-
(("\\.arango$" . aql-mode)))
1929+
;; (use-package jenkinsfile-mode
1930+
;; :defer t
1931+
;; :quelpa
1932+
;; (jenkinsfile-mode :repo "john2x/jenkinsfile-mode" :fetcher github))
19291933

1934+
;; (use-package aql-mode
1935+
;; :defer t
1936+
;; :quelpa
1937+
;; (aql-mode :repo "a13/aql-mode" :fetcher github)
1938+
;; :mode
1939+
;; (("\\.arango$" . aql-mode)))
19301940

19311941
(use-package sfz-mode
19321942
:defer t
19331943
:ensure t)
19341944
#+END_SRC
19351945

19361946
*** HTTP
1947+
Just use Clojure/babashka http client.
19371948
#+BEGIN_SRC emacs-lisp
1938-
(use-package restclient
1939-
:ensure t
1940-
:mode
1941-
("\\.http\\'" . restclient-mode))
1949+
;; (use-package restclient
1950+
;; :ensure t
1951+
;; :mode
1952+
;; ("\\.http\\'" . restclient-mode))
19421953

1943-
(use-package restclient-test
1944-
:ensure t
1945-
:hook
1946-
(restclient-mode-hook . restclient-test-mode))
1947-
1948-
(use-package ob-restclient
1949-
:ensure t
1950-
:after org restclient
1951-
:init
1952-
(org-babel-do-load-languages
1953-
'org-babel-load-languages
1954-
'((restclient . t))))
1955-
1956-
(use-package company-restclient
1957-
:ensure t
1958-
:after (company restclient)
1959-
:custom-update
1960-
(company-backends '(company-restclient)))
1954+
;; (use-package restclient-test
1955+
;; :ensure t
1956+
;; :hook
1957+
;; (restclient-mode-hook . restclient-test-mode))
1958+
1959+
;; (use-package ob-restclient
1960+
;; :ensure t
1961+
;; :after org restclient
1962+
;; :init
1963+
;; (org-babel-do-load-languages
1964+
;; 'org-babel-load-languages
1965+
;; '((restclient . t))))
1966+
1967+
;; (use-package company-restclient
1968+
;; :ensure t
1969+
;; :after (company restclient)
1970+
;; :custom-update
1971+
;; (company-backends '(company-restclient)))
19611972
#+END_SRC
19621973

19631974
* External utilities
@@ -2008,19 +2019,25 @@
20082019
#+END_SRC
20092020
** Kubernetes
20102021
#+BEGIN_SRC emacs-lisp
2011-
(use-package k8s-mode
2012-
:ensure t
2013-
:hook (k8s-mode . yas-minor-mode))
2022+
;; (use-package k8s-mode
2023+
;; :ensure t
2024+
;; :hook (k8s-mode . yas-minor-mode))
20142025

2015-
(use-package kubernetes
2016-
:ensure t
2017-
:commands (kubernetes-overview))
2026+
;; (use-package kubernetes
2027+
;; :ensure t
2028+
;; :commands (kubernetes-overview))
20182029
#+END_SRC
20192030

20202031
** Misc
20212032
[[https://github.com/syohex/emacs-emamux][Tmux interaction]]
20222033
#+BEGIN_SRC emacs-lisp
2023-
(use-package emamux
2034+
;; (use-package emamux
2035+
;; :ensure t
2036+
;; :defer t)
2037+
#+END_SRC
2038+
2039+
#+BEGIN_SRC emacs-lisp
2040+
(use-package gptel
20242041
:ensure t
20252042
:defer t)
20262043
#+END_SRC

0 commit comments

Comments
 (0)