Commit graph

347 commits

Author SHA1 Message Date
Evie Litherland-Smith c272902fef Update shackle rules 2023-11-15 15:55:51 +00:00
Evie Litherland-Smith 89713e2bcd Magit don't show diff when committing 2023-11-15 09:50:48 +00:00
Evie Litherland-Smith 422178a615 Replace window splitting rules with shackle package 2023-11-15 09:47:27 +00:00
Evie Litherland-Smith 4727f60def Wrangle window splitting behaviour 2023-11-15 08:47:04 +00:00
Evie Litherland-Smith e1e1218a53 Emacs: enable tab bar mode 2023-11-15 08:13:19 +00:00
Evie Litherland-Smith 91a580a091 Fix corfu, add nerd-icons-corfu 2023-11-14 17:23:49 +00:00
Evie Litherland-Smith dd6e6bdea5 Remove org-appear, add yasnippet-capf 2023-11-14 15:21:34 +00:00
Evie Litherland-Smith 2260c14a8d Cleanup Eglot settings, remove pdf-tools 2023-11-14 10:16:49 +00:00
Evie Litherland-Smith 0fd91f55fd Remove dashboard, add yasnippets
Change nix lsp from nixd to nil

Add some common python packages (numpy scipy matplotlib xarray) that I
use all the time
2023-11-14 07:29:36 +00:00
Evie Litherland-Smith 21aefb20a0 Change references directory location 2023-11-13 16:19:05 +00:00
Evie Litherland-Smith ad015c9b86 Don't set frame to undecorated
Hyprland already handles this, other environments I won't want it
2023-11-13 15:36:09 +00:00
Evie Litherland-Smith 18c2a2ddfc Add darkroom config to use-package 2023-11-13 14:41:28 +00:00
Evie Litherland-Smith 99aed74787 Don't ensure treesit-auto is installed
Might not be due to emacs compilation options on other systems
2023-11-13 09:35:47 +00:00
Evie Litherland-Smith 4c7bc1462e Add column-number-mode to modeline 2023-11-13 09:26:13 +00:00
Evie Litherland-Smith 9ceb5115cb Remove org-mode drawer/block settings from org-appear 2023-11-13 08:25:15 +00:00
Evie Litherland-Smith 4e86d51f5d Move some of the old crafted-config options 2023-11-13 08:22:37 +00:00
Evie Litherland-Smith fb32e92f92 Add icons to citar 2023-11-13 06:43:25 +00:00
Evie Litherland-Smith dd7e871a4b Add some avy keymaps 2023-11-12 19:40:21 +00:00
Evie Litherland-Smith 94e1a23bf2 Major theme updates
Switched back to tokyo-night for base scheme but disable a lot of
stylix config (and selectively re-enable for certain
modules). Manually theme things using the tokyonight palette for a
nicer and more cohesive experience

Also change to a new wallpaper, fits scheme better as well

Added named workspaces for common programs (emacs, chromium, steam)
and keep numbered workspaces as generic scratch space

