diff --git a/configuration.nix b/configuration.nix
index 911bc87..37423a1 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -138,6 +138,8 @@
     nodejs
     musescore
     ranger
+    anki-bin
+    flutter
 
     # nvim
     lunarvim
diff --git a/home-nico.nix b/home-nico.nix
index 9fb24cc..a79d7dd 100644
--- a/home-nico.nix
+++ b/home-nico.nix
@@ -203,6 +203,7 @@ programs.zsh = {
 
   shellAliases = {
     update = "sudo nixos-rebuild switch --flake /etc/nixos/#my-nixos";
+    emacs = "emacs -nw";
   };
   zplug = {
     enable = true;
diff --git a/packages/default.nix b/packages/default.nix
index 1e6b9f4..8f711fc 100644
--- a/packages/default.nix
+++ b/packages/default.nix
@@ -5,6 +5,7 @@
     ./waybar
     ./wpaperd
     ./nvim
+    ./emacs
 #    ./kitty
 #    ./hyprland
 #    ./vscode
diff --git a/packages/emacs/config.el b/packages/emacs/config.el
new file mode 100644
index 0000000..a63b668
--- /dev/null
+++ b/packages/emacs/config.el
@@ -0,0 +1 @@
+(load-theme 'zerodark t)
diff --git a/packages/emacs/default.nix b/packages/emacs/default.nix
new file mode 100644
index 0000000..f44db5e
--- /dev/null
+++ b/packages/emacs/default.nix
@@ -0,0 +1,66 @@
+{ config, pkgs, ... }:
+
+let
+  emacsWithPackages = (pkgs.emacsPackagesFor pkgs.emacs).emacsWithPackages;
+in {
+  programs.emacs = {
+    enable = true;
+    extraConfig = ''
+(load-theme 'catppuccin :no-confirm)
+(global-display-line-numbers-mode 1)
+(telephone-line-mode 1)
+
+(require 'nix-mode)
+(add-to-list 'auto-mode-alist '("\\.nix\\'" . nix-mode))
+
+(require 'evil)
+
+(evil-mode 1)
+
+(require 'smex)
+(smex-initialize)
+
+  (global-set-key (kbd "M-x") 'smex)
+  (global-set-key (kbd "M-X") 'smex-major-mode-commands)
+  ;; This is your old M-x.
+  (global-set-key (kbd "C-c C-c M-x") 'execute-extended-command)
+
+
+(add-hook 'dart-mode-hook 'lsp)
+(add-hook 'prog-mode-hook #'rainbow-delimiters-mode)
+
+(setq gc-cons-threshold (* 100 1024 1024)
+      read-process-output-max (* 1024 1024))
+
+;;Exit insert mode by pressing j and then k quickly
+(setq key-chord-two-keys-delay 0.5)
+(key-chord-define evil-insert-state-map "jk" 'evil-normal-state)
+(key-chord-mode 1)
+
+    '';
+    package = emacsWithPackages (epkgs: (with epkgs.melpaStablePackages; [
+    catppuccin-theme
+      ])
+      ++ (with epkgs.melpaPackages; [
+	evil
+	nix-mode
+  dart-mode
+  lsp-dart
+  lsp-treemacs
+  flycheck
+  lsp-mode
+  company
+  rainbow-delimiters
+  undo-fu
+  key-chord
+  telephone-line
+  smex
+  ranger
+      ])
+      ++ (with epkgs.elpaPackages; [
+  undo-tree
+      ])
+      ++ [ pkgs.notmuch ]);
+    };
+}
+
diff --git a/packages/emacs/default.nix~ b/packages/emacs/default.nix~
new file mode 100644
index 0000000..7b64bf3
--- /dev/null
+++ b/packages/emacs/default.nix~
@@ -0,0 +1,32 @@
+{ config, pkgs, ... }:
+
+let
+  emacsWithPackages = (pkgs.emacsPackagesFor pkgs.emacs).emacsWithPackages;
+in {
+  programs.emacs = {
+    enable = true;
+    extraConfig = ''
+(load-theme 'catppuccin :no-confirm)
+
+(require 'nix-mode)
+(add-to-list 'auto-mode-alist '("\\.nix\\'" . nix-mode))
+
+(require 'evil)
+
+(evil-mode 1)
+
+    '';
+    package = emacsWithPackages (epkgs: (with epkgs.melpaStablePackages; [
+    catppuccin-theme
+      ])
+      ++ (with epkgs.melpaPackages; [
+	evil
+	nix-mode
+  lsp-mode
+      ])
+      ++ (with epkgs.elpaPackages; [
+      ])
+      ++ [ pkgs.notmuch ]);
+    };
+}
+
diff --git a/push.sh b/push.sh
index c6bcfc8..165f190 100755
--- a/push.sh
+++ b/push.sh
@@ -2,7 +2,7 @@
 
 if [ -z "$1" ]
   then
-    echo "No argument supplied"
+    echo "No commit message supplied"
     exit 1
 fi