Only set pgtk version of emacs in hyprland expression

home/emacs/default.nix

@@ -1,9 +1,59 @@
 { pkgs, ... }:
-let package = pkgs.emacs29-pgtk;
-in {
-  imports = [ ./dependencies.nix ];
-  programs.emacs = {
-    inherit package;
-    enable = true;
-  };
+
+{
+  programs.emacs.enable = true;
+  home.packages = with pkgs; [
+    # Emacs dependencies
+    git
+    ripgrep
+    coreutils
+    cmake
+    fd
+    graphviz
+
+    # Mail server setup
+    isync
+    mu
+    protonmail-bridge
+
+    # Language-specific requirements
+    ispell
+    findutils
+    sqlite
+    pandoc
+    gfortran
+    texlive.combined.scheme-medium
+
+    # Formatters
+    nixfmt
+    beautysh
+    nodePackages.fixjson
+    fprettify
+    shellharden
+    stylua
+    python3Packages.mdformat
+
+    # LSP servers
+    nil
+    fortls
+    (python3.withPackages (ps:
+      with ps; [
+        python-lsp-server
+        python-lsp-ruff
+        python-lsp-black
+        pyls-isort
+        pylsp-rope
+        pylsp-mypy
+      ]))
+    nodePackages.yaml-language-server
+    nodePackages.bash-language-server
+    nodePackages.vscode-html-languageserver-bin
+    nodePackages.vscode-css-languageserver-bin
+    nodePackages.vscode-json-languageserver-bin
+    nodePackages.dockerfile-language-server-nodejs
+    shellcheck
+    marksman
+    luajitPackages.lua-lsp
+    texlab
+  ];
 }

home/emacs/dependencies.nix

@@ -1,58 +0,0 @@
-{ pkgs, ... }:
-
-{
-  home.packages = with pkgs; [
-    # Emacs dependencies
-    git
-    ripgrep
-    coreutils
-    cmake
-    fd
-    graphviz
-
-    # Mail server setup
-    isync
-    mu
-    protonmail-bridge
-
-    # Language-specific requirements
-    ispell
-    findutils
-    sqlite
-    pandoc
-    gfortran
-    texlive.combined.scheme-medium
-
-    # Formatters
-    nixfmt
-    beautysh
-    nodePackages.fixjson
-    fprettify
-    shellharden
-    stylua
-    python3Packages.mdformat
-
-    # LSP servers
-    nil
-    fortls
-    (python3.withPackages (ps:
-      with ps; [
-        python-lsp-server
-        python-lsp-ruff
-        python-lsp-black
-        pyls-isort
-        pylsp-rope
-        pylsp-mypy
-      ]))
-    nodePackages.yaml-language-server
-    nodePackages.bash-language-server
-    nodePackages.vscode-html-languageserver-bin
-    nodePackages.vscode-css-languageserver-bin
-    nodePackages.vscode-json-languageserver-bin
-    nodePackages.dockerfile-language-server-nodejs
-    shellcheck
-    marksman
-    luajitPackages.lua-lsp
-    texlab
-  ];
-}

home/hyprland/default.nix

@@ -31,6 +31,7 @@ in {
   ];
   home.packages = with pkgs; [ libsForQt5.polkit-kde-agent configure-gtk ];
   programs = {
+    emacs.package = pkgs.emacs29-pgtk;
     password-store.package = pkgs.pass-wayland;
     firefox.package = pkgs.firefox-wayland;
     rofi = {

hosts/Monarch/home.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ lib, pkgs, ... }:
 let
   username = "tux";
   homeDirectory = "/Users/${username}";
@@ -9,12 +9,12 @@ in {
     ../../home/ssh
     ../../home/tui
     ../../home/alacritty
-    ../../home/emacs/dependencies.nix
+    ../../home/emacs
   ];
   home = {
     inherit username homeDirectory;
     stateVersion = "23.05";
-    packages = with pkgs; [ emacs28NativeComp coreutils-prefixed ];
+    packages = with pkgs; [ coreutils-prefixed ];
   };
   programs = {
     home-manager.enable = true;
@@ -24,6 +24,7 @@ in {
         eval "$(/opt/homebrew/bin/brew shellenv)"
       '';
     };
+    emacs.package = pkgs.emacs29;
   };
   services.syncthing.enable = true;
 }