Move MPRIS to right section, add hyprland/window module (with a
separator bar)
2023-11-12 13:24:09 +00:00
Evie Litherland-Smith ccf511ce0c Check for kbd-mode before installing 2023-11-11 09:23:45 +00:00
Evie Litherland-Smith 9ecb15d04f Add kbd-mode for editing kmonad config files 2023-11-10 16:24:16 +00:00
Evie Litherland-Smith 9ed9e459f8 Set emacs to be undecorated 2023-11-10 11:35:05 +00:00
Evie Litherland-Smith 9260a84bbc Don't depend on org-mode being loaded for consult maps 2023-11-10 07:24:53 +00:00
Evie Litherland-Smith 1a65f52bef Move org-modern hooks to use-package block
Ensure direnv and treesit-auto
2023-11-10 07:21:46 +00:00
Evie Litherland-Smith 8c15ff8959 Add kmonad service (needs configuring) 2023-11-10 07:18:13 +00:00
Evie Litherland-Smith feb8dcee72 re-enable modeline modal indicator (for god-mode) 2023-11-10 06:58:17 +00:00
Evie Litherland-Smith 666b56fef9 Set mu4e back to horizontal split 2023-11-09 14:09:21 +00:00
Evie Litherland-Smith 454d446077 Add hook to enable eglot in prog-mode 2023-11-09 11:41:56 +00:00
Evie Litherland-Smith d9802d98ae Rebind/add binds for a bunch of useful consult-* commands 2023-11-09 11:10:42 +00:00
Evie Litherland-Smith 9defe7b742 Move almost all config into new format
Think I've got the important stuff using use-package at least, will
probably need a bit more config but that's lower priority
2023-11-09 08:10:57 +00:00
Evie Litherland-Smith 1adf46af4a Update project, feeds and social configs to use-package 2023-11-09 07:41:26 +00:00
Evie Litherland-Smith c79c12892e Remove mu4e update keybind 2023-11-09 07:20:02 +00:00
Evie Litherland-Smith 160bbb250e Update org-agenda config 2023-11-09 07:17:55 +00:00
Evie Litherland-Smith cdd3b41574 Add some extra emacs packages, TODO configure them all later 2023-11-09 07:09:48 +00:00
Evie Litherland-Smith 453f8ebeb3 Convert email config
Set mu4e to use single window, add more helpful keybinds for this setup
2023-11-08 17:17:04 +00:00
Evie Litherland-Smith 5806f9d003 Forgot to tangle last change 2023-11-08 07:12:31 +00:00
Evie Litherland-Smith ea83dccc15 Convert IDE config
Add keymaps for common link-hint commands

Remove some now unused packages
2023-11-08 06:56:46 +00:00
Evie Litherland-Smith 110df66ad2 Add keymap for editing org src blocks 2023-11-08 06:32:27 +00:00
Evie Litherland-Smith 7b051c3c36 Disable stylix themeing of emacs, switch to modus-vivendi-tinted theme
Move all of UI config section in to new format, including changing to
use-package
2023-11-08 06:27:32 +00:00
Evie Litherland-Smith 8a57987b55 Add ligature and darkroom packages 2023-11-07 07:06:30 +00:00
Evie Litherland-Smith 6bf31c8a89 Emacs config additions
Load custom file if exists
Add ligature support
Setup auth sources (pass and secret store)
2023-11-07 06:26:37 +00:00
Evie Litherland-Smith b8bdbd1675 Remove agenda and hook from dashboard, update rsync-local-config files list 2023-11-06 14:10:13 +00:00
Evie Litherland-Smith c6bc43d1cc Stop using org-babel-load-file, tangle in advance
Issues with no recreating the tangled file so doing it manually, may
revisit org-babel-load-file at some point
2023-11-06 12:38:43 +00:00
Evie Litherland-Smith ca12b7cc36 Add everything from old defaults to new defaults section 2023-11-06 12:18:59 +00:00
Evie Litherland-Smith 6627407d19 Add an init.el to tangle config.org, rather then using extraOptions
Move rest of old init.el into new format
2023-11-06 12:09:47 +00:00
Evie Litherland-Smith 861260c98d Convert org-mode section of config.org
Add TODO flags to outstanding sections
2023-11-06 11:53:18 +00:00
Evie Litherland-Smith 286c354ec6 Remove some unused bits of config.org 2023-11-06 07:29:51 +00:00
Evie Litherland-Smith 0f35e21716 Make babel load path dynamic instead of fixed to .config
Remove crafted-emacs input and tokyonight theme (and uses)

Remove old emacs files so I don't get confused
2023-11-06 07:18:06 +00:00
Evie Litherland-Smith cecc9b63d1 Initial setup of org babel config 2023-11-06 07:11:31 +00:00
Evie Litherland-Smith 0d2fe2b6a7 Move mu4e icon setup to ui-config 2023-11-05 08:14:51 +00:00
Evie Litherland-Smith 52a51a8700 Add keymap to add file to citar 2023-11-05 06:04:04 +00:00
Evie Litherland-Smith e0d43ac02b Remove doom-themes package 2023-11-05 05:56:48 +00:00
Evie Litherland-Smith b14a2991b2 Switch back to catppuccin (macchiato)
Move emacs config from system level to home-manager to make use of
stylix theming

