.gitmodules

@@ -1,6 +1,3 @@
-[submodule "external-packages/nerd-icons-dired"]
-	path = external-packages/nerd-icons-dired
-	url = https://github.com/rainstormstudio/nerd-icons-dired.git
-[submodule "external-packages/ligature.el"]
-	path = external-packages/ligature.el
-	url = https://github.com/mickeynp/ligature.el.git
+[submodule "straight.el"]
+	path = straight/repos/straight.el
+	url = https://github.com/radian-software/straight.el.git

Makefile

@@ -1,9 +1,6 @@
-.PHONY: default install clean
+.PHONY: default install
 
 default: install
 
 install:
 	emacs --script install.el --kill
-
-clean:
-	-rm -rf ./elpa/ ./eln-cache/

early-init.el

@@ -0,0 +1 @@
+(setq package-enable-at-startup nil)

external-packages/ligature.el

@@ -1 +0,0 @@
-Subproject commit 6ac1634612dbd42f7eb81ecaf022bd239aabb954

external-packages/nerd-icons-dired

@@ -1 +0,0 @@
-Subproject commit c1c73488630cc1d19ce1677359f614122ae4c1b9

install.el

@@ -3,6 +3,8 @@
 ;;; Code:
 ;; Configure packages archives with priority
 (load-file (locate-user-emacs-file "init.el"))
