Compare commits
4 commits
858c2b086e
...
7d870bde5e
| Author | SHA1 | Date | |
|---|---|---|---|
| 7d870bde5e | |||
| 2fb9b350da | |||
| 221bea9e0b | |||
| 3593f1c153 |
6 changed files with 77 additions and 35 deletions
|
|
@ -56,6 +56,12 @@
|
||||||
(setq use-package-always-ensure t)
|
(setq use-package-always-ensure t)
|
||||||
(setq use-package-verbose t)
|
(setq use-package-verbose t)
|
||||||
#+end_src
|
#+end_src
|
||||||
|
** Set up path correctly
|
||||||
|
#+begin_src emacs-lisp
|
||||||
|
(use-package exec-path-from-shell
|
||||||
|
:config
|
||||||
|
(exec-path-from-shell-initialize))
|
||||||
|
#+end_src
|
||||||
** Automatic updates
|
** Automatic updates
|
||||||
#+begin_src emacs-lisp
|
#+begin_src emacs-lisp
|
||||||
(use-package auto-package-update
|
(use-package auto-package-update
|
||||||
|
|
@ -134,8 +140,22 @@
|
||||||
*** Catppuccin
|
*** Catppuccin
|
||||||
#+begin_src emacs-lisp
|
#+begin_src emacs-lisp
|
||||||
(use-package catppuccin-theme
|
(use-package catppuccin-theme
|
||||||
|
:config)
|
||||||
|
; (load-theme 'catppuccin :no-confirm))
|
||||||
|
#+end_src
|
||||||
|
*** Modus Themes
|
||||||
|
#+begin_src emacs-lisp
|
||||||
|
(use-package emacs
|
||||||
:config
|
:config
|
||||||
(load-theme 'catppuccin :no-confirm))
|
(require-theme 'modus-themes)
|
||||||
|
(setq modus-themes-italic-constructs t
|
||||||
|
modus-themes-bold-constructs t
|
||||||
|
modus-themes-links '(no-underline background faint)
|
||||||
|
modus-themes-prompts '(bold intense)
|
||||||
|
modus-themes-mode-line '(borderless accented moody)
|
||||||
|
modus-themes-org-blocks 'gray-background
|
||||||
|
modus-themes-region '(bg-only no-extend))
|
||||||
|
(load-theme 'modus-operandi :no-confirm))
|
||||||
#+end_src
|
#+end_src
|
||||||
* Completion
|
* Completion
|
||||||
** Vertico
|
** Vertico
|
||||||
|
|
@ -276,17 +296,13 @@
|
||||||
:host github
|
:host github
|
||||||
:repo "idris-community/idris2-mode"))
|
:repo "idris-community/idris2-mode"))
|
||||||
#+end_src
|
#+end_src
|
||||||
** Sage
|
** C
|
||||||
#+begin_src emacs-lisp
|
#+begin_src emacs-lisp
|
||||||
(use-package sage-shell-mode
|
(use-package emacs
|
||||||
:hook
|
:hook
|
||||||
(sage-shell-mode . eldoc-mode)
|
(c-mode . electric-pair-mode)
|
||||||
(sage-shell:sage-mode . eldoc-mode)
|
|
||||||
(sage-shell-after-prompt . sage-shell-view-mode)
|
|
||||||
:custom
|
:custom
|
||||||
(sage-shell-view-default-resolution 250)
|
(c-default-style '((java-mode . "java") (awk-mode . "awk") (other . "linux"))))
|
||||||
:config
|
|
||||||
(sage-shell:define-alias))
|
|
||||||
#+end_src
|
#+end_src
|
||||||
* Latex
|
* Latex
|
||||||
** Auctex
|
** Auctex
|
||||||
|
|
@ -367,6 +383,8 @@
|
||||||
"PP" "\\P"
|
"PP" "\\P"
|
||||||
"FF" "\\F"
|
"FF" "\\F"
|
||||||
"HH" "\\H"
|
"HH" "\\H"
|
||||||
|
"SS" "\\Ss"
|
||||||
|
"TT" "\\T"
|
||||||
"\\\\\\" "\\setminus"
|
"\\\\\\" "\\setminus"
|
||||||
"s=" "\\subseteq"
|
"s=" "\\subseteq"
|
||||||
"s<" "\\subset"
|
"s<" "\\subset"
|
||||||
|
|
@ -379,23 +397,46 @@
|
||||||
#+end_src
|
#+end_src
|
||||||
* Org Mode
|
* Org Mode
|
||||||
** Org itself
|
** Org itself
|
||||||
|
I'm using the fork as described [[https://abode.karthinks.com/org-latex-preview/][here]] in order to have much better LaTeX previews. This is eventually supposed to be merged into emacs proper, which would be nice.
|
||||||
#+begin_src emacs-lisp
|
#+begin_src emacs-lisp
|
||||||
(use-package org
|
(use-package org
|
||||||
:straight (:type built-in)
|
:defer
|
||||||
|
:straight `(org
|
||||||
|
:fork (:host nil
|
||||||
|
:repo "https://git.tecosaur.net/tec/org-mode.git"
|
||||||
|
:branch "dev"
|
||||||
|
:remote "tecosaur")
|
||||||
|
:files (:defaults "etc")
|
||||||
|
:build t
|
||||||
|
:pre-build
|
||||||
|
(with-temp-file "org-version.el"
|
||||||
|
(require 'lisp-mnt)
|
||||||
|
(let ((version
|
||||||
|
(with-temp-buffer
|
||||||
|
(insert-file-contents "lisp/org.el")
|
||||||
|
(lm-header "version")))
|
||||||
|
(git-version
|
||||||
|
(string-trim
|
||||||
|
(with-temp-buffer
|
||||||
|
(call-process "git" nil t nil "rev-parse" "--short" "HEAD")
|
||||||
|
(buffer-string)))))
|
||||||
|
(insert
|
||||||
|
(format "(defun org-release () \"The release version of Org.\" %S)\n" version)
|
||||||
|
(format "(defun org-git-version () \"The truncate git commit hash of Org mode.\" %S)\n" git-version)
|
||||||
|
"(provide 'org-version)\n")))
|
||||||
|
:pin nil)
|
||||||
:init
|
:init
|
||||||
(setq org-list-allow-alphabetical t)
|
(setq org-list-allow-alphabetical t)
|
||||||
:custom
|
:custom
|
||||||
(org-startup-indented t)
|
(org-startup-indented t)
|
||||||
(org-pretty-entities t)
|
|
||||||
(org-hide-emphasis-markers t)
|
(org-hide-emphasis-markers t)
|
||||||
(org-startup-with-inline-images t)
|
(org-startup-with-inline-images t)
|
||||||
(org-image-actual-width '(300))
|
(org-image-actual-width '(300))
|
||||||
(org-export-with-smart-quotes t)
|
(org-export-with-smart-quotes t)
|
||||||
|
(org-latex-preview-live t)
|
||||||
(org-directory "~/Nextcloud/org")
|
(org-directory "~/Nextcloud/org")
|
||||||
(org-cite-global-bibliography '("~/Nextcloud/library.bib"))
|
(org-cite-global-bibliography '("~/Nextcloud/library.bib"))
|
||||||
(org-agenda-files `(,org-directory))
|
(org-agenda-files `(,org-directory))
|
||||||
(org-preview-latex-default-process 'imagemagick)
|
|
||||||
(org-highlight-latex-and-related '(native))
|
|
||||||
(org-default-notes-file (mapcar (lambda (x) (concat org-directory x))
|
(org-default-notes-file (mapcar (lambda (x) (concat org-directory x))
|
||||||
'("/todo.org" "/done.org")))
|
'("/todo.org" "/done.org")))
|
||||||
:after ox-latex
|
:after ox-latex
|
||||||
|
|
@ -411,7 +452,8 @@
|
||||||
("C-c l" . org-store-link)
|
("C-c l" . org-store-link)
|
||||||
("C-c a" . org-agenda))
|
("C-c a" . org-agenda))
|
||||||
:hook (org-mode . visual-line-mode)
|
:hook (org-mode . visual-line-mode)
|
||||||
(org-mode . flyspell-mode))
|
(org-mode . flyspell-mode)
|
||||||
|
(org-mode . org-latex-preview-auto-mode))
|
||||||
#+end_src
|
#+end_src
|
||||||
** Prettify
|
** Prettify
|
||||||
#+begin_src emacs-lisp
|
#+begin_src emacs-lisp
|
||||||
|
|
@ -427,12 +469,6 @@
|
||||||
(require 'oc-natbib)
|
(require 'oc-natbib)
|
||||||
(require 'oc-biblatex)
|
(require 'oc-biblatex)
|
||||||
#+end_src
|
#+end_src
|
||||||
** Org fragtog
|
|
||||||
Once [[https://abode.karthinks.com/org-latex-preview/][the improvements to =org-latex-preview= get merged]], this will be unnecessary. For now, however, this really comes in handy.
|
|
||||||
#+begin_src emacs-lisp
|
|
||||||
(use-package org-fragtog
|
|
||||||
:hook (org-mode . org-fragtog-mode))
|
|
||||||
#+end_src
|
|
||||||
* Pdfs
|
* Pdfs
|
||||||
** Pdf tools
|
** Pdf tools
|
||||||
#+begin_src emacs-lisp
|
#+begin_src emacs-lisp
|
||||||
|
|
@ -462,11 +498,6 @@ Once [[https://abode.karthinks.com/org-latex-preview/][the improvements to =org-
|
||||||
(defalias 'ff 'find-file)
|
(defalias 'ff 'find-file)
|
||||||
(defalias 'fo 'find-file-other-window)
|
(defalias 'fo 'find-file-other-window)
|
||||||
(defalias 'clear 'clear-scrollback)
|
(defalias 'clear 'clear-scrollback)
|
||||||
|
|
||||||
(use-package exec-path-from-shell
|
|
||||||
:config
|
|
||||||
(when (daemonp)
|
|
||||||
(exec-path-from-shell-initialize)))
|
|
||||||
#+end_src
|
#+end_src
|
||||||
** Dired
|
** Dired
|
||||||
#+begin_src emacs-lisp
|
#+begin_src emacs-lisp
|
||||||
|
|
|
||||||
|
|
@ -8,22 +8,26 @@ return {
|
||||||
{
|
{
|
||||||
'<leader>rs',
|
'<leader>rs',
|
||||||
[[:SMLReplStart<CR>]],
|
[[:SMLReplStart<CR>]],
|
||||||
desc = 'SML start repl'
|
desc = 'SML start repl',
|
||||||
|
ft = 'sml'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
'<leader>rc',
|
'<leader>rc',
|
||||||
[[:SMLReplClear<CR>]],
|
[[:SMLReplClear<CR>]],
|
||||||
desc = 'SML clear repl'
|
desc = 'SML clear repl',
|
||||||
|
ft = 'sml'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
'<leader>rb',
|
'<leader>rb',
|
||||||
[[:SMLReplBuild<CR>]],
|
[[:SMLReplBuild<CR>]],
|
||||||
desc = 'SML load current file/CM project in repl'
|
desc = 'SML load current file/CM project in repl',
|
||||||
|
ft = 'sml'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
'<leader>ro',
|
'<leader>ro',
|
||||||
[[:SMLReplOpen<CR>]],
|
[[:SMLReplOpen<CR>]],
|
||||||
desc = 'SML open current structure in repl'
|
desc = 'SML open current structure in repl',
|
||||||
|
ft = 'sml'
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,9 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
prefix=$HOME/Nextcloud/Books/
|
prefix=$HOME/Nextcloud/Books/
|
||||||
|
dmenu=pipemenu
|
||||||
|
pdf="flatpak run org.gnome.Papers"
|
||||||
|
|
||||||
choice=$(find $prefix -type f | sed "s|$prefix||;s/_/ /g" | fuzzel -d -w 60)
|
choice=$(find $prefix -type f | sed "s|$prefix||;s/_/ /g" | $dmenu)
|
||||||
|
|
||||||
test -n "$choice" && zathura $(echo $choice | sed "s/ /_/g;s|^|$prefix|") &
|
test -n "$choice" && $pdf $(echo $choice | sed "s/ /_/g;s|^|$prefix|") &
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,9 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
prefix=$HOME/Nextcloud/Papers/
|
prefix=$HOME/Nextcloud/Papers/
|
||||||
|
dmenu=pipemenu
|
||||||
|
pdf="flatpak run org.gnome.Papers"
|
||||||
|
|
||||||
choice=$(find $prefix -type f | sed "s|$prefix||;s/_/ /g" | fuzzel -d -w 60)
|
choice=$(find $prefix -type f | sed "s|$prefix||;s/_/ /g" | $dmenu)
|
||||||
|
|
||||||
test -n "$choice" && zathura $(echo $choice | sed "s/ /_/g;s|^|$prefix|") &
|
test -n "$choice" && $pdf $(echo $choice | sed "s/ /_/g;s|^|$prefix|") &
|
||||||
|
|
|
||||||
|
|
@ -49,3 +49,5 @@ eval "$(zoxide init zsh)"
|
||||||
|
|
||||||
# prompt
|
# prompt
|
||||||
eval "$(starship init zsh)"
|
eval "$(starship init zsh)"
|
||||||
|
|
||||||
|
[ -f "/home/wball/.local/share/ghcup/env" ] && . "/home/wball/.local/share/ghcup/env" # ghcup-env
|
||||||
|
|
@ -1,2 +1,3 @@
|
||||||
export XDG_CONFIG_HOME="$HOME/.config"
|
export XDG_CONFIG_HOME="$HOME/.config"
|
||||||
export ZDOTDIR="$XDG_CONFIG_HOME/zsh"
|
export ZDOTDIR="$XDG_CONFIG_HOME/zsh"
|
||||||
|
. "/home/wball/.local/share/cargo/env"
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue