diff --git a/flake.lock b/flake.lock
index e33754a..de24eb5 100755
--- a/flake.lock
+++ b/flake.lock
@@ -8,11 +8,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1673667358,
-        "narHash": "sha256-29xEYwKyYQQzpmN7bdCGRTNiSazkpFF6UWYx2RYaKJo=",
+        "lastModified": 1673838100,
+        "narHash": "sha256-iLNzJqL01hHuZcnxNoB7bqj65lfQtEAc7+krVW4R6ck=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "1114c22aeb13c1c2344f237ec57bf155c9fc1a8f",
+        "rev": "b63cf575927c768ad4dbc4a70f64201e59cf3da6",
         "type": "github"
       },
       "original": {
@@ -38,11 +38,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1673612960,
-        "narHash": "sha256-DWR7hrbecJKmUJCswk9MXZta710mq+3jZwTvHU/UfyY=",
+        "lastModified": 1673704454,
+        "narHash": "sha256-5Wdj1MgdOgn3+dMFIBtg+IAYZApjF8JzwLWDPieg0C4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e285dd0ca97c264003867c7329f0d1f4f028739c",
+        "rev": "a83ed85c14fcf242653df6f4b0974b7e1c73c6c6",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index f083656..baa83da 100755
--- a/flake.nix
+++ b/flake.nix
@@ -35,60 +35,62 @@
         grammers
       ];
     });
-  in {
-    packages.${system} = let
-      custom-emacs =
-        with nix; with pkgs;
-        ((emacsPackagesFor emacs).emacsWithPackages (epkgs: with epkgs; [
-          avy
-          company
-          editorconfig
-          evil
-          evil-collection
-          evil-goggles
-          evil-textobj-tree-sitter
-          flycheck
-          lsp-mode
-          lsp-treemacs
-          lsp-ui
-          magit
-          markdown-mode
-          nix-mode reformatter # required by nix mode
-          projectile
-          rainbow-mode
-          rustic
-          tree-sitter
-          tree-sitter-langs
-          (trivialBuild {
-            pname = "ts-fold";
-            version = "0.1.0";
-            src = ts-fold;
 
-            buildInputs = [
-              tree-sitter
-              s
-              fringe-helper
-            ];
-          })
-          treemacs
-          treemacs-evil
-          treemacs-projectile
-          treemacs-magit
-          use-package
-          vertico
-          which-key
-          ws-butler
-        ]));
-    in {
-      emacs = custom-emacs;
+    custom-emacs =
+    with nix; with pkgs;
+    ((emacsPackagesFor emacsPgtk).emacsWithPackages (epkgs: with epkgs; [
+        avy
+        company
+        editorconfig
+        evil
+        evil-collection
+        evil-goggles
+        evil-textobj-tree-sitter
+        flycheck
+        lsp-mode
+        lsp-treemacs
+        lsp-ui
+        magit
+        markdown-mode
+        nix-mode reformatter # required by nix mode
+        projectile
+        rainbow-mode
+        rustic
+        tree-sitter
+        tree-sitter-langs
+        (trivialBuild {
+        pname = "ts-fold";
+        version = "0.1.0";
+        src = ts-fold;
+
+        buildInputs = [
+            tree-sitter
+            s
+            fringe-helper
+        ];
+        })
+        treemacs
+        treemacs-evil
+        treemacs-projectile
+        treemacs-magit
+        use-package
+        vertico
+        which-key
+        ws-butler
+    ]));
+  in {
+    packages.${system} = {
+      default = custom-emacs;
 
       module =
         with nix; {
           home.packages = [ custom-emacs ];
 
+          services.emacs.enable = true;
+
           xdg.configFile."emacs".source = with pkgs;
             runCommandNoCC ".emacs.d" {
-              nativeBuildInputs = [ emacs ];
+              nativeBuildInputs = [ emacsPgtk ];
             } ''
               cp ${./early-init.el} early-init.el
               cp ${./init.el} init.el