aboutsummaryrefslogtreecommitdiffstats
path: root/doom-emacs
diff options
context:
space:
mode:
Diffstat (limited to 'doom-emacs')
-rw-r--r--doom-emacs/.doom.d/config.el50
-rw-r--r--doom-emacs/.doom.d/config.org50
-rw-r--r--doom-emacs/.doom.d/init.el38
m---------doom-emacs/.emacs.d0
l---------doom-emacs/.local/bin/doom1
l---------doom-emacs/.local/bin/org-capture1
l---------doom-emacs/.local/bin/org-tangle1
l---------doom-emacs/.local/share/config-files/doom-emacs_config1
l---------doom-emacs/.local/share/config-files/doom-emacs_init1
9 files changed, 74 insertions, 69 deletions
diff --git a/doom-emacs/.doom.d/config.el b/doom-emacs/.doom.d/config.el
index bcfb408..10d7116 100644
--- a/doom-emacs/.doom.d/config.el
+++ b/doom-emacs/.doom.d/config.el
@@ -1,9 +1,9 @@
(setq
- doom-font (font-spec :family "Source Code Pro" :size 20)
- doom-big-font (font-spec :family "Source Code Pro" :size 36)
- doom-variable-pitch-font (font-spec :family "Source Sans Pro" :size 18))
+ doom-font (font-spec :family "Fira Code" :size 14)
+ doom-big-font (font-spec :family "Fira Code" :size 24)
+ doom-variable-pitch-font (font-spec :family "Fira Code" :size 16))
-(setq projectile-project-search-path '("~/repos/" "~/Documents/Work/" "~/code"))
+(setq projectile-project-search-path '("~/Documents/Work" "~/code"))
(setq display-line-numbers-type 'relative)
@@ -33,7 +33,7 @@
(file+headline +org-capture-project-notes-file "Unreleased")
"* TODO %?\n%i\n%a" :prepend t :kill-buffer t))))
-(def-package! org-super-agenda
+(use-package! org-super-agenda
:after org-agenda
:init
(setq org-super-agenda-groups '((:name "Today"
@@ -63,29 +63,29 @@
(set-popup-rule! "^\\*Ilist"
:side 'right :size 35 :quit nil :select nil :ttl 0))
-(map! :leader
- (:prefix-map ("/" . "search"))
- (:when (featurep! :ui workspaces)
- (:prefix-map ("TAB" . "workspace")))
- (:prefix-map ("b" . "buffer"))
- (:prefix-map ("c" . "code"))
- (:prefix-map ("f" . "file"))
- (:prefix-map ("g" . "git"))
- (:prefix-map ("i" . "insert"))
- (:prefix-map ("n" . "notes"))
- (:prefix-map ("o" . "open")
- (:prefix-map ("p" . "project"))
- (:prefix-map ("q" . "session"))
- (:when (featurep! :editor upload)
- (:prefix-map ("r" . "remote")))
- (:when (featurep! :editor snipets)
- (:prefix-map ("s" . "snippets")))
- (:prefix-map ("t" . "toggle")
- :desc "Toggle imenu-list" "m" #'imenu-list-smart-toggle)))
+;;(map! :leader
+;; (:prefix-map ("/" . "search"))
+;; (:when (featurep! :ui workspaces)
+;; (:prefix-map ("TAB" . "workspace")))
+;; (:prefix-map ("b" . "buffer"))
+;; (:prefix-map ("c" . "code"))
+;; (:prefix-map ("f" . "file"))
+;; (:prefix-map ("g" . "git"))
+;; (:prefix-map ("i" . "insert"))
+;; (:prefix-map ("n" . "notes"))
+;; (:prefix-map ("o" . "open")
+;; (:prefix-map ("p" . "project"))
+;; (:prefix-map ("q" . "session"))
+;; (:when (featurep! :editor upload)
+;; (:prefix-map ("r" . "remote")))
+;; (:when (featurep! :editor snipets)
+;; (:prefix-map ("s" . "snippets")))
+;; (:prefix-map ("t" . "toggle")
+;; :desc "Toggle imenu-list" "m" #'imenu-list-smart-toggle)))
(setq dired-dwim-target t)
-(def-package! tide
+(use-package! tide
:after (typescript-mode company flycheck)
:hook ((typescript-mode . tide-setup)
(typescript-mode . tide-hl-identifier-mode)
diff --git a/doom-emacs/.doom.d/config.org b/doom-emacs/.doom.d/config.org
index bffa946..f3ada01 100644
--- a/doom-emacs/.doom.d/config.org
+++ b/doom-emacs/.doom.d/config.org
@@ -3,15 +3,15 @@
* Font settings
#+BEGIN_SRC emacs-lisp
(setq
- doom-font (font-spec :family "Source Code Pro" :size 20)
- doom-big-font (font-spec :family "Source Code Pro" :size 36)
- doom-variable-pitch-font (font-spec :family "Source Sans Pro" :size 18))
+ doom-font (font-spec :family "Fira Code" :size 14)
+ doom-big-font (font-spec :family "Fira Code" :size 24)
+ doom-variable-pitch-font (font-spec :family "Fira Code" :size 16))
#+END_SRC
* Projectile
Projectile Path
#+BEGIN_SRC emacs-lisp
-(setq projectile-project-search-path '("~/repos/" "~/Documents/Work/" "~/code"))
+(setq projectile-project-search-path '("~/Documents/Work" "~/code"))
#+END_SRC
* Relative line numbers
@@ -55,7 +55,7 @@ Org capture
Org Super Agenda
#+BEGIN_SRC emacs-lisp
-(def-package! org-super-agenda
+(use-package! org-super-agenda
:after org-agenda
:init
(setq org-super-agenda-groups '((:name "Today"
@@ -89,25 +89,25 @@ Org Super Agenda
#+END_SRC
* Leader keys
#+BEGIN_SRC emacs-lisp
-(map! :leader
- (:prefix-map ("/" . "search"))
- (:when (featurep! :ui workspaces)
- (:prefix-map ("TAB" . "workspace")))
- (:prefix-map ("b" . "buffer"))
- (:prefix-map ("c" . "code"))
- (:prefix-map ("f" . "file"))
- (:prefix-map ("g" . "git"))
- (:prefix-map ("i" . "insert"))
- (:prefix-map ("n" . "notes"))
- (:prefix-map ("o" . "open")
- (:prefix-map ("p" . "project"))
- (:prefix-map ("q" . "session"))
- (:when (featurep! :editor upload)
- (:prefix-map ("r" . "remote")))
- (:when (featurep! :editor snipets)
- (:prefix-map ("s" . "snippets")))
- (:prefix-map ("t" . "toggle")
- :desc "Toggle imenu-list" "m" #'imenu-list-smart-toggle)))
+;;(map! :leader
+;; (:prefix-map ("/" . "search"))
+;; (:when (featurep! :ui workspaces)
+;; (:prefix-map ("TAB" . "workspace")))
+;; (:prefix-map ("b" . "buffer"))
+;; (:prefix-map ("c" . "code"))
+;; (:prefix-map ("f" . "file"))
+;; (:prefix-map ("g" . "git"))
+;; (:prefix-map ("i" . "insert"))
+;; (:prefix-map ("n" . "notes"))
+;; (:prefix-map ("o" . "open")
+;; (:prefix-map ("p" . "project"))
+;; (:prefix-map ("q" . "session"))
+;; (:when (featurep! :editor upload)
+;; (:prefix-map ("r" . "remote")))
+;; (:when (featurep! :editor snipets)
+;; (:prefix-map ("s" . "snippets")))
+;; (:prefix-map ("t" . "toggle")
+;; :desc "Toggle imenu-list" "m" #'imenu-list-smart-toggle)))
#+END_SRC
* Dired
Do what I mean target allows dired to use window context for copying and moving
@@ -117,7 +117,7 @@ Do what I mean target allows dired to use window context for copying and moving
* Laguages
Typescript
#+BEGIN_SRC emacs-lisp
-(def-package! tide
+(use-package! tide
:after (typescript-mode company flycheck)
:hook ((typescript-mode . tide-setup)
(typescript-mode . tide-hl-identifier-mode)
diff --git a/doom-emacs/.doom.d/init.el b/doom-emacs/.doom.d/init.el
index 472a904..470647f 100644
--- a/doom-emacs/.doom.d/init.el
+++ b/doom-emacs/.doom.d/init.el
@@ -34,10 +34,11 @@
(popup ; tame sudden yet inevitable temporary windows
+all ; catch all popups that start with an asterix
+defaults) ; default popup rules
- ;;pretty-code ; replace bits of code with pretty symbols
- ;;tabbar ; FIXME an (incomplete) tab bar for Emacs
+ ;;(pretty-code) ; replace bits of code with pretty symbols
+ ;; +fira)
+ tabs ; a tab bar for Emacs
treemacs ; a project drawer, like neotree but cooler
- ;;unicode ; extended unicode support for various languages
+ unicode ; extended unicode support for various languages
vc-gutter ; vcs diff in the fringe
vi-tilde-fringe ; fringe tildes to mark beyond EOB
window-select ; visually switch windows
@@ -48,16 +49,19 @@
file-templates ; auto-snippets for empty files
fold ; (nigh) universal code folding
;;(format +onsave) ; automated prettiness
+ ;;god ; run Emacs commands without modifier keys
;;lispy ; vim for lisp, for people who dont like vim
multiple-cursors ; editing in many places at once
;;objed ; text object editing for the innocent
;;parinfer ; turn lisp into python, sort of
rotate-text ; cycle region at point between text candidates
snippets ; my elves. They type so I don't have to
+ word-wrap ; soft wrapping with language-aware indent
:emacs
dired ; making dired pretty [functional]
electric ; smarter, keyword-based electric-indent
+ ibuffer ; interactive buffer management
vc ; version-control and Emacs, sitting in a tree
:term
@@ -68,12 +72,12 @@
:tools
;;ansible
- ;;debugger ; FIXME stepping through code, to help you add bugs
+ debugger ; FIXME stepping through code, to help you add bugs
;;direnv
;;docker
editorconfig ; let someone else argue about tabs vs spaces
;;ein ; tame Jupyter notebooks with emacs
- eval ; run code, run (also, repls)
+ (eval +overlay) ; run code, run (also, repls)
flycheck ; tasing you for every semicolon you forget
;;flyspell ; tasing you for misspelling mispelling
;;gist ; interacting with github gists
@@ -90,7 +94,6 @@
;;terraform ; infrastructure as code
tmux ; an API for interacting with tmux
upload ; map local to remote projects via ssh/ftp
- wakatime
:lang
;;agda ; types of types of types of types...
@@ -104,14 +107,15 @@
;;crystal ; ruby at the speed of c
;;csharp ; unity, .NET, and mono shenanigans
data ; config/data formats
- erlang ; an elegant language for a more civilized age
elixir ; erlang done right
;;elm ; care for a cup of TEA?
emacs-lisp ; drown in parentheses
+ ;;erlang ; an elegant language for a more civilied age
;;ess ; emacs speaks statistics
- ;;fsharp ; ML stands for Microsoft's Language
+ ;;faust ; dsp, but you get to keep your soul
+ ;;fsharp ; ML stands for Microsoft's Language
go ; the hipster dialect
- ;;(haskell +intero) ; a language that's lazier than I am
+ ;;(haskell +dante) ; a language that's lazier than I am
;;hy ; readability of scheme w/ speed of python
;;idris ;
;;(java +meghanada) ; the poster child for carpal tunnel syndrome
@@ -119,6 +123,8 @@
;;julia ; a better, faster MATLAB
;;kotlin ; a better, slicker Java(Script)
latex ; writing papers in Emacs has never been so fun
+ ;;lean
+ ;;factor
ledger ; an accounting system in Emacs
;;lua ; one-based indices? one-based indices
markdown ; writing docs for people to ignore
@@ -138,6 +144,7 @@
;;qt ; the 'cutest' gui framework ever
;;racket ; a DSL for DSLs
rest ; Emacs as a REST client
+ ;;rst $ ReST in peace
ruby ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"}
rust ; Fe2O3.unwrap().unwrap().unwrap().unwrap()
;;scala ; java, but good
@@ -147,7 +154,6 @@
;;swift ; who asked for emoji variables?
;;terra ; Earth and Moon in alignment for performance.
web ; the tubes
- ;;vala ; GObjective-C
:email
;;(mu4e +gmail) ; WIP
@@ -162,16 +168,10 @@
;;irc ; how neckbeards socialize
;;(rss +org) ; emacs as an RSS reader
;;twitter ; twitter client https://twitter.com/vnought
- (write ; emacs for writers (fiction, notes, papers, etc.)
- +wordnut ; wordnet (wn) search
- +langtool) ; a proofreader (grammar/style check) for Emacs
+ ;;(write ; emacs for writers (fiction, notes, papers, etc.)
+ ;; +wordnut ; wordnet (wn) search
+ ;; +langtool) ; a proofreader (grammar/style check) for Emacs
:config
- ;; For literate config users. This will tangle+compile a config.org
- ;; literate config in your `doom-private-dir' whenever it changes.
literate
-
- ;; The default module sets reasonable defaults for Emacs. It also
- ;; provides a Spacemacs-inspired keybinding scheme and a smartparens
- ;; config. Use it as a reference for your own modules.
(default +bindings +smartparens))
diff --git a/doom-emacs/.emacs.d b/doom-emacs/.emacs.d
-Subproject ea34b111945fbd6d9719de36b64331e9033a1c3
+Subproject 0dc173a63156e8a875705d1ef9e820120c42083
diff --git a/doom-emacs/.local/bin/doom b/doom-emacs/.local/bin/doom
new file mode 120000
index 0000000..088002a
--- /dev/null
+++ b/doom-emacs/.local/bin/doom
@@ -0,0 +1 @@
+../../.emacs.d/bin/doom \ No newline at end of file
diff --git a/doom-emacs/.local/bin/org-capture b/doom-emacs/.local/bin/org-capture
new file mode 120000
index 0000000..43a2703
--- /dev/null
+++ b/doom-emacs/.local/bin/org-capture
@@ -0,0 +1 @@
+../../.emacs.d/bin/org-capture \ No newline at end of file
diff --git a/doom-emacs/.local/bin/org-tangle b/doom-emacs/.local/bin/org-tangle
new file mode 120000
index 0000000..685ce04
--- /dev/null
+++ b/doom-emacs/.local/bin/org-tangle
@@ -0,0 +1 @@
+../../.emacs.d/bin/org-tangle \ No newline at end of file
diff --git a/doom-emacs/.local/share/config-files/doom-emacs_config b/doom-emacs/.local/share/config-files/doom-emacs_config
new file mode 120000
index 0000000..444f7a3
--- /dev/null
+++ b/doom-emacs/.local/share/config-files/doom-emacs_config
@@ -0,0 +1 @@
+../../../.doom.d/config.org \ No newline at end of file
diff --git a/doom-emacs/.local/share/config-files/doom-emacs_init b/doom-emacs/.local/share/config-files/doom-emacs_init
new file mode 120000
index 0000000..69c2377
--- /dev/null
+++ b/doom-emacs/.local/share/config-files/doom-emacs_init
@@ -0,0 +1 @@
+../../../.doom.d/init.el \ No newline at end of file
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-10 11:39:09 +0000