diff --git a/emacs/default.nix b/emacs/default.nix
index 0dc6f3b..82c4fe5 100644
--- a/emacs/default.nix
+++ b/emacs/default.nix
@@ -1,7 +1,37 @@
+{pkgs, ...}:
 {
   programs.emacs = {
     enable = true;
-    # set the package to a dummy package, install with system package manager
-    # specifically use the emacs gtk package
+    package = pkgs.emacs29-pgtk;
+    extraConfig = ''
+      (menu-bar-mode -1)
+      (tool-bar-mode -1)
+      (scroll-bar-mode -1)
+      (load-theme 'catppuccin :no-confirm)
+      (add-to-list 'default-frame-alist
+             '(font . "ComicMono Nerd Font-12"))
+
+      (global-set-key (kbd "C-c a") #'org-agenda)
+
+      (require 'evil)
+      (evil-mode 1)
+
+      (require 'evil-org)
+      (add-hook 'org-mode-hook 'evil-org-mode)
+      (evil-org-set-key-theme '(textobjects insert navigation additional shift todo heading))
+      (require 'evil-org-agenda)
+      (evil-org-agenda-set-keys)
+      (require 'smooth-scrolling)
+      (smooth-scrolling-mode 1)
+    '';
+    extraPackages = epkgs: with epkgs; [
+      base16-theme
+      catppuccin-theme
+      evil
+      evil-org
+      org-download
+      adaptive-wrap
+      smooth-scrolling
+    ];
   };
 }
diff --git a/helix/default.nix b/helix/default.nix
index 350c180..7d6354a 100644
--- a/helix/default.nix
+++ b/helix/default.nix
@@ -26,6 +26,7 @@
             nil
             nodePackages.bash-language-server
             shellcheck
+            java-language-server
           ])
         ];
     });
diff --git a/helix/languages.nix b/helix/languages.nix
index b07101d..248a5ea 100644
--- a/helix/languages.nix
+++ b/helix/languages.nix
@@ -13,6 +13,11 @@
           args = ["-i" "2"];
         };
       }
+
+      {
+        name = "java";
+        language-servers = [ "java-language-server" ];
+      }
     ];
     language-server = {
       bash-language-server = {
@@ -42,6 +47,10 @@
           "--keep-intermediates"
         ];
       };
+
+      java-language-server = {
+        command = "${pkgs.java-language-server}/bin/java-language-server";
+      };
     };
   };
 }
diff --git a/home.nix b/home.nix
index 6598de9..8937a7f 100644
--- a/home.nix
+++ b/home.nix
@@ -16,6 +16,7 @@
       ls = "eza";
       la = "eza -la";
       l = "eza -l";
+      cat = "bat";
       gaa = "git add .";
       gcm = "git commit -m";
       gpom = "git push -u origin main";