Merge branch 'main' of tildegit.org:petrichor/boxen
This commit is contained in:
commit
2bae5a8279
|
|
@ -7,12 +7,6 @@
|
|||
{
|
||||
imports = [ ./cachix.nix ];
|
||||
|
||||
# Temporary fixes !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
#
|
||||
# nixos-rebuild fails with memory allocation for gzip -d
|
||||
# See https://github.com/NixOS/nixpkgs/issues/124215
|
||||
documentation.info.enable = lib.mkForce false;
|
||||
|
||||
# Nix ######################################################################
|
||||
system.stateVersion = "20.03"; # Leave this alone (see configuration.nix(5))
|
||||
|
||||
|
|
|
|||
|
|
@ -111,9 +111,6 @@ in {
|
|||
CABAL_DIR = "${h}/.local/lib/languages/Haskell/cabal";
|
||||
|
||||
EDITOR = pkgs.vim + /bin/vim;
|
||||
|
||||
TERMINFO_DIRS =
|
||||
lib.concatStringsSep ":" [ "${h}/.nix-profile/share/terminfo" "" ];
|
||||
};
|
||||
|
||||
home.file = {
|
||||
|
|
|
|||
|
|
@ -27,13 +27,6 @@ in {
|
|||
mpd.host = "127.0.0.1";
|
||||
};
|
||||
|
||||
xdg.configFile."kitty/sessions/default.conf".text = ''
|
||||
launch ${pkgs.ncmpcpp}/bin/ncmpcpp
|
||||
launch ${pkgs.bpytop}/bin/bpytop
|
||||
|
||||
new_tab
|
||||
'';
|
||||
|
||||
programs.kitty.settings.font_size = lib.mkForce "14.0";
|
||||
|
||||
wayland.windowManager.sway = let
|
||||
|
|
|
|||
|
|
@ -61,6 +61,12 @@ with lib;
|
|||
xdg.configFile = {
|
||||
"wofi".source = ./wofi;
|
||||
"kitty/sessions/default.conf".text = ''
|
||||
layout tall
|
||||
launch ${pkgs.ncmpcpp}/bin/ncmpcpp
|
||||
launch ${pkgs.bpytop}/bin/bpytop
|
||||
|
||||
new_tab
|
||||
|
||||
layout tall
|
||||
cd ~
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -10,14 +10,16 @@
|
|||
let py = python38Packages;
|
||||
in [
|
||||
editorconfig-core-c
|
||||
cask
|
||||
black
|
||||
mypy
|
||||
haskell-language-server
|
||||
rust-analyzer
|
||||
py.python-language-server
|
||||
py.pyls-isort
|
||||
py.pyls-black
|
||||
py.pyls-mypy
|
||||
haskell-language-server
|
||||
rust-analyzer
|
||||
texlab
|
||||
|
||||
(pkgs.makeDesktopItem {
|
||||
name = "org-protocol";
|
||||
|
|
|
|||
|
|
@ -37,6 +37,7 @@
|
|||
(doom-themes-treemacs-config)
|
||||
(doom-themes-org-config)
|
||||
#+end_src
|
||||
|
||||
** Avy key tweaks
|
||||
|
||||
Theory: alternating left/right, 1st to 4th finger then middle column, home row -> upper row -> lower row
|
||||
|
|
@ -67,9 +68,12 @@ Most monitors are wide these days: prefer the right-hand side to the bottom for
|
|||
:size 0.38 ;; golden ratio!
|
||||
:side 'right)
|
||||
|
||||
(clear-popup-rules! "^\\*info\\*$")
|
||||
(set-popup-rules!
|
||||
'(("^\\*\\([Hh]elp\\|Apropos\\)"
|
||||
:side right :slot 2 :vslot -8 :size 0.38 :select t)
|
||||
("^\\*info\\*$"
|
||||
:side right :size 0.38 :slot 2 :vslot 1)
|
||||
("^\\*\\(?:doom\\)?:scratch"
|
||||
:side right size 0.38)
|
||||
("^\\*eww\\*"
|
||||
|
|
@ -130,13 +134,19 @@ Disable format-on-save for Rust, since it seems to complain...
|
|||
"D O O M E M A C S")
|
||||
"\n"))
|
||||
|
||||
(when (< (window-text-height) 40)
|
||||
(when (< (display-pixel-height) 1080)
|
||||
(setq +doom-dashboard-functions
|
||||
(cons 'doom-dashboard-widget-simple-title
|
||||
(delq 'doom-dashboard-widget-banner
|
||||
+doom-dashboard-functions))))
|
||||
#+end_src
|
||||
|
||||
** Scratch buffer
|
||||
|
||||
#+begin_src emacs-lisp
|
||||
(setq doom-scratch-initial-major-mode 'org-mode)
|
||||
#+end_src
|
||||
|
||||
* Projects
|
||||
|
||||
** Projectile
|
||||
|
|
@ -341,26 +351,26 @@ See also [[id:18709859-c3db-4d0e-a4a0-e797b58a2e07][Capture templates]]
|
|||
#+begin_src emacs-lisp
|
||||
(setq org-roam-db-update-method 'immediate
|
||||
org-roam-tag-sources '(prop first-directory)
|
||||
|
||||
|
||||
org-roam-graph-exclude-matcher "daily/"
|
||||
org-roam-graph-extra-config '(("rankdir" . "LR")
|
||||
("concentrate" . "true"))
|
||||
org-roam-graph-edge-extra-config '(("dir" . "none"))
|
||||
|
||||
|
||||
org-roam-node-display-template
|
||||
"${doom-hierarchy:*} ${doom-subdirs:45} ${tags:45}"
|
||||
|
||||
"${doom-hierarchy:*} ${doom-subdirs:20} ${tags:20}"
|
||||
|
||||
+org-roam-open-buffer-on-find-file nil)
|
||||
|
||||
|
||||
(unless (f-exists? org-roam-directory)
|
||||
(f-mkdir org-roam-directory))
|
||||
|
||||
|
||||
(defun jc/search-org-roam () "search org-roam with ripgrep"
|
||||
(interactive)
|
||||
(counsel-rg nil org-roam-directory
|
||||
"" "org-roam search: "))
|
||||
(map! :leader :desc "org-roam search" :n "sR" #'jc/search-org-roam)
|
||||
|
||||
|
||||
(require 'org-roam-protocol)
|
||||
#+end_src
|
||||
|
||||
|
|
@ -665,6 +675,20 @@ See also [[id:18709859-c3db-4d0e-a4a0-e797b58a2e07][Capture templates]]
|
|||
|
||||
** Lisp (and related)
|
||||
|
||||
*** Syntax highlighting
|
||||
|
||||
#+begin_src emacs-lisp
|
||||
(use-package! prism
|
||||
:hook (lisp-data-mode . prism-mode))
|
||||
#+end_src
|
||||
|
||||
*** Formatting
|
||||
|
||||
#+begin_src emacs-lisp
|
||||
(use-package! aggressive-indent
|
||||
:hook (emacs-lisp-mode . aggressive-indent-mode))
|
||||
#+end_src
|
||||
|
||||
*** Syntax checking (flycheck)
|
||||
|
||||
#+begin_src emacs-lisp
|
||||
|
|
@ -672,20 +696,23 @@ See also [[id:18709859-c3db-4d0e-a4a0-e797b58a2e07][Capture templates]]
|
|||
flycheck-disabled-checkers)
|
||||
#+end_src
|
||||
|
||||
*** Symex
|
||||
*** Navigation (symex)
|
||||
|
||||
#+begin_src emacs-lisp
|
||||
(use-package! symex
|
||||
:custom
|
||||
(symex-modal-backend 'evil)
|
||||
(symex-highlight-p t)
|
||||
:init
|
||||
(setq symex--user-evil-keyspec
|
||||
'(("j" . symex-go-up)
|
||||
("k" . symex-go-down)
|
||||
("C-j" . symex-climb-branch)
|
||||
("C-k" . symex-descend-branch)
|
||||
("M-j" . symex-goto-highest)
|
||||
("M-k" . symex-goto-lowest)))
|
||||
'(("j" . symex-go-up)
|
||||
("k" . symex-go-down)
|
||||
("C-j" . symex-climb-branch)
|
||||
("C-k" . symex-descend-branch)
|
||||
("M-j" . symex-goto-highest)
|
||||
("M-k" . symex-goto-lowest))
|
||||
|
||||
evil-symex-state-cursor evil-lisp-state-cursor)
|
||||
:config
|
||||
(symex-initialize)
|
||||
:bind (:map evil-normal-state-map
|
||||
|
|
|
|||
|
|
@ -15,8 +15,8 @@
|
|||
;; directory (for easy access to its source code).
|
||||
|
||||
(doom! :completion
|
||||
company ; the ultimate code completion backend
|
||||
(ivy +childframe +icons) ; a search engine for love and life
|
||||
(company +childframe) ; the ultimate code completion backend
|
||||
(ivy +childframe +prescient +icons) ; a search engine for love and life
|
||||
|
||||
:ui
|
||||
;;deft ; notational velocity for Emacs
|
||||
|
|
@ -29,7 +29,7 @@
|
|||
hydra
|
||||
indent-guides ; highlighted indent columns
|
||||
ligatures ; ligatures and symbols to make your code pretty again
|
||||
minimap ; show a map of the code on the side
|
||||
;; minimap ; show a map of the code on the side
|
||||
modeline ; snazzy, Atom-inspired modeline, plus API
|
||||
nav-flash ; blink cursor line after big motions
|
||||
;;neotree ; a project drawer, like NERDTree for vim
|
||||
|
|
@ -83,17 +83,17 @@
|
|||
direnv
|
||||
;;docker
|
||||
editorconfig ; let someone else argue about tabs vs spaces
|
||||
;;ein ; tame Jupyter notebooks with emacs
|
||||
ein ; tame Jupyter notebooks with emacs
|
||||
(eval +overlay) ; run code, run (also, repls)
|
||||
;;gist ; interacting with github gists
|
||||
lookup ; navigate your code and its documentation
|
||||
;;lsp
|
||||
lsp
|
||||
magit ; a git porcelain for Emacs
|
||||
biblio
|
||||
biblio-notes
|
||||
;;make ; run make tasks from Emacs
|
||||
;;pass ; password manager for nerds
|
||||
pdf ; pdf enhancements
|
||||
;; pdf ; pdf enhancements
|
||||
;;rgb ; creating color strings
|
||||
;;taskrunner ; taskrunner for all your projects
|
||||
;;terraform ; infrastructure as code
|
||||
|
|
@ -113,12 +113,12 @@
|
|||
hy ; readability of scheme w/ speed of python
|
||||
json ; At least it ain't XML
|
||||
julia ; a better, faster MATLAB
|
||||
latex ; writing papers in Emacs has never been so fun
|
||||
(latex +lsp) ; writing papers in Emacs has never been so fun
|
||||
markdown ; writing docs for people to ignore
|
||||
nix ; I hereby declare "nix geht mehr!"
|
||||
(org +pretty +roam2 +pandoc +noter) ; organize your plain life in plain text
|
||||
python ; beautiful is better than ugly
|
||||
rust ; Fe2O3.unwrap().unwrap().unwrap().unwrap()
|
||||
(python +lsp +poetry) ; beautiful is better than ugly
|
||||
(rust +lsp) ; Fe2O3.unwrap().unwrap().unwrap().unwrap()
|
||||
sh ; she sells {ba,z,fi}sh shells on the C xor
|
||||
web ; the tubes
|
||||
yaml ; JSON, but readable
|
||||
|
|
|
|||
|
|
@ -1,3 +1,5 @@
|
|||
(use-package! org-roam-bibtex
|
||||
:after org-roam
|
||||
:hook (org-roam-mode . org-roam-bibtex-mode))
|
||||
:after-call (bibtex-completion-init)
|
||||
:config
|
||||
(require 'org-ref)
|
||||
(org-roam-bibtex-mode +1))
|
||||
|
|
|
|||
|
|
@ -55,5 +55,5 @@
|
|||
(package! org-super-agenda)
|
||||
|
||||
(package! aggressive-indent)
|
||||
|
||||
(package! symex)
|
||||
(package! prism)
|
||||
|
|
|
|||
|
|
@ -61,13 +61,7 @@
|
|||
}
|
||||
'';
|
||||
envExtra = ''
|
||||
[[ -r /etc/profile.d/nix.sh ]] && source /etc/profile.d/nix.sh
|
||||
[[ -r $HOME/.nix-profile/etc/profile.d/nix.sh ]] && source $HOME/.nix-profile/etc/profile.d/nix.sh
|
||||
|
||||
export LOCALE_ARCHIVE="${pkgs.glibcLocales}/lib/locale/locale-archive"
|
||||
ZSH_CUSTOM=$HOME/.zsh/omz-custom
|
||||
|
||||
unset LIBGL_DRIVERS_PATH LD_LIBRARY_PATH
|
||||
'';
|
||||
|
||||
oh-my-zsh = {
|
||||
|
|
|
|||
|
|
@ -51,4 +51,6 @@
|
|||
userlist = [ "jez" ];
|
||||
writeEnable = true;
|
||||
};
|
||||
|
||||
boot.zfs.requestEncryptionCredentials = false;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue