diff --git a/flake.lock b/flake.lock index de9ecbc..5207678 100644 --- a/flake.lock +++ b/flake.lock @@ -46,11 +46,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1704298643, - "narHash": "sha256-zfiq9+cBKDcq1ZZXc+emdr3As3CTeneiWXwANtV064s=", + "lastModified": 1704300583, + "narHash": "sha256-J7eZ8lWwhC5ytBgrtDYhrWOAir9g2JzgucY48R9HVW8=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "f1d372c3cc8c5524c6f0c937a5629365203c351b", + "rev": "037752e56a049798a44a9a07dec53617bdba5bc0", "type": "github" }, "original": { diff --git a/modules/emacs.nix b/modules/emacs.nix index 474e91e..35f60d1 100644 --- a/modules/emacs.nix +++ b/modules/emacs.nix @@ -1,12 +1,9 @@ { pkgs, lib, config, ... }: -let -myEmacs = pkgs.emacs-pgtk; -in with lib; { services.emacs = { enable = true; - package = with pkgs; ((emacsPackagesFor myEmacs).emacsWithPackages + package = with pkgs; ((emacsPackagesFor pkgs.emacs-pgtk).emacsWithPackages (epkgs: with epkgs; [ vterm melpaPackages.magit @@ -56,14 +53,22 @@ with lib; org-roam-ui org-present org-modern + # (org-re-reveal.overrideAttrs (o: { + # src = pkgs.fetchgit { + # url = "https://gitlab.com/oer/org-re-reveal"; + # rev = "7c39d15b841c7a8d197a24c89e5fef5d54e271aa"; + # sha256 = "/1eXxIY8SqLLC10ekGs7G3o7U7MIA01mtsl2C6lo7us="; + # }; + # })) + # org-re-reveal melpaPackages.org-re-reveal - melpaPackages.org-re-reveal-ref - melpaPackages.org-re-reveal-citeproc + # melpaPackages.org-re-reveal-ref + # melpaPackages.org-re-reveal-citeproc org-web-tools org-transclusion - ox-reveal + # ox-reveal ox-hugo - oer-reveal + # oer-reveal unicode-fonts emojify undo-tree diff --git a/scripts/upgrade-nix b/scripts/upgrade-nix index 185aabd..39aac09 100755 --- a/scripts/upgrade-nix +++ b/scripts/upgrade-nix @@ -1,5 +1,5 @@ #!/bin/sh currentdir=$(pwd) cd ~/.dotfiles -nixos-rebuild --use-remote-sudo switch --verbose --impure --flake .# +nixos-rebuild --use-remote-sudo switch --show-trace --verbose --impure --flake .# cd $currentdir