Add git-gutter package for emacs
2023-11-05 05:55:52 +00:00
Evie Litherland-Smith 9294ce5626 Add bind for opening citar link
Change org capture templates to use dedicated inbox.org file (under
relevant headings), with the aim to sort notes later after taking
2023-11-04 21:09:29 +00:00
Evie Litherland-Smith cca03702c5 Add citar and some initial config
Setup references directory to keep bibliographies and reference PDFs,
sync with git-sync
2023-11-04 21:00:13 +00:00
Evie Litherland-Smith 48aa8b1a5a Add keymap to open/refresh dashboard
Replace use of keymap-set global-map with keymap-global-set for brevity
2023-11-04 12:23:46 +00:00
Evie Litherland-Smith ecab40b62b Emacs UI tweaks
Add recent files back to dashboard, add hook to update khalel events
2023-11-04 12:19:02 +00:00
Evie Litherland-Smith c78a6f518c Add keymap to open elfeed 2023-11-04 10:20:42 +00:00
Evie Litherland-Smith 762ee79929 Add mu4e header action to capture with org-mode 2023-11-03 16:02:24 +00:00
Evie Litherland-Smith 33f6eaff65 Add Xenia email context, change key/name for work email 2023-11-03 07:15:55 +00:00
Evie Litherland-Smith 05c376a230 Adjust emacs ui config 2023-11-03 07:03:40 +00:00
Evie Litherland-Smith ec0aba20d4 Change UI settings
mu4e use own modeline config, rather than doom-modeline

Remove wttr from modeline

Check system-type before customising UI (hopefully support android/termux)
2023-11-03 06:34:49 +00:00
Evie Litherland-Smith 00df579c67 Fix (hopefully) enabling flyspell automatically 2023-11-02 16:56:50 +00:00
Evie Litherland-Smith ce763e1687 Enable pretty entities in org files 2023-11-02 16:22:46 +00:00
Evie Litherland-Smith 185b90e0f3 Re-enable menu-bar-mode
Without any border bars text would shift when opening the command buffer
2023-11-02 16:15:32 +00:00
Evie Litherland-Smith 01fb213dd8 Switch from word-wrap to visual-line-mode
Set display-line-numbers-mode as a global

Turn off menu-bar
2023-11-02 16:02:05 +00:00
Evie Litherland-Smith 3b0b0d06df Change org-journal to using monthly files
Update org-agenda format

Only show agenda on dashboard, project was causing some issues anyway
2023-11-02 15:17:42 +00:00
Evie Litherland-Smith 72f6c32022 Require package *before* adding to package-archives list 2023-11-02 15:17:01 +00:00
Evie Litherland-Smith 5ad1850a80 Update org-capture templates and add keymap to goto last captured 2023-11-02 11:18:58 +00:00
Evie Litherland-Smith 56ec494c4d Change org tag formatting 2023-11-02 07:05:04 +00:00
Evie Litherland-Smith 0410d43580 Fix typo... 2023-11-01 18:23:01 +00:00
Evie Litherland-Smith 4c36b300b1 Switch Org directory back to being a git repo 2023-11-01 18:12:17 +00:00
Evie Litherland-Smith e40ac6f61d Enable mu4e fancy chars, fix folders for iCloud account 2023-11-01 18:05:45 +00:00
Evie Litherland-Smith 0614725bb0 Use full texlive, add gs and mupdf for doc-view
Remove texlab LSP as texlive ships digestif
2023-11-01 11:03:46 +00:00
Evie Litherland-Smith a9f798f051 Fix and re-enable dashboard
Add some more fonts

Try to fix modeline fonts, still not quite working, rearranged config
to test this
2023-11-01 08:37:30 +00:00
Evie Litherland-Smith 0ee059a354 Revert "Switch emacs package definitions to use use-package"
This reverts commit 32436bb052.