-(my/package-ensure-installed)
+(package-refresh-contents)
+(package-install-selected-packages t)
+(package-autoremove)
 (provide 'install)
 ;;; install.el ends here

straight/repos/straight.el

@@ -0,0 +1 @@
+Subproject commit 88e574ae75344e39b436f863ef0344135c7b6517

straight/versions/default.el

@@ -0,0 +1,78 @@
+(("apheleia" . "3e347cff47eb0072b47c56f6188c4f440e477770")
+ ("base16-emacs" . "8789114e45d09d114e0e197cb090ce7beb993901")
+ ("bbdb" . "53e8ba04c47b3542db75b68f9663941daf2e6ca4")
+ ("cape" . "5c468d6d657e8dc604ddf3feb80f70e1e05ac0a1")
+ ("citar" . "07d2a63c99fe35cbd468f8e6a322de05f1a29469")
+ ("citeproc-el" . "54184baaff555b5c7993d566d75dd04ed485b5c0")
+ ("closql" . "06efb5a37ee4a1169a82ba754fc1fa09a89cb273")
+ ("compat" . "99d74e635b76c3fa0b8403391e9d2efbd29f9901")
+ ("consult" . "4889458dccf842ab6223099f8a73ff8b147e9459")
+ ("consult-eglot" . "64262e72452f8fe6dd49d31bcdd4bd577b7d682d")
+ ("corfu" . "5e3a959766d2313651c5db3beedd937bfc27b57a")
+ ("corfu-terminal" . "501548c3d51f926c687e8cd838c5865ec45d03cc")
+ ("dash.el" . "1de9dcb83eacfb162b6d9a118a4770b1281bcd84")
+ ("diff-hl" . "b80ff9b4a772f7ea000e86fbf88175104ddf9557")
+ ("doom-modeline" . "9920ef511620e9fa5599cb357e48487f758b1bb1")
+ ("eglot" . "e17426e09542a3cc35191448c7e6666afdd13e58")
+ ("el-get" . "c0713e8d8e8ad987fe1283d76b9c637a10f048ef")
+ ("eldoc" . "91a8ae2fa66ac09f45337f9eca6c7aa643a063f4")
+ ("emacs-scad-mode" . "17a8158cc55fed473aa87d53f3f2b42e1c249d11")
+ ("emacs-which-key" . "38d4308d1143b61e4004b6e7a940686784e51500")
+ ("emacsmirror-mirror" . "b1e50f90d305c20752237dbf764920c656a2124e")
+ ("emacsql" . "32f086e6e1aca48120b71fec2437b4c8b21b29fd")
+ ("emms" . "b5567be2176dcbdf42aa2d0ccad32a44f245dd09")
+ ("envrc" . "532ecdab48d073963ba5b581c06f3c0b83db05a6")
+ ("external-completion" . "69f06e1eff72df60bb10153169edc859f27f58f2")
+ ("f.el" . "1e7020dc0d4c52d3da9bd610d431cab13aa02d8c")
+ ("flymake" . "c772251c9aaec34094fd4c5347d4e5f16647847b")
+ ("flymake-clippy" . "713b7e873d6b30dc0ded75d5d890d6847f2ea093")
+ ("flymake-eslint" . "6ab909b85a8e97815db9831cdd5f283a7830177f")
+ ("flymake-shellcheck" . "d55666f55e126f0e861f7e886202c17c6a1cf8f3")
+ ("flymake-yamllint" . "020d2a33568c8069801db9dd6992b8961a58de8d")
+ ("flyspell-correct" . "1e7a5a56362dd875dddf848b9a9e25d1395b9d37")
+ ("forge" . "efbebd4b5ed556acef0fa369348b8ae932935f1c")
+ ("ghub" . "772c3352307a86f40fc1519fe868a4a14ceb8d39")
+ ("gnu-elpa-mirror" . "3d0759ef4792b6461f2979a4e70e1c819df7283a")
+ ("hydra" . "317e1de33086637579a7aeb60f77ed0405bf359b")
+ ("inheritenv" . "bac62ca6324828623cf8ce5a3d6aee0fcb65d620")
+ ("jsonrpc" . "cd597b048e2a380c5f4ebfa3bbab90848275a294")
+ ("let-alist" . "4e05e158612f360f6080b1349d3962b1c8fee902")
+ ("ligature.el" . "6ac1634612dbd42f7eb81ecaf022bd239aabb954")
+ ("lua-mode" . "d074e4134b1beae9ed4c9b512af741ca0d852ba3")
+ ("magit" . "27f81d6e5cdcc7ddfb0d4a33f6566ef98a0faaa5")
+ ("marginalia" . "7a7f3363d042d1bf43ae697f4401638ed18230a5")
+ ("markdown-mode" . "8a7773f87733866a961ea4c518a4a2f283f21970")
+ ("melpa" . "c13d67c87248b9af8f9d6265a8626a330f9d478c")
+ ("nerd-icons-completion" . "426a1d7c29a04ae8e6ae9b55b0559f11a1e8b420")
+ ("nerd-icons-corfu" . "7077bb76fefc15aed967476406a19dc5c2500b3c")
+ ("nerd-icons-dired" . "c1c73488630cc1d19ce1677359f614122ae4c1b9")
+ ("nerd-icons-ibuffer" . "16270e898abbba2bd810cbf97f999c6142863101")
+ ("nerd-icons.el" . "dcfc64152ada7514bcdd1c6ce45590c359445ec6")
+ ("nix-mode" . "719feb7868fb567ecfe5578f6119892c771ac5e5")
+ ("nongnu-elpa" . "f031337c6ee125455a98e2de899a563388e5de19")
+ ("orderless" . "49d1fdfb80b55699a00b11bc916ad29c0447039b")
+ ("org-roam" . "0b9fcbc97b65b349826e63bad89ca121a08fd2be")
+ ("pandoc-mode" . "18214fc2df357b50e62c79993aac4ff0cf1d9499")
+ ("parsebib" . "ace9df707108b17759c004c7387655277122d4c1")
+ ("password-store" . "b5e965a838bb68c1227caa2cdd874ba496f10149")
+ ("popon" . "bf8174cb7e6e8fe0fe91afe6b01b6562c4dc39da")
+ ("project" . "c0fb3da8b90735fb280ab157f4a8033b42105125")
+ ("python-docstring-mode" . "48e6489ec2db8b4959a9f591910941c2a5f132a3")
+ ("queue" . "8df1334d54d4735d2f821790422a850dfaaa08ef")
+ ("rainbow-delimiters" . "f40ece58df8b2f0fb6c8576b527755a552a5e763")
+ ("s.el" . "dda84d38fffdaf0c9b12837b504b402af910d01d")
+ ("seq" . "da86da9bf111f68fb81efd466d76d53af5aebc00")
+ ("shrink-path.el" . "c14882c8599aec79a6e8ef2d06454254bb3e1e41")
+ ("straight.el" . "88e574ae75344e39b436f863ef0344135c7b6517")
+ ("string-inflection" . "be3808c9bbd3f732f94cea7e19ad68eac5f6dad0")
+ ("tempel" . "317c0e41d542721db11a7a8a1c6b78762959259b")
+ ("track-changes" . "fa984c7d5a67b60bad4240e15a6d0d9d1896b07d")
+ ("transient" . "b2cb4e578f2362a0354c4a31a6bd89d6c4b63d63")
+ ("treepy.el" . "75fe3ec37e6f9b2bdfd6d0584efd984d0c00a43e")
+ ("treesit-auto" . "016bd286a1ba4628f833a626f8b9d497882ecdf3")
+ ("use-package" . "a6e856418d2ebd053b34e0ab2fda328abeba731c")
+ ("vertico" . "d70fdeb67be9ecc88c438039eefa9ef0e2104005")
+ ("with-editor" . "78c303a0181f2132e2254f965176b549044d74f2")
+ ("xref" . "53c4abbc26febcd45be79dea43b7dc56d12112de")
+ ("yaml.el" . "70c4fcead97e9bd6594e418c922ae769818f4245"))
+:gamma

templates

@@ -100,7 +100,7 @@ text-mode
 
 org-mode
 
-(title "#+title: " p n "#+author: " p n "#+email: ")
+(title "#+title: " p n "#+author: " p n "#+email: " p n "#+language: en")
 (babel "#+property: header-args:emacs-lisp :tangle yes :mkdirp yes :results output silent")
 (caption "#+caption: ")
 (drawer ":" p ":" n r ":end:")
@@ -118,6 +118,7 @@ org-mode
 (src "#+begin_src " q n r n "#+end_src")
 (gnuplot "#+begin_src gnuplot :var data=" (p "table") " :file " (p "plot.png") n r n "#+end_src" :post (org-edit-src-code))
 (elisp "#+begin_src emacs-lisp" n r n "#+end_src" :post (org-edit-src-code))
+(inlsrc "src_" p "{" q "}")
 
 nix-mode
 
@@ -206,31 +207,37 @@ nix-mode
 
 (pkgs "pkgs = import " (p "<nixpkgs>") " {};")
 (poetry2nix "poetry2nix = (builtins.getFlake \"github:nix-community/poetry2nix\").lib.mkPoetry2Nix {inherit pkgs;};")
-(pyshell "let" n
-         > "pkgs = import " (p "<nixpkgs>") " {};" n
-         > "in pkgs.mkShellNoCC {" n
-         > "packages = with pkgs; [" n
-         > "poetry" n
-         > (p "python3Full") n
-         > q n
-         > "];" n
-         > "shellHook = ''" n
-         > "export LD_LIBRARY_PATH=${pkgs.stdenv.cc.cc.lib}/lib:${pkgs.zlib}/lib" n
-         > "'';" n
-         > "}")
-(pyderivation "{ buildPythonPackage, " (p "poetry-core" build) ", " (p "" dependencies) "}:" n
-              "buildPythonPackage {" n
-              > "pname = \"" (p "package") "\";" n
-              > "version = \"" (p "0.1.0") "\";" n
-              > "src = ./.;" n
-              > "build-system = [ " (s build)" ];" n
-              > "dependencies = [ " (string-replace "," "" dependencies) " ];" n
-              > "}")
-(pydefault "let" n
-           > "pkgs = import " (p "<nixpkgs>") " { };" n
-           > "python3 = " (p "pkgs.python3") ";" n
-           "in" n
-           > "python3.pkgs.callPackage ./derivation.nix {" q "}")
+(pythonshell "let" n
+             > "pkgs = import " (p "<nixpkgs>") " {};" n
+             > "in pkgs.mkShellNoCC {" n
+             > "packages = with pkgs; [" n
+             > "poetry" n
+             > (p "python3Full") n
+             > q n
+             > "];" n
+             > "shellHook = ''" n
+             > "export LD_LIBRARY_PATH=${pkgs.stdenv.cc.cc.lib}/lib:${pkgs.zlib}/lib" n
+             > "'';" n
+             > "}")
+(poetryshell "# See https://github.com/nix-community/poetry2nix/blob/master/docs/edgecases.md#cases" n
+             "# for edgecases like setuptools not found" n
+             "let" n
+             > "pkgs = import " (p "<nixpkgs>") " {};" n
+             > "poetry2nix = (builtins.getFlake \"github:nix-community/poetry2nix\").lib.mkPoetry2Nix {inherit pkgs;};" n
+             > "poetryEnv = let " n
+             > "projectDir = " (p "./.") ";" n
+             > "in (poetry2nix.mkPoetryEnv {" n
+             > "inherit projectDir;" n
+             > "overrides = poetry2nix.defaultPoetryOverrides;" n
+             > "python = " (p "pkgs.python3Full") ";" n
+             > "editablePackageSources = {" (p "package") "= projectDir;};" n
+             > "extraPackages = (ps: [" q  "]);" n
+             > "preferWheels = true;" n
+             > "groups = [\"dev\"];" n
+             > "extras = [\"*\"];" n
+             > "});" n
+             "in" n
+             > "poetryEnv.env")
 
 envrc-file-mode