From 3aee6d2f9acf6beb41584daaf72bfde9c0fc3227 Mon Sep 17 00:00:00 2001 From: Nathan McCarty Date: Mon, 12 Sep 2022 21:14:39 -0400 Subject: [PATCH] Add custom snippets directory --- doom.d/config.el | 4 +++ doom.d/config.org | 7 ++++ flake.lock | 84 +++++++++++++++++++++++------------------------ 3 files changed, 53 insertions(+), 42 deletions(-) diff --git a/doom.d/config.el b/doom.d/config.el index f7de963..e15fa03 100644 --- a/doom.d/config.el +++ b/doom.d/config.el @@ -417,6 +417,10 @@ independent key tables." (use-package! rainbow-delimiters :hook (prog-mode . rainbow-delimiters-mode)) +(after! yasnippet + (setq yas-snippet-dirs + '("~/Org/snippets"))) + (after! lsp-mode (add-to-list 'lsp-file-watch-ignored-directories "[/\\\\]\\result\\") (add-to-list 'lsp-file-watch-ignored-directories "[/\\\\]\\result-doc\\")) diff --git a/doom.d/config.org b/doom.d/config.org index 14c7257..bc2164d 100644 --- a/doom.d/config.org +++ b/doom.d/config.org @@ -593,6 +593,13 @@ Makes pairs of delimiters into pretty colors. Hook this into prog-mode (use-package! rainbow-delimiters :hook (prog-mode . rainbow-delimiters-mode)) #+end_src +*** YASnippet +Set the snippets directory to inside our org dir, since this gets synced +#+begin_src emacs-lisp :tangle yes +(after! yasnippet + (setq yas-snippet-dirs + '("~/Org/snippets"))) +#+end_src ** LSP Mode Custom configuration for lsp-mode *** Exclude nix directories from file watchers diff --git a/flake.lock b/flake.lock index 73c78ef..3da162c 100644 --- a/flake.lock +++ b/flake.lock @@ -41,11 +41,11 @@ "doom-snippets": { "flake": false, "locked": { - "lastModified": 1659894476, - "narHash": "sha256-1arRqlTos5uj6N47N4hyzHMMoUBxsxaZ/NK7iN5A+ZY=", + "lastModified": 1662645711, + "narHash": "sha256-XKpPCtECGZQ5bFPPDUX3oAltXOJNwAI/OktxiLnADRE=", "owner": "doomemacs", "repo": "snippets", - "rev": "f957f8d195872f19c7ab0a777d592c611e10e9bb", + "rev": "03a62fe7edf7e87fdbd925713fbd3bf292d14b00", "type": "github" }, "original": { @@ -62,11 +62,11 @@ ] }, "locked": { - "lastModified": 1662740802, - "narHash": "sha256-lQsuRx/vs/oJPXugV+FsTj9xKDVNn7qLz3hozhPbxE0=", + "lastModified": 1663012363, + "narHash": "sha256-fLCr2aV9kvS3ZNO+1SEjr+usZVOxoLRksq9zq5OHynQ=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "919c47aff0d191f8c6d6cc2e5602b137574c8606", + "rev": "5b8031ed8aa42fe7e4e5dd0f895a5b3fd4994690", "type": "github" }, "original": { @@ -177,11 +177,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1662728873, - "narHash": "sha256-XEb67ABjsRX6693qLJGWtLpjTA3x5AKrTeISVApVgzQ=", + "lastModified": 1662965863, + "narHash": "sha256-HLJNVthKQLtilC1xpuonhECJO4UZ0+JtIDwozqhwko4=", "owner": "nix-community", "repo": "fenix", - "rev": "560a6cdf8289466d36c03e2261de18c176a25716", + "rev": "ad632ed546a3c33b64505ca0dba262f46082d73e", "type": "github" }, "original": { @@ -485,11 +485,11 @@ "ws-butler": "ws-butler" }, "locked": { - "lastModified": 1662665437, - "narHash": "sha256-Aksr5xArGPbyrqEa/jxXn0/d9hc639SvpgUqfkdPLCY=", + "lastModified": 1662839665, + "narHash": "sha256-TGSRXMmRTn4eza3q0XvqpuPoeCnkktPeD0TaM/V1pZ0=", "owner": "nix-community", "repo": "nix-doom-emacs", - "rev": "a62512125de85c81fa8d1bb77ba8c8fe96d5b390", + "rev": "acbf1b70335d4fd6a6c05bc417d7f3ca44739437", "type": "github" }, "original": { @@ -576,11 +576,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1662019588, - "narHash": "sha256-oPEjHKGGVbBXqwwL+UjsveJzghWiWV0n9ogo1X6l4cw=", + "lastModified": 1662911228, + "narHash": "sha256-oJOrB2lEeBLaO8g1DKG5PK9a1zyOWypkscrEfxxEj8A=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2da64a81275b68fdad38af669afeda43d401e94b", + "rev": "c97e777ff06fcb8d37dcdf5e21e9eff1f34f0e90", "type": "github" }, "original": { @@ -592,11 +592,11 @@ }, "nixpkgs-22_05": { "locked": { - "lastModified": 1662221733, - "narHash": "sha256-dw1xjYyQ0JidXIpzeQh/gQX+ih1sJO1zBHKs5QSYp8Q=", + "lastModified": 1662864125, + "narHash": "sha256-AtjyEFK7Zp9+hOOUNO1/YZRADV/wC94R3yeKN8saUK4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "013e8d86d9a3f33074c903c8ffcab0d34087b1ed", + "rev": "e6f053b6079c16e7df97531e3e0524ace1304d4d", "type": "github" }, "original": { @@ -624,11 +624,11 @@ }, "nixpkgs-unstable_2": { "locked": { - "lastModified": 1662019588, - "narHash": "sha256-oPEjHKGGVbBXqwwL+UjsveJzghWiWV0n9ogo1X6l4cw=", + "lastModified": 1662911228, + "narHash": "sha256-oJOrB2lEeBLaO8g1DKG5PK9a1zyOWypkscrEfxxEj8A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2da64a81275b68fdad38af669afeda43d401e94b", + "rev": "c97e777ff06fcb8d37dcdf5e21e9eff1f34f0e90", "type": "github" }, "original": { @@ -640,11 +640,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1662099760, - "narHash": "sha256-MdZLCTJPeHi/9fg6R9fiunyDwP3XHJqDd51zWWz9px0=", + "lastModified": 1662874738, + "narHash": "sha256-kG29aU9f5UTWhPf/QEh5LanDmqqbbcErWYAcPptC/Cg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "67e45078141102f45eff1589a831aeaa3182b41e", + "rev": "dd1f4d982445a7d1b1869baa42f8f0f9bc606714", "type": "github" }, "original": { @@ -689,11 +689,11 @@ "org": { "flake": false, "locked": { - "lastModified": 1662044935, - "narHash": "sha256-ZpxKw8L/IpxolkGyQMDut6V4i8I1T5za0QBBrztfcts=", + "lastModified": 1662614940, + "narHash": "sha256-9eAqhKXpTfZQH3bn19ien3HIzF100h8z97iHqs/QUgY=", "owner": "emacs-straight", "repo": "org-mode", - "rev": "e36c3cc21b8b1471e1f7928a118de693819c3f12", + "rev": "eb5ef0ae1424a725f933ef3929e5396a2ab727ab", "type": "github" }, "original": { @@ -759,11 +759,11 @@ ] }, "locked": { - "lastModified": 1662622085, - "narHash": "sha256-o4ezCZ5n4NwMwUWZWmy0sHHhQ/cT050JmTxN9rW/QPQ=", + "lastModified": 1662998275, + "narHash": "sha256-bmVA1B1CJNGG801vEHePjGj98O2HqYzBIHdzTijdJ8A=", "owner": "PolyMC", "repo": "PolyMC", - "rev": "ca282f9fb36d12bb038ebdb90f017a6e3c945c0d", + "rev": "30abb6536864e2d1b3b47eed19d64ee58a7bad2c", "type": "github" }, "original": { @@ -796,11 +796,11 @@ "revealjs": { "flake": false, "locked": { - "lastModified": 1660499724, - "narHash": "sha256-BhnEmX+8h0MVol7T4Zr2w53A+AmgzcVirpwHCR/G73U=", + "lastModified": 1662369032, + "narHash": "sha256-1BZWA3W77YbNZUj+7vJbkTeWY8O4jjPg7t5PvlEVDYA=", "owner": "hakimel", "repo": "reveal.js", - "rev": "b23d15c4304a9a1b72f484171fc97682e5ed85a3", + "rev": "8a97ad58b04045fe5a9c964aa31659bd27e665c5", "type": "github" }, "original": { @@ -848,11 +848,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1662655120, - "narHash": "sha256-Pl+tT31tZqCl1uMkIKUfmiL+3LAAvgYPUvQ0EjusV4Q=", + "lastModified": 1662896065, + "narHash": "sha256-1LkSsXzI1JTAmP/GMTz4fTJd8y/tw8R79l96q+h7mu8=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "4e1a3da8f26ff72754618149078fd69a17080a95", + "rev": "2e9f1204ca01c3e20898d4a67c8b84899d394a88", "type": "github" }, "original": { @@ -886,11 +886,11 @@ "nixpkgs-22_05": "nixpkgs-22_05" }, "locked": { - "lastModified": 1662390490, - "narHash": "sha256-HnFHRFu0eoB0tLOZRjLgVfHzK+4bQzAmAmHSzOquuyI=", + "lastModified": 1662870301, + "narHash": "sha256-O+ABD+WzEBLVH6FwxKCIpps0hsR6b5dpYe6fB3e3Ju8=", "owner": "Mic92", "repo": "sops-nix", - "rev": "044ccfe24b349859cd9efc943e4465cc993ac84e", + "rev": "20929e1c5722a6db2f2dbe4cd36d4af0de0a9df0", "type": "github" }, "original": { @@ -902,11 +902,11 @@ "ts-fold": { "flake": false, "locked": { - "lastModified": 1662006199, - "narHash": "sha256-gDelW/h2LyknTQNkHODvzCJCKelLdLIQoDh/L1lk3KA=", + "lastModified": 1662386895, + "narHash": "sha256-pYW2hcHgkr9KYdRvX2EkpOt/OL8yl+mkZ21JbMKWc8Q=", "owner": "jcs-elpa", "repo": "ts-fold", - "rev": "28409a0ceede0751ed9d520c6a19d1f5f1211502", + "rev": "017402713bd2f1fd7a691aa48afb4330f5397432", "type": "github" }, "original": {