Broke lots of config, TODO revisit another time
2023-10-31 07:59:37 +00:00
Evie Litherland-Smith 32436bb052 Switch emacs package definitions to use use-package
First pass, think I got everything but may need tweaking with use and testing
2023-10-31 07:45:39 +00:00
Evie Litherland-Smith 27ce6af080 Switch everything back to mu4e (from notmuch) 2023-10-31 07:12:55 +00:00
Evie Litherland-Smith 3ab4ecfde8 Open org-agenda in current window, import calendar events on refresh 2023-10-30 14:41:41 +00:00
Evie Litherland-Smith 34d1fea00c Disable aggressive-indent-mode hook 2023-10-30 14:41:18 +00:00
Evie Litherland-Smith 46d7475d06 Force sort order in notmuch saved searches 2023-10-30 10:54:59 +00:00
Evie Litherland-Smith fee71e703c Add khalel and config to sync ics files into org-agenda
Updage khal format strings to work with khalel

Remove syncing display name as contact birthdays messes with khalel
tagging (because of the space)
2023-10-30 07:03:37 +00:00
Evie Litherland-Smith 57bd555cbb Add mastodon.el config 2023-10-29 07:33:43 +00:00
Evie Litherland-Smith 0babace2b8 Add some more packages
Fix broken keybinds

Don't refresh package list on startup, have keybind for that now
2023-10-29 07:23:22 +00:00
Evie Litherland-Smith a707d2a546 Merge branch 'main' of https://git.xenia.me.uk/xenia/nixos 2023-10-29 07:02:20 +00:00
Evie Litherland-Smith 6f04773670 Add doom-modeline, nerd-icons for dired, completion, etc...
Change some keymaps that didn't need to be hydras into regular keymaps

Misc formatting of module files to be a bit easier to read/understand
2023-10-29 07:00:48 +00:00
Evie Litherland-Smith a8a85d3835 Merge branch 'main' of https://git.xenia.me.uk/xenia/nixos 2023-10-28 11:14:32 +01:00
Evie Litherland-Smith 9f3d04e231 Add wttr to emacs modeline 2023-10-28 11:14:27 +01:00
Evie Litherland-Smith c70002fb0c Fix setting elfeed directories 2023-10-28 10:41:42 +01:00
Evie Litherland-Smith bea6ff65bc Remove unused let 2023-10-28 10:41:27 +01:00
Evie Litherland-Smith 53700a9793 Remove unread tag when deleting email 2023-10-28 10:32:58 +01:00
Evie Litherland-Smith 25a2daebd2 Restore a deleted keybind 2023-10-28 10:17:37 +01:00
Evie Litherland-Smith f3c33a8648 Switch back to python-lsp-server for better single file support 2023-10-28 10:17:15 +01:00
Evie Litherland-Smith 71528d0455 Update notmuch saved searches and org-mode hydra 2023-10-28 09:27:36 +01:00
Evie Litherland-Smith aa38a0d479 Add some org templates and hydra keys for capture/calendar/journal 2023-10-27 18:16:04 +01:00
Evie Litherland-Smith 1ff7bea4c8 Move Org back to being sync'd with syncthing 2023-10-27 12:20:17 +01:00
Evie Litherland-Smith 9bc9267c8e Dashboard: align recentf filenames 2023-10-27 12:17:20 +01:00
Evie Litherland-Smith ce5dd998e2 Set frame-alpha using hook so it's not applied to popups 2023-10-27 11:54:51 +01:00
Evie Litherland-Smith a06ab54e64 Customise notmuch-hello and add hydra
Add emms hooks to show current song when changed
2023-10-27 11:45:06 +01:00
Evie Litherland-Smith f1b8a95546 Customise how dashboard is started 2023-10-27 10:45:05 +01:00
Evie Litherland-Smith 7edc3efa2b Rename to fix defaults-config file name 2023-10-27 10:34:05 +01:00
Evie Litherland-Smith 93c4a76a0d Re-enable new custom-defaults-config, remove projectile 2023-10-27 10:31:36 +01:00
Evie Litherland-Smith 5987eb3395 Remove early-init
Update what's shown on dashboard
2023-10-27 10:07:29 +01:00
Evie Litherland-Smith 9088026c8d Disable custom-defaults-config (for now, TODO fix) 2023-10-27 10:00:21 +01:00
Evie Litherland-Smith ef73c2e417 Customise dashboard
Add hydra for controlling emms
2023-10-27 08:57:48 +01:00
Evie Litherland-Smith 5c959f8bf5 Reorganise a bunch of elisp file
Set package priority manually rather than using
crafted-early-init-config

