Emacs vterm working properly

flake.lock

@@ -8,16 +8,15 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1672244468,
-        "narHash": "sha256-xaZb8AZqoXRCSqPusCk4ouf+fUNP8UJdafmMTF1Ltlw=",
+        "lastModified": 1673815682,
+        "narHash": "sha256-zG7Rroki+89poCTr1D8BM/wTCl+DZJvU4IUE+5hxG7U=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "89a8ba0b5b43b3350ff2e3ef37b66736b2ef8706",
+        "rev": "3e42035fc013ed4d8af6ee8dc0079c0c551c45a5",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-22.11",
         "repo": "home-manager",
         "type": "github"
       }

flake.nix

@@ -1,7 +1,7 @@
 {
   inputs = {
     nixpkgs.url = "nixpkgs/nixos-unstable";
-    home-manager.url = "github:nix-community/home-manager?ref=release-22.11";
+    home-manager.url = "github:nix-community/home-manager";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
   };
 

users/carsten/conf/emacs.nix

@@ -5,7 +5,6 @@
       DOOMDIR = "${config.xdg.configHome}/doom";
       DOOMLOCALDIR = "${config.xdg.configHome}/doom-local";
       DOOMPROFILELOADFILE = "${config.xdg.configHome}/doom-local/profiles.el";
-      EMACS = "${pkgs.emacs}/bin/emacs";
     };
   };
 
@@ -15,8 +14,8 @@
       onChange = "${pkgs.writeShellScript "doom-change" ''
           export DOOMDIR="${config.home.sessionVariables.DOOMDIR}"
           export DOOMLOCALDIR="${config.home.sessionVariables.DOOMLOCALDIR}"
-          export EMACS="${pkgs.emacs}/bin/emacs"
           export PATH="${lib.makeBinPath [ pkgs.git ]}:$PATH"
+          export EMACS="${toString config.home.path}/bin/emacs"
           if [ ! -d "$DOOMLOCALDIR" ]; then
             ${config.xdg.configHome}/emacs/bin/doom install
           else
@@ -24,16 +23,20 @@
           fi
       ''}";
     };
+    #"doom/themes/catppuccin-theme.el" = {
+    #  source = config.lib.file.mkOutOfStoreSymlink "~/source/ctp-emacs/catppuccin-theme.el";
+    #};
     "emacs" = {
       source = pkgs.fetchgit {
         url = "https://github.com/doomemacs/doomemacs";
-        hash = "sha256-C+mQGq/HBDgRkqdwYE/LB3wQd3oIbTQfzldtuhmKVeU=";
+        rev = "e96624926d724aff98e862221422cd7124a99c19";
+        sha256 = "sha256-C+mQGq/HBDgRkqdwYE/LB3wQd3oIbTQfzldtuhmKVeU=";
       };
       onChange = "${pkgs.writeShellScript "doom-change" ''
           export DOOMDIR="${config.home.sessionVariables.DOOMDIR}"
           export DOOMLOCALDIR="${config.home.sessionVariables.DOOMLOCALDIR}"
-          export EMACS="${pkgs.emacs}/bin/emacs"
           export PATH="${lib.makeBinPath [ pkgs.git ]}:$PATH"
+          export EMACS="${toString config.home.path}/bin/emacs"
           if [ ! -d "$DOOMLOCALDIR" ]; then
             ${config.xdg.configHome}/emacs/bin/doom install
           else

users/carsten/pkgs/default.nix

@@ -2,23 +2,19 @@
   imports = [ ];
 
   programs.bash.enable = true;
+  programs.emacs = {
+    enable = true;
+    package = pkgs.emacs;
+    extraPackages = epkgs: [
+      epkgs.vterm
+      epkgs.pdf-tools
+      epkgs.auctex
+    ];
+  };
+
+
 
   home.packages = with pkgs; [
-    (let wrapped = pkgs.writeShellScriptBin "emacs" ''
-        export DOOMDIR=$HOME/.config/doom
-        export DOOMLOCALDIR=$HOME/.config/doom-local
-        export EMACS=${pkgs.emacs}/bin/emacs
-        exec "${pkgs.emacs}/bin/emacs" $@
-      '';
-    in pkgs.symlinkJoin {
-      name = "emacs";
-      paths = [
-        wrapped
-        ((emacsPackagesFor emacs).emacsWithPackages (epkgs: [
-          epkgs.vterm
-        ]))
-      ];
-    })
     catppuccin-gtk
     bat
     (discord.override { withOpenASAR = true; })