From 3291be595bce4788b8f6e660e8a65a882407c9b5 Mon Sep 17 00:00:00 2001 From: Nathan McCarty Date: Fri, 30 Sep 2022 23:21:21 -0400 Subject: [PATCH] remove nix-doom-emacs --- flake.lock | 493 +++---------------------- flake.nix | 6 - home-manager/common/programs/emacs.nix | 49 +-- home-manager/linux/programs/emacs.nix | 2 + 4 files changed, 51 insertions(+), 499 deletions(-) diff --git a/flake.lock b/flake.lock index 26a5652..d107d48 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1663677921, - "narHash": "sha256-NfQnUfRrjv8DXeugdbQC5El+MMhShP42ohc8iM+UAdM=", + "lastModified": 1664210064, + "narHash": "sha256-df6nKVZe/yAhmJ9csirTPahc0dldwm3HBhCVNA6qWr0=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "088c98a584a38b5f844bb9e9cd32eb28479ca6d7", + "rev": "02d2551c927b7d65ded1b3c7cd13da5cc7ae3fcf", "type": "github" }, "original": { @@ -21,39 +21,6 @@ "type": "github" } }, - "doom-emacs": { - "flake": false, - "locked": { - "lastModified": 1660901074, - "narHash": "sha256-3apl0eQlfBj3y0gDdoPp2M6PXYnhxs0QWOHp8B8A9sc=", - "owner": "doomemacs", - "repo": "doomemacs", - "rev": "c44bc81a05f3758ceaa28921dd9c830b9c571e61", - "type": "github" - }, - "original": { - "owner": "doomemacs", - "ref": "master", - "repo": "doomemacs", - "type": "github" - } - }, - "doom-snippets": { - "flake": false, - "locked": { - "lastModified": 1662645711, - "narHash": "sha256-XKpPCtECGZQ5bFPPDUX3oAltXOJNwAI/OktxiLnADRE=", - "owner": "doomemacs", - "repo": "snippets", - "rev": "03a62fe7edf7e87fdbd925713fbd3bf292d14b00", - "type": "github" - }, - "original": { - "owner": "doomemacs", - "repo": "snippets", - "type": "github" - } - }, "emacs": { "inputs": { "flake-utils": "flake-utils", @@ -62,11 +29,11 @@ ] }, "locked": { - "lastModified": 1663669849, - "narHash": "sha256-/c3EJGAu9YcVTIX06kWFhMfr3R/XoZ+Hn01MdkjQHvM=", + "lastModified": 1664564735, + "narHash": "sha256-lvVdTk51H3XZOjv/QpqoIZuZxDljrmT9s33lZdZkpec=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "d561db310f51e8bd705d53058f08c6ae7ed3d23b", + "rev": "9a02dc2ccb23e99abed65102b76f01b7bc59e73e", "type": "github" }, "original": { @@ -75,113 +42,17 @@ "type": "github" } }, - "emacs-so-long": { - "flake": false, - "locked": { - "lastModified": 1575031854, - "narHash": "sha256-xIa5zO0ZaToDrec1OFjBK6l39AbA4l/CE4LInVu2hi0=", - "owner": "hlissner", - "repo": "emacs-so-long", - "rev": "ed666b0716f60e8988c455804de24b55919e71ca", - "type": "github" - }, - "original": { - "owner": "hlissner", - "repo": "emacs-so-long", - "type": "github" - } - }, - "evil-escape": { - "flake": false, - "locked": { - "lastModified": 1588439096, - "narHash": "sha256-aB2Ge5o/93B18tPf4fN1c+O46CNh/nOqwLJbox4c8Gw=", - "owner": "hlissner", - "repo": "evil-escape", - "rev": "819f1ee1cf3f69a1ae920e6004f2c0baeebbe077", - "type": "github" - }, - "original": { - "owner": "hlissner", - "repo": "evil-escape", - "type": "github" - } - }, - "evil-markdown": { - "flake": false, - "locked": { - "lastModified": 1626852210, - "narHash": "sha256-HBBuZ1VWIn6kwK5CtGIvHM1+9eiNiKPH0GUsyvpUVN8=", - "owner": "Somelauw", - "repo": "evil-markdown", - "rev": "8e6cc68af83914b2fa9fd3a3b8472573dbcef477", - "type": "github" - }, - "original": { - "owner": "Somelauw", - "repo": "evil-markdown", - "type": "github" - } - }, - "evil-org-mode": { - "flake": false, - "locked": { - "lastModified": 1607203864, - "narHash": "sha256-JxwqVYDN6OIJEH15MVI6XOZAPtUWUhJQWHyzcrUvrFg=", - "owner": "hlissner", - "repo": "evil-org-mode", - "rev": "a9706da260c45b98601bcd72b1d2c0a24a017700", - "type": "github" - }, - "original": { - "owner": "hlissner", - "repo": "evil-org-mode", - "type": "github" - } - }, - "evil-quick-diff": { - "flake": false, - "locked": { - "lastModified": 1575189609, - "narHash": "sha256-oGzl1ayW9rIuq0haoiFS7RZsS8NFMdEA7K1BSozgnJU=", - "owner": "rgrinberg", - "repo": "evil-quick-diff", - "rev": "69c883720b30a892c63bc89f49d4f0e8b8028908", - "type": "github" - }, - "original": { - "owner": "rgrinberg", - "repo": "evil-quick-diff", - "type": "github" - } - }, - "explain-pause-mode": { - "flake": false, - "locked": { - "lastModified": 1595842060, - "narHash": "sha256-++znrjiDSx+cy4okFBBXUBkRFdtnE2x+trkmqjB3Njs=", - "owner": "lastquestion", - "repo": "explain-pause-mode", - "rev": "2356c8c3639cbeeb9751744dbe737267849b4b51", - "type": "github" - }, - "original": { - "owner": "lastquestion", - "repo": "explain-pause-mode", - "type": "github" - } - }, "fenix": { "inputs": { "nixpkgs": "nixpkgs", "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1664087514, - "narHash": "sha256-2QmsQLp78q5p/umxCCQCvc+hmXK+PFBWFoGtdTg/fz0=", + "lastModified": 1664520862, + "narHash": "sha256-IGUL2/N+bcUbQXnDnmlZAIMyy2T11LEdhQZF6izsz2A=", "owner": "nix-community", "repo": "fenix", - "rev": "8b3972cdee4e739769a28782441fdae661ee69f9", + "rev": "a9e14237d2831ff1af7d259c06936f09cd5c9e16", "type": "github" }, "original": { @@ -222,22 +93,6 @@ "type": "github" } }, - "flake-compat_3": { - "flake": false, - "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-utils": { "locked": { "lastModified": 1659877975, @@ -283,38 +138,6 @@ "type": "github" } }, - "flake-utils_4": { - "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "format-all": { - "flake": false, - "locked": { - "lastModified": 1581716637, - "narHash": "sha256-ul7LCe60W8TIvUmUtZtZRo8489TK9iTPDsLHmzxY57M=", - "owner": "lassik", - "repo": "emacs-format-all-the-code", - "rev": "47d862d40a088ca089c92cd393c6dca4628f87d3", - "type": "github" - }, - "original": { - "owner": "lassik", - "repo": "emacs-format-all-the-code", - "rev": "47d862d40a088ca089c92cd393c6dca4628f87d3", - "type": "github" - } - }, "gamescope": { "inputs": { "gamescope-src": "gamescope-src", @@ -452,55 +275,9 @@ "type": "github" } }, - "nix-doom-emacs": { - "inputs": { - "doom-emacs": "doom-emacs", - "doom-snippets": "doom-snippets", - "emacs-overlay": [ - "emacs" - ], - "emacs-so-long": "emacs-so-long", - "evil-escape": "evil-escape", - "evil-markdown": "evil-markdown", - "evil-org-mode": "evil-org-mode", - "evil-quick-diff": "evil-quick-diff", - "explain-pause-mode": "explain-pause-mode", - "flake-compat": "flake-compat", - "flake-utils": "flake-utils_2", - "format-all": "format-all", - "nix-straight": "nix-straight", - "nixpkgs": [ - "nixpkgs-unstable" - ], - "nose": "nose", - "ob-racket": "ob-racket", - "org": "org", - "org-contrib": "org-contrib", - "org-yt": "org-yt", - "php-extras": "php-extras", - "revealjs": "revealjs", - "rotate-text": "rotate-text", - "sln-mode": "sln-mode", - "ts-fold": "ts-fold", - "ws-butler": "ws-butler" - }, - "locked": { - "lastModified": 1662839665, - "narHash": "sha256-TGSRXMmRTn4eza3q0XvqpuPoeCnkktPeD0TaM/V1pZ0=", - "owner": "nix-community", - "repo": "nix-doom-emacs", - "rev": "acbf1b70335d4fd6a6c05bc417d7f3ca44739437", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nix-doom-emacs", - "type": "github" - } - }, "nix-on-droid": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "home-manager": [ "home-manager" ], @@ -509,11 +286,11 @@ ] }, "locked": { - "lastModified": 1663051986, - "narHash": "sha256-PgDBQ/LkNOwNwuPGOfDHKDSyS2Y48Rp1l7CR7czPHPs=", + "lastModified": 1663972330, + "narHash": "sha256-r5l1STgGyrldeAW64Jn8nNlFkbPZLquy8ek6EaIKRCk=", "owner": "t184256", "repo": "nix-on-droid", - "rev": "dd0d1194a8b26027e650253d3dab2c8b9f3c4736", + "rev": "e6c9902ddc14eaac2ee284f57fe10e7b5990080d", "type": "github" }, "original": { @@ -522,22 +299,6 @@ "type": "github" } }, - "nix-straight": { - "flake": false, - "locked": { - "lastModified": 1656684255, - "narHash": "sha256-ZefQiv4Ipu2VkLjs1oyelTLU7kBVJgkcQd+yBpJU0yo=", - "owner": "nix-community", - "repo": "nix-straight.el", - "rev": "fb8dd5c44cde70abd13380766e40af7a63888942", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nix-straight.el", - "type": "github" - } - }, "nixlib": { "locked": { "lastModified": 1636849918, @@ -576,11 +337,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1663850217, - "narHash": "sha256-tp9nXo1/IdN/xN9m06ryy0QUAEfoN6K56ObM/1QTAjc=", + "lastModified": 1664370076, + "narHash": "sha256-NDnIo0nxJozLwEw0VPM+RApMA90uTfbvaNNtC5eB7Os=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ae1dc133ea5f1538d035af41e5ddbc2ebcb67b90", + "rev": "854fdc68881791812eddd33b2fed94b954979a8e", "type": "github" }, "original": { @@ -592,11 +353,11 @@ }, "nixpkgs-22_05": { "locked": { - "lastModified": 1664063819, - "narHash": "sha256-5wXa+9uboo7UizMDeUTMoANv3pm0g9ze1NdTleY3rCE=", + "lastModified": 1664201777, + "narHash": "sha256-cUW9DqELUNi1jNMwVSbfq4yl5YGyOfeu+UHUUImbby0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "aee4db5b9eaccd3fb7f16c742685fef9dc355077", + "rev": "00f877f4927b6f7d7b75731b5a1e2ae7324eaf14", "type": "github" }, "original": { @@ -624,11 +385,11 @@ }, "nixpkgs-unstable_2": { "locked": { - "lastModified": 1664017330, - "narHash": "sha256-919WZKBTxFdTkzIK6uJXE7hwSPQb7e/ekybxxWaotR4=", + "lastModified": 1664370076, + "narHash": "sha256-NDnIo0nxJozLwEw0VPM+RApMA90uTfbvaNNtC5eB7Os=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fde244a8c7655bc28616864e2290ad9c95409c2c", + "rev": "854fdc68881791812eddd33b2fed94b954979a8e", "type": "github" }, "original": { @@ -640,11 +401,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1664029467, - "narHash": "sha256-ir7JbsLp2mqseCs3qI+Z/pkt+Gh+GfANbYcI5I+Gvnk=", + "lastModified": 1664438633, + "narHash": "sha256-qEotLz24HnHhgmba4drLHIxXG+IKQ7uve5GjUhjWhTU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "893b6b9f6c4ed0c7efdb84bd300a499a2da9fa51", + "rev": "13cbe534ebe63a0bc2619c57661a2150569d0443", "type": "github" }, "original": { @@ -654,116 +415,21 @@ "type": "github" } }, - "nose": { - "flake": false, - "locked": { - "lastModified": 1400604510, - "narHash": "sha256-daEi8Kta1oGaDEmUUDDQMahTTPOpvNpDKk22rlr7cB0=", - "owner": "emacsattic", - "repo": "nose", - "rev": "f8528297519eba911696c4e68fa88892de9a7b72", - "type": "github" - }, - "original": { - "owner": "emacsattic", - "repo": "nose", - "type": "github" - } - }, - "ob-racket": { - "flake": false, - "locked": { - "lastModified": 1584656173, - "narHash": "sha256-rBUYDDCXb+3D4xTPQo9UocbTPZ32kWV1Uya/1DmZknU=", - "owner": "xchrishawk", - "repo": "ob-racket", - "rev": "83457ec9e1e96a29fd2086ed19432b9d75787673", - "type": "github" - }, - "original": { - "owner": "xchrishawk", - "repo": "ob-racket", - "type": "github" - } - }, - "org": { - "flake": false, - "locked": { - "lastModified": 1662614940, - "narHash": "sha256-9eAqhKXpTfZQH3bn19ien3HIzF100h8z97iHqs/QUgY=", - "owner": "emacs-straight", - "repo": "org-mode", - "rev": "eb5ef0ae1424a725f933ef3929e5396a2ab727ab", - "type": "github" - }, - "original": { - "owner": "emacs-straight", - "repo": "org-mode", - "type": "github" - } - }, - "org-contrib": { - "flake": false, - "locked": { - "lastModified": 1661026052, - "narHash": "sha256-rE7aioQxeVjo+TVI4DIppKkmf/c7tRNzK6hQJAmUnVE=", - "owner": "emacsmirror", - "repo": "org-contrib", - "rev": "0740bd3fe69c4b327420185d931dcf0a9900a80e", - "type": "github" - }, - "original": { - "owner": "emacsmirror", - "repo": "org-contrib", - "type": "github" - } - }, - "org-yt": { - "flake": false, - "locked": { - "lastModified": 1527381913, - "narHash": "sha256-dzQ6B7ryzatHCTLyEnRSbWO0VUiX/FHYnpHTs74aVUs=", - "owner": "TobiasZawada", - "repo": "org-yt", - "rev": "40cc1ac76d741055cbefa13860d9f070a7ade001", - "type": "github" - }, - "original": { - "owner": "TobiasZawada", - "repo": "org-yt", - "type": "github" - } - }, - "php-extras": { - "flake": false, - "locked": { - "lastModified": 1573312690, - "narHash": "sha256-r4WyVbzvT0ra4Z6JywNBOw5RxOEYd6Qe2IpebHXkj1U=", - "owner": "arnested", - "repo": "php-extras", - "rev": "d410c5af663c30c01d461ac476d1cbfbacb49367", - "type": "github" - }, - "original": { - "owner": "arnested", - "repo": "php-extras", - "type": "github" - } - }, "polymc": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat", "libnbtplusplus": "libnbtplusplus", "nixpkgs": [ "nixpkgs" - ] + ], + "tomlplusplus": "tomlplusplus" }, "locked": { - "lastModified": 1664128255, - "narHash": "sha256-id39TQiucoeOJiOOwXuYRszvLHx/8yVf5jYFu/z/gvE=", + "lastModified": 1664572125, + "narHash": "sha256-BfjEu6zpnWxm2rTkyma/OtLlr80vJmumJ5tdSFNTdvc=", "owner": "PolyMC", "repo": "PolyMC", - "rev": "58a5331f7bafb149c18f560a0363daab65521262", + "rev": "c97a47dc626c775884579d448a9d7363a936a0c1", "type": "github" }, "original": { @@ -793,22 +459,6 @@ "type": "github" } }, - "revealjs": { - "flake": false, - "locked": { - "lastModified": 1662369032, - "narHash": "sha256-1BZWA3W77YbNZUj+7vJbkTeWY8O4jjPg7t5PvlEVDYA=", - "owner": "hakimel", - "repo": "reveal.js", - "rev": "8a97ad58b04045fe5a9c964aa31659bd27e665c5", - "type": "github" - }, - "original": { - "owner": "hakimel", - "repo": "reveal.js", - "type": "github" - } - }, "root": { "inputs": { "darwin": "darwin", @@ -818,7 +468,6 @@ "home-manager": "home-manager", "java": "java", "mozilla": "mozilla", - "nix-doom-emacs": "nix-doom-emacs", "nix-on-droid": "nix-on-droid", "nixos-generators": "nixos-generators", "nixpkgs": "nixpkgs_2", @@ -829,30 +478,14 @@ "wsl": "wsl" } }, - "rotate-text": { - "flake": false, - "locked": { - "lastModified": 1322962747, - "narHash": "sha256-SOeOgSlcEIsKhUiYDJv0p+mLUb420s9E2BmvZQvZ0wk=", - "owner": "debug-ito", - "repo": "rotate-text.el", - "rev": "48f193697db996855aee1ad2bc99b38c6646fe76", - "type": "github" - }, - "original": { - "owner": "debug-ito", - "repo": "rotate-text.el", - "type": "github" - } - }, "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1664049888, - "narHash": "sha256-aCHudrXd8DKocehX6aWzlbZv4bq2l7MFXhM/wc2NdmI=", + "lastModified": 1664449487, + "narHash": "sha256-+k1L0+vQBcMNxdbk2cVp/PoUzKeU65OI2ZfZTy3HiVA=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "73ab709b38b171d561c119f5c6f94af1bf2e4f3b", + "rev": "97f8f4a3da6cfbac4d914eca7d6a87da8f27901c", "type": "github" }, "original": { @@ -862,22 +495,6 @@ "type": "github" } }, - "sln-mode": { - "flake": false, - "locked": { - "lastModified": 1423727528, - "narHash": "sha256-XqkqPyEJuTtFslOz1fpTf/Klbd/zA7IGpzpmum/MGao=", - "owner": "sensorflo", - "repo": "sln-mode", - "rev": "0f91d1b957c7d2a7bab9278ec57b54d57f1dbd9c", - "type": "github" - }, - "original": { - "owner": "sensorflo", - "repo": "sln-mode", - "type": "github" - } - }, "sops-nix": { "inputs": { "nixpkgs": [ @@ -886,11 +503,11 @@ "nixpkgs-22_05": "nixpkgs-22_05" }, "locked": { - "lastModified": 1664080128, - "narHash": "sha256-obau1+3+QiTtNGfoTcbSYB5Z4Gvf4o0Or85yLttSYt8=", + "lastModified": 1664204020, + "narHash": "sha256-LAey3hr8b9EAt3n304Wt9Vm4uQFd8pSRtLX8leuYFDs=", "owner": "Mic92", "repo": "sops-nix", - "rev": "17f009daf09992d2342657f9bd7b44d877cd00e1", + "rev": "912f9ff41fd9353dec1f783170793699789fe9aa", "type": "github" }, "original": { @@ -899,19 +516,19 @@ "type": "github" } }, - "ts-fold": { + "tomlplusplus": { "flake": false, "locked": { - "lastModified": 1662386895, - "narHash": "sha256-pYW2hcHgkr9KYdRvX2EkpOt/OL8yl+mkZ21JbMKWc8Q=", - "owner": "jcs-elpa", - "repo": "ts-fold", - "rev": "017402713bd2f1fd7a691aa48afb4330f5397432", + "lastModified": 1664034574, + "narHash": "sha256-EFMAl6tsTvkgK0DWC/pZfOIq06b2e5SnxJa1ngGRIQA=", + "owner": "marzer", + "repo": "tomlplusplus", + "rev": "8aa5c8b2a4ff2c440d4630addf64fa4f62146170", "type": "github" }, "original": { - "owner": "jcs-elpa", - "repo": "ts-fold", + "owner": "marzer", + "repo": "tomlplusplus", "type": "github" } }, @@ -960,26 +577,10 @@ "type": "github" } }, - "ws-butler": { - "flake": false, - "locked": { - "lastModified": 1634511126, - "narHash": "sha256-c0y0ZPtxxICPk+eaNbbQf6t+FRCliNY54CCz9QHQ8ZI=", - "owner": "hlissner", - "repo": "ws-butler", - "rev": "572a10c11b6cb88293de48acbb59a059d36f9ba5", - "type": "github" - }, - "original": { - "owner": "hlissner", - "repo": "ws-butler", - "type": "github" - } - }, "wsl": { "inputs": { - "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_4", + "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils_3", "nixpkgs": [ "nixpkgs" ] diff --git a/flake.nix b/flake.nix index 413c2c3..4fe0748 100644 --- a/flake.nix +++ b/flake.nix @@ -12,11 +12,6 @@ url = "github:nix-community/emacs-overlay"; inputs.nixpkgs.follows = "nixpkgs-unstable"; }; - nix-doom-emacs = { - url = "github:nix-community/nix-doom-emacs"; - inputs.nixpkgs.follows = "nixpkgs-unstable"; - inputs.emacs-overlay.follows = "emacs"; - }; mozilla = { url = "github:mozilla/nixpkgs-mozilla"; flake = false; @@ -77,7 +72,6 @@ , home-manager , darwin , polymc - , nix-doom-emacs , java , quilt-server , nixos-generators diff --git a/home-manager/common/programs/emacs.nix b/home-manager/common/programs/emacs.nix index 6793141..6fcd350 100644 --- a/home-manager/common/programs/emacs.nix +++ b/home-manager/common/programs/emacs.nix @@ -1,8 +1,6 @@ { config, lib, pkgs, inputs, ... }: { - imports = [ inputs.nix-doom-emacs.hmModule ]; - config = lib.mkIf config.nathan.programs.emacs.enable { # Dependencies of my emacs environment home.packages = with pkgs; [ @@ -26,6 +24,8 @@ rnix-lsp manix nix-doc + # For email + mu # Desktop file for org-protocol (makeDesktopItem { name = "org-protocol"; @@ -36,50 +36,5 @@ mimeTypes = [ "x-scheme-handler/org-protocol" ]; }) ]; - # Setup doom emacs - programs.doom-emacs = { - enable = true; - doomPrivateDir = ../../../doom.d; - emacsPackage = config.nathan.programs.emacs.package; - emacsPackagesOverlay = self: super: { - org-protocol-capture-html = self.trivialBuild { - pname = "org-protocol-capture-html"; - ename = "org-protocol-capture-html"; - version = "0.0.0"; - packageRequires = [ self.s ]; - src = pkgs.fetchFromGitHub { - owner = "alphapapa"; - repo = "org-protocol-capture-html"; - rev = "3359ce9a2f3b48df26329adaee0c4710b1024250"; - hash = "sha256-ueEHJCS+aHYCnd4Lm3NKgqg+m921nl5XijE9ZnSRQXI="; - }; - }; - anki-editor = self.trivialBuild { - pname = "anki-editor"; - ename = "anki-editor"; - version = "0.3.1"; - packageRequires = with self; [ - dash - request - ]; - src = pkgs.fetchFromGitHub { - owner = "billop"; - repo = "anki-editor"; - rev = "c11187a79a980a738af608c98f8de2cdc1d988be"; - hash = "sha256-3R9bEu982a9Tq+hXy+ALFF/N2NwK9MsqDELFVGHV09I="; - }; - }; - }; - extraPackages = [ pkgs.mu ]; - }; - # Set editor - home.sessionVariables = { - EDITOR = "emacsclient"; - VISUAL = "emacsclient"; - }; - systemd.user.sessionVariables = { - EDITOR = "emacsclient"; - VISUAL = "emacsclient"; - }; }; } diff --git a/home-manager/linux/programs/emacs.nix b/home-manager/linux/programs/emacs.nix index 0106f13..decdb13 100644 --- a/home-manager/linux/programs/emacs.nix +++ b/home-manager/linux/programs/emacs.nix @@ -7,7 +7,9 @@ # Setup service services.emacs = { enable = config.nathan.programs.emacs.service; + package = config.nathan.programs.emacs.package; client.enable = true; + defaultEditor = true; }; }; }