Copy crafted-defaults-config to custom-defaults-config instead

Move some things out of init.el into relevant custom config files

Add some new packages (to be configured)
2023-10-27 08:03:51 +01:00
Evie Litherland-Smith 25d87b600a Add page-break-lines 2023-10-27 07:18:16 +01:00
Evie Litherland-Smith 46adafaf28 Wrap theme setting in when check for doom-themes
Move a few more things into modules from init.el, misc formatting otherwise
2023-10-27 06:59:10 +01:00
Evie Litherland-Smith 4949fb113e Update custom configs to check if module is installed before config 2023-10-27 06:51:20 +01:00
Evie Litherland-Smith 75711282c6 Fix yasnippet config, add custom snippet from doom
Add link-hint package
2023-10-27 06:40:20 +01:00
Evie Litherland-Smith 8891a13e42 Add some emacs editor packages
Adds:
goto-chg
rainbow-delimiters
yasnippet

Enables:
aggressive-indent in editor-mode-hook
2023-10-27 06:23:51 +01:00
Evie Litherland-Smith 27d4dc83b2 Use emms-source-file-default-directory instead of calling
add-directory-tree

Set syncthing to not override folders
2023-10-26 19:56:43 +01:00
Evie Litherland-Smith 25628104a7 Merge branch 'main' of https://git.xenia.me.uk/xenia/nixos 2023-10-26 16:12:04 +01:00
Evie Litherland-Smith 678ea71f61 Add emms and initial config to emacs 2023-10-26 16:11:52 +01:00
Evie Litherland-Smith 80ddaf9cfc Switch to using git-sync for elfeed and notmuch databases
Disable both in syncthing
2023-10-26 13:30:44 +01:00
Evie Litherland-Smith 9f19f3a626 Email setting updates
Add more tagging rules to afew

Change syncing setup to run mbsync less frequently (every 30 mins) but
sync inboxes in notmuch pre hook.
Imapnotify can now just call notmuch

Update conditions to refresh notmuch-indicator (emacs)
2023-10-26 13:09:11 +01:00
Evie Litherland-Smith 78752637d3 Add crafted-early-init, remove some other crafted modules
Fork crafted-ui-config to custom-ui-config to remove dependency on demos
2023-10-25 15:47:35 +01:00
Evie Litherland-Smith b4fb72cb1e Go back to default notmuch-saved-searches 2023-10-25 10:46:06 +01:00
Evie Litherland-Smith 249806bf29 Adjust order of elisp expressions
Change custom-email-config config to start modes *after* the setting
have been applied...
2023-10-25 09:20:22 +01:00
Evie Litherland-Smith c68cc41915 Remove elfeed reference to elfeed.org in user emacs dir 2023-10-25 06:48:43 +01:00
Evie Litherland-Smith c27f50a3ac Move elfeed.org back to Org directory
Update rmh-elfeed-org-files to check both org-directory and emacs user directory
2023-10-25 06:42:48 +01:00
Evie Litherland-Smith 4965badff3 Add the fiday chillout podcast feed 2023-10-25 06:39:14 +01:00
Evie Litherland-Smith c7c35d0db3 Require notmuch-indicator 2023-10-24 22:34:55 +01:00
Evie Litherland-Smith 3856427110 Add Numberphile to elfeed 2023-10-24 21:24:03 +01:00
Evie Litherland-Smith 51d10776dc Setup elfeed-org properly 2023-10-24 21:18:00 +01:00
Evie Litherland-Smith 73a3fed630 Expand fcc-dirs rules for common aliases 2023-10-24 18:20:48 +01:00
Evie Litherland-Smith a1f19f7565 Email updates
Add afew to handle new email tagging and moving archived or deleted
mail

