aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
m---------basics/.config/rofi/themes/gruvbox0
-rw-r--r--basics/.config/systemd/user/emacs.service2
-rw-r--r--doom-emacs/.doom.d/.projectile0
-rw-r--r--doom-emacs/.doom.d/config.el91
-rw-r--r--doom-emacs/.doom.d/config.org121
-rw-r--r--doom-emacs/.doom.d/init.el48
-rw-r--r--doom-emacs/.doom.d/packages.el9
m---------doom-emacs/.emacs.d0
-rw-r--r--fish/.config/omf/bundle13
-rw-r--r--fish/.config/omf/channel1
-rw-r--r--fish/.config/omf/theme1
m---------fish/.local/share/omf0
12 files changed, 246 insertions, 40 deletions
diff --git a/basics/.config/rofi/themes/gruvbox b/basics/.config/rofi/themes/gruvbox
-Subproject 8f3d68d70ecb19ded014cf5cde53ab9857728f6
+Subproject 0b4cf703087e2150968826b7508cf119437eba7
diff --git a/basics/.config/systemd/user/emacs.service b/basics/.config/systemd/user/emacs.service
index aea1af0..f3d7df9 100644
--- a/basics/.config/systemd/user/emacs.service
+++ b/basics/.config/systemd/user/emacs.service
@@ -3,7 +3,7 @@ Description=Emacs text editor
Documentation=info:emacs man:emacs(1) https://gnu.org/software/emacs/
[Service]
-Type=forking
+Type=simple
ExecStart=/usr/bin/emacs --fg-daemon
ExecStop=/usr/bin/emacsclient --eval "(kill-emacs)"
Environment=SSH_AUTH_SOCK=%t/keyring/ssh
diff --git a/doom-emacs/.doom.d/.projectile b/doom-emacs/.doom.d/.projectile
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/doom-emacs/.doom.d/.projectile
diff --git a/doom-emacs/.doom.d/config.el b/doom-emacs/.doom.d/config.el
index 6d0657c..bcfb408 100644
--- a/doom-emacs/.doom.d/config.el
+++ b/doom-emacs/.doom.d/config.el
@@ -1 +1,92 @@
+(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))
+
+(setq projectile-project-search-path '("~/repos/" "~/Documents/Work/" "~/code"))
+
(setq display-line-numbers-type 'relative)
+
+(add-hook 'org-mode-hook #'auto-fill-mode)
+
+(after! org
+ (map! :map org-mode-map
+ :n "M-j" #'org-metadown
+ :n "M-k" #'org-metaup
+ ))
+
+(after! org
+ (setq org-capture-templates '(("t" "Personal todo" entry
+ (file+headline +org-capture-todo-file "Inbox")
+ "* TODO %?\n%i\n%a" :prepend t :kill-buffer t)
+ ("n" "Personal notes" entry
+ (file+headline +org-capture-notes-file "Inbox")
+ "* %u %?\n%i\n%a" :prepend t :kill-buffer t)
+ ("p" "Templates for projects")
+ ("pt" "Project todo" entry
+ (file+headline +org-capture-project-todo-file "Inbox")
+ "* TODO %?\n%i\n%a" :prepend t :kill-buffer t)
+ ("pn" "Project notes" entry
+ (file+headline +org-capture-project-notes-file "Inbox")
+ "* TODO %?\n%i\n%a" :prepend t :kill-buffer t)
+ ("pc" "Project changelog" entry
+ (file+headline +org-capture-project-notes-file "Unreleased")
+ "* TODO %?\n%i\n%a" :prepend t :kill-buffer t))))
+
+(def-package! org-super-agenda
+ :after org-agenda
+ :init
+ (setq org-super-agenda-groups '((:name "Today"
+ :time-grid t
+ :scheduled today)
+ (:name "Due today"
+ :deadline today)
+ (:name "Important"
+ :priority "A")
+ (:name "Overdue"
+ :deadline past)
+ (:name "Due soon"
+ :deadline future)
+ (:name "Big Outcomes"
+ :tag "bo")))
+ :config
+ (org-super-agenda-mode)
+)
+
+(setq imenu-anywhere-delimiter ": ")
+
+(add-hook 'imenu-after-jump-hook #'better-jumper-set-jump)
+
+(after! imenu-list
+ (setq imenu-list-idle-update-delay 0.5)
+
+ (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)))
+
+(setq dired-dwim-target t)
+
+(def-package! tide
+ :after (typescript-mode company flycheck)
+ :hook ((typescript-mode . tide-setup)
+ (typescript-mode . tide-hl-identifier-mode)
+ (before-save . tide-format-before-save)))
diff --git a/doom-emacs/.doom.d/config.org b/doom-emacs/.doom.d/config.org
index 33d3556..bffa946 100644
--- a/doom-emacs/.doom.d/config.org
+++ b/doom-emacs/.doom.d/config.org
@@ -1,6 +1,125 @@
#+TITLE: config
+* 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))
+#+END_SRC
+
+* Projectile
+Projectile Path
+#+BEGIN_SRC emacs-lisp
+(setq projectile-project-search-path '("~/repos/" "~/Documents/Work/" "~/code"))
+#+END_SRC
+
* Relative line numbers
-#+BEGIN_SRC elisp
+#+BEGIN_SRC emacs-lisp
(setq display-line-numbers-type 'relative)
#+END_SRC
+
+* Org
+#+BEGIN_SRC emacs-lisp
+(add-hook 'org-mode-hook #'auto-fill-mode)
+#+END_SRC
+
+#+BEGIN_SRC emacs-lisp
+(after! org
+ (map! :map org-mode-map
+ :n "M-j" #'org-metadown
+ :n "M-k" #'org-metaup
+ ))
+#+END_SRC
+
+Org capture
+#+BEGIN_SRC emacs-lisp
+(after! org
+ (setq org-capture-templates '(("t" "Personal todo" entry
+ (file+headline +org-capture-todo-file "Inbox")
+ "* TODO %?\n%i\n%a" :prepend t :kill-buffer t)
+ ("n" "Personal notes" entry
+ (file+headline +org-capture-notes-file "Inbox")
+ "* %u %?\n%i\n%a" :prepend t :kill-buffer t)
+ ("p" "Templates for projects")
+ ("pt" "Project todo" entry
+ (file+headline +org-capture-project-todo-file "Inbox")
+ "* TODO %?\n%i\n%a" :prepend t :kill-buffer t)
+ ("pn" "Project notes" entry
+ (file+headline +org-capture-project-notes-file "Inbox")
+ "* TODO %?\n%i\n%a" :prepend t :kill-buffer t)
+ ("pc" "Project changelog" entry
+ (file+headline +org-capture-project-notes-file "Unreleased")
+ "* TODO %?\n%i\n%a" :prepend t :kill-buffer t))))
+#+END_SRC
+
+Org Super Agenda
+#+BEGIN_SRC emacs-lisp
+(def-package! org-super-agenda
+ :after org-agenda
+ :init
+ (setq org-super-agenda-groups '((:name "Today"
+ :time-grid t
+ :scheduled today)
+ (:name "Due today"
+ :deadline today)
+ (:name "Important"
+ :priority "A")
+ (:name "Overdue"
+ :deadline past)
+ (:name "Due soon"
+ :deadline future)
+ (:name "Big Outcomes"
+ :tag "bo")))
+ :config
+ (org-super-agenda-mode)
+)
+#+END_SRC
+* IMenu
+#+BEGIN_SRC emacs-lisp
+(setq imenu-anywhere-delimiter ": ")
+
+(add-hook 'imenu-after-jump-hook #'better-jumper-set-jump)
+
+(after! imenu-list
+ (setq imenu-list-idle-update-delay 0.5)
+
+ (set-popup-rule! "^\\*Ilist"
+ :side 'right :size 35 :quit nil :select nil :ttl 0))
+#+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)))
+#+END_SRC
+* Dired
+Do what I mean target allows dired to use window context for copying and moving
+#+BEGIN_SRC emacs-lisp
+(setq dired-dwim-target t)
+#+END_SRC
+* Laguages
+Typescript
+#+BEGIN_SRC emacs-lisp
+(def-package! tide
+ :after (typescript-mode company flycheck)
+ :hook ((typescript-mode . tide-setup)
+ (typescript-mode . tide-hl-identifier-mode)
+ (before-save . tide-format-before-save)))
+#+END_SRC
diff --git a/doom-emacs/.doom.d/init.el b/doom-emacs/.doom.d/init.el
index 197bb7d..472a904 100644
--- a/doom-emacs/.doom.d/init.el
+++ b/doom-emacs/.doom.d/init.el
@@ -23,10 +23,10 @@
doom ; what makes DOOM look the way it does
doom-dashboard ; a nifty splash screen for Emacs
doom-quit ; DOOM quit-message prompts when you quit Emacs
- ;;fill-column ; a `fill-column' indicator
+ fill-column ; a `fill-column' indicator
hl-todo ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW
hydra
- ;;indent-guides ; highlighted indent columns
+ indent-guides ; highlighted indent columns
modeline ; snazzy, Atom-inspired modeline, plus API
nav-flash ; blink the current line after jumping
;;neotree ; a project drawer, like NERDTree for vim
@@ -61,7 +61,7 @@
vc ; version-control and Emacs, sitting in a tree
:term
- ;;eshell ; a consistent, cross-platform shell (WIP)
+ eshell ; a consistent, cross-platform shell (WIP)
shell ; a terminal REPL for Emacs
;;term ; terminals in Emacs
;;vterm ; another terminals in Emacs
@@ -71,7 +71,7 @@
;;debugger ; FIXME stepping through code, to help you add bugs
;;direnv
;;docker
- ;;editorconfig ; let someone else argue about tabs vs spaces
+ editorconfig ; let someone else argue about tabs vs spaces
;;ein ; tame Jupyter notebooks with emacs
eval ; run code, run (also, repls)
flycheck ; tasing you for every semicolon you forget
@@ -82,28 +82,30 @@
lsp
;;macos ; MacOS-specific commands
magit ; a git porcelain for Emacs
- ;;make ; run make tasks from Emacs
+ make ; run make tasks from Emacs
;;pass ; password manager for nerds
- ;;pdf ; pdf enhancements
+ pdf ; pdf enhancements
;;prodigy ; FIXME managing external services & code builders
- ;;rgb ; creating color strings
+ rgb ; creating color strings
;;terraform ; infrastructure as code
- ;;tmux ; an API for interacting with tmux
- ;;upload ; map local to remote projects via ssh/ftp
- ;;wakatime
+ 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...
- ;;assembly ; assembly for fun or debugging
- cc ; C/C++/Obj-C madness
+ assembly ; assembly for fun or debugging
+ (cc ; C/C++/Obj-C madness
+ +rtags
+ +irony)
;;clojure ; java with a lisp
;;common-lisp ; if you've seen one lisp, you've seen them all
;;coq ; proofs-as-programs
;;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
+ 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
;;ess ; emacs speaks statistics
@@ -116,7 +118,7 @@
;;javascript ; all(hope(abandon(ye(who(enter(here))))))
;;julia ; a better, faster MATLAB
;;kotlin ; a better, slicker Java(Script)
- ;;latex ; writing papers in Emacs has never been so fun
+ latex ; writing papers in Emacs has never been so fun
ledger ; an accounting system in Emacs
;;lua ; one-based indices? one-based indices
markdown ; writing docs for people to ignore
@@ -132,19 +134,19 @@
;;php ; perl's insecure younger brother
;;plantuml ; diagrams for confusing people more
;;purescript ; javascript, but functional
- ;;python ; beautiful is better than ugly
+ python ; beautiful is better than ugly
;;qt ; the 'cutest' gui framework ever
;;racket ; a DSL for DSLs
- ;;rest ; Emacs as a REST client
- ;;ruby ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"}
- ;;rust ; Fe2O3.unwrap().unwrap().unwrap().unwrap()
+ rest ; Emacs as a REST client
+ ruby ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"}
+ rust ; Fe2O3.unwrap().unwrap().unwrap().unwrap()
;;scala ; java, but good
;;scheme ; a fully conniving family of lisps
sh ; she sells {ba,z,fi}sh shells on the C xor
;;solidity ; do you need a blockchain? No.
;;swift ; who asked for emoji variables?
;;terra ; Earth and Moon in alignment for performance.
- ;;web ; the tubes
+ web ; the tubes
;;vala ; GObjective-C
:email
@@ -160,9 +162,9 @@
;;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
diff --git a/doom-emacs/.doom.d/packages.el b/doom-emacs/.doom.d/packages.el
index e69de29..7655397 100644
--- a/doom-emacs/.doom.d/packages.el
+++ b/doom-emacs/.doom.d/packages.el
@@ -0,0 +1,9 @@
+;; -*- no-byte-compile: t; -*-
+;;; ~/repos/dotfiles/doom-emacs/.doom.d/packages.el
+
+(package! org-super-agenda)
+
+(package! imenu-list)
+(package! imenu-anywhere)
+
+(package! tide)
diff --git a/doom-emacs/.emacs.d b/doom-emacs/.emacs.d
-Subproject 0f9ce4de67d6be76ffc8a9115521676c2039438
+Subproject ea34b111945fbd6d9719de36b64331e9033a1c3
diff --git a/fish/.config/omf/bundle b/fish/.config/omf/bundle
deleted file mode 100644
index 85bb3b6..0000000
--- a/fish/.config/omf/bundle
+++ /dev/null
@@ -1,13 +0,0 @@
-theme agnoster
-theme ays
-theme bobthefish
-theme bongnoster
-theme budspencer
-theme coffeeandcode
-theme default
-theme gentoo
-theme gianu
-theme pygmalion
-theme randomrussel
-theme separation
-theme shellder
diff --git a/fish/.config/omf/channel b/fish/.config/omf/channel
deleted file mode 100644
index 2bf5ad0..0000000
--- a/fish/.config/omf/channel
+++ /dev/null
@@ -1 +0,0 @@
-stable
diff --git a/fish/.config/omf/theme b/fish/.config/omf/theme
deleted file mode 100644
index ff8a58d..0000000
--- a/fish/.config/omf/theme
+++ /dev/null
@@ -1 +0,0 @@
-bobthefish
diff --git a/fish/.local/share/omf b/fish/.local/share/omf
deleted file mode 160000
-Subproject 1069f1fac2003a532b7a2920886589e600adaf2
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-10 08:44:20 +0000