Add more notmuch emacs config - fcc dirs based on send address, saved
searches default to tree view, better modeline icon
2023-10-24 18:15:21 +01:00
Evie Litherland-Smith 32f58021a2 Ensure eglot starts 2023-10-24 14:45:35 +01:00
Evie Litherland-Smith 4582485ed7 Move org config into own module
Add org-journal config, add refile settings
2023-10-24 14:36:12 +01:00
Evie Litherland-Smith c892de9926 Inhibit startup splash 2023-10-24 11:22:17 +01:00
Evie Litherland-Smith 69af15746d Revert "Add crafted-emacs as submodule instead of flake input"
This reverts commit afef99d596.
2023-10-24 11:20:35 +01:00
Evie Litherland-Smith afef99d596 Add crafted-emacs as submodule instead of flake input 2023-10-24 10:55:56 +01:00
Evie Litherland-Smith f433063be4 Reduce notmuch-indicator-refresh-count 2023-10-24 10:06:55 +01:00
Evie Litherland-Smith c549ee4f97 Run emacs as a system daemon
Move emacs package definition (with emacsPackages) to system/emacs.nix
Keep user config in home-manager as emacs service is installed as user
service

Remove extra expressions (formatters, lsp_servers) and bring back into
default.nix

Move config/ directory contents up one level
2023-10-24 09:56:35 +01:00
Evie Litherland-Smith bb6a26cb7e Re-enable elfeed update hook 2023-10-24 08:07:33 +01:00
Evie Litherland-Smith 16babc3f15 Various additions / changes
Switch email from mu/mu4e to notmuch, with associated service changes

Add elfeed config, enable useful minor-modes

Slight restructure of file layout
2023-10-24 08:06:35 +01:00
Evie Litherland-Smith 815f603128 Move email config over from doom-emacs 2023-10-23 23:55:52 +01:00
Evie Litherland-Smith fbea5c3884 Fix adding tree-sitter grammars
Add nix-index-database flake
2023-10-23 21:33:06 +01:00
Evie Litherland-Smith 5af2fac4af Add tree-sitter config file 2023-10-23 21:01:34 +01:00
Evie Litherland-Smith 47770b02c5 Add direnv and rust-mode to emacs
Add kdeconnect icon for waybar MPRIS module
2023-10-23 20:32:09 +01:00
Evie Litherland-Smith 16d3253c37 Copy over some more config from doom/config.el 2023-10-23 18:02:14 +01:00
Evie Litherland-Smith 55ae93f633 Big emacs re-write to use crafted-emacs
emacs/default.nix now links new init.el and modules directories (mine
and crafted-emacs) to ~/.config/emacs/
emacs/default.nix installs emacs29-pgtk with packages as needed in
module *-config.el definitions

Add tree-sitter with required parsers

Remove doom-emacs and places it was set
2023-10-23 17:28:05 +01:00
Evie Litherland-Smith 5c9854c665 Update org-agenda format 2023-10-23 11:46:34 +01:00
Evie Litherland-Smith 33cb97192d Add starter config for using crafted emacs 2023-10-23 08:52:59 +01:00
Evie Litherland-Smith fff9af77c6 Customise elfeed-goodies display 2023-10-23 07:35:42 +01:00
Evie Litherland-Smith 4df046c0d4 Set ntfy repo, require in config.el 2023-10-22 08:26:02 +01:00
Evie Litherland-Smith fc9b85992d Add ntfy.el with config
Change default shell to use for vterm over TRAMP
2023-10-22 08:17:53 +01:00
Evie Litherland-Smith dccc55a301 Set elfeed directories 2023-10-22 07:43:30 +01:00
Evie Litherland-Smith 548977c6fe Move formatters and lsp_servers into separate files 2023-10-22 06:32:26 +01:00
Evie Litherland-Smith 736750b21c Add emacs mpv package 2023-10-21 07:50:28 +01:00