diff --git a/README.org b/README.org
index 0f6923b..cea3482 100644
--- a/README.org
+++ b/README.org
@@ -112,7 +112,11 @@ Notice how I am including all of my software here. It may be a big file, but hav
   i18n.defaultLocale = "en_US.UTF-8";
 
   # Set default shell to be dash for speed
-  environment.binsh = "${pkgs.dash}/bin/dash";
+  # environment.binsh = "${pkgs.dash}/bin/dash";
+  environment.variables = {
+    EDITOR = "emacsclient -t"
+    VISUAL = "emacsclient -c"
+  };
 
   hardware.uinput.enable = true;
 
@@ -184,7 +188,7 @@ Notice how I am including all of my software here. It may be a big file, but hav
   # Define a user account. Don't forget to set a password with ‘passwd’.
   users.users.chris = {
     isNormalUser = true;
-    extraGroups = [ "wheel" "networkmanager" "input" ]; # Enable ‘sudo’ for the user.
+    extraGroups = [ "wheel" "networkmanager" "input" "uinput" ];
   };
 
   programs.partition-manager.enable = true;
@@ -214,8 +218,14 @@ Notice how I am including all of my software here. It may be a big file, but hav
     zip
     gzip
     usbutils
+    binutils
+    hunspell
+    hunspellDicts.en_US
     git
+    openssh
+    samba
     ark
+    dash
     kget
     krename
     kwallet-pam
@@ -224,24 +234,57 @@ Notice how I am including all of my software here. It may be a big file, but hav
     sddm-kcm
     ydotool
     bottles
-    exa mpv yt-dlp rofi-emoji
-    nerdfonts latte-dock bat
-    libsForQt5.bismuth libnotify
-    rofi-wayland ripgrep bc 
-    sysstat procs papirus-icon-theme
-    phinger-cursors plasma-hud kde-cli-tools
-    macchina meson ninja cmake 
-    extra-cmake-modules gzip 
-    htop btop firefox kate kdialog openlp
-    libreoffice-fresh vlc
-    neochat haskellPackages.greenclip
-    pulsemixer any-nix-shell wtype
-    spotdl kdenlive ffmpeg neofetch
-    xdotool fennel
+    exa
+    mpv
+    yt-dlp
+    rofi-emoji
+    nerdfonts
+    latte-dock
+    bat
+    libsForQt5.bismuth
+    libnotify
+    rofi-wayland
+    ripgrep
+    bc 
+    sysstat
+    procs
+    papirus-icon-theme
+    phinger-cursors
+    plasma-hud
+    kde-cli-tools
+    macchina
+    meson
+    ninja
+    gnumake
+    gcc
+    gdb
+    clang
+    cmake 
+    extra-cmake-modules
+    gzip 
+    htop
+    btop
+    firefox
+    kate
+    kdialog
+    openlp
+    libreoffice-fresh
+    vlc
+    neochat
+    haskellPackages.greenclip
+    pulsemixer
+    any-nix-shell
+    wtype
+    spotdl
+    kdenlive
+    ffmpeg
+    neofetch
+    xdotool
+    fennel
   ];
 
   # EMACS
-  services.emacs.package = pkgs.emacsPgtkNativeComp;
+  services.emacs.package = with pkgs; ((emacsPackagesFor emacsPgtkNativeComp).emacsWithPackages (epkgs: [ epkgs.vterm epkgs.magit epkgs.pdf-tools ]));
   nixpkgs.overlays = [
 
     (import (builtins.fetchTarball {
@@ -450,7 +493,6 @@ Kaladin is my desktop machine. A powerhouse for the most part with a recent i7 a
   users.users.chris = {
     isNormalUser = true;
     extraGroups = [ "wheel" "networkmanager" "input" ]; # Enable ‘sudo’ for the user.
-    shell = pkgs.zsh;
   };
 
   programs.partition-manager.enable = true;
@@ -480,8 +522,14 @@ Kaladin is my desktop machine. A powerhouse for the most part with a recent i7 a
     zip
     gzip
     usbutils
+    binutils
+    hunspell
+    hunspellDicts.en_US
     git
+    openssh
+    samba
     ark
+    dash
     kget
     krename
     kwallet-pam
@@ -490,31 +538,78 @@ Kaladin is my desktop machine. A powerhouse for the most part with a recent i7 a
     sddm-kcm
     ydotool
     bottles
-    qutebrowser
-    exa mpv yt-dlp rofi-emoji
-    nerdfonts latte-dock bat
-    libsForQt5.bismuth bc libnotify
-    rofi-wayland ripgrep
-    sysstat procs papirus-icon-theme
-    phinger-cursors plasma-hud kde-cli-tools
-    macchina meson ninja cmake gnumake
-    extra-cmake-modules gcc gzip 
-    htop btop firefox kate kdialog openlp
-    easyeffects libreoffice-fresh vlc
-    neochat haskellPackages.greenclip
-    pulsemixer any-nix-shell wtype
-    spotdl kdenlive ffmpeg neofetch
-    xdotool fennel blender
-
+    exa
+    mpv
+    yt-dlp
+    rofi-emoji
+    nerdfonts
+    latte-dock
+    bat
+    libsForQt5.bismuth
+    libnotify
+    rofi-wayland
+    ripgrep
+    bc 
+    sysstat
+    procs
+    papirus-icon-theme
+    phinger-cursors
+    plasma-hud
+    kde-cli-tools
+    macchina
+    meson
+    ninja
+    gnumake
+    gcc
+    gdb
+    clang
+    cmake 
+    extra-cmake-modules
+    gzip 
+    htop
+    btop
+    firefox
+    kate
+    kdialog
+    openlp
+    libreoffice-fresh
+    vlc
+    neochat
+    haskellPackages.greenclip
+    pulsemixer
+    any-nix-shell
+    wtype
+    spotdl
+    kdenlive
+    ffmpeg
+    neofetch
+    xdotool
+    fennel
   ];
 
   # EMACS
-  services.emacs.package = pkgs.emacsPgtkNativeComp;
+  services.emacs.package = with pkgs; ((emacsPackagesFor emacsPgtkNativeComp).emacsWithPackages (epkgs: [ epkgs.vterm epkgs.magit epkgs.pdf-tools ]));
   nixpkgs.overlays = [
+
     (import (builtins.fetchTarball {
       url = https://github.com/nix-community/emacs-overlay/archive/master.tar.gz;
-      sha256 = "04dgvgsb0bg3k20j7y0y7yn7yks5cfgwmxhlbh6d9aa9asvnbzil";
+      sha256 = "1pd14gigm5bznzd8k88dq9scicw1zqknm87bnqmd0z556g9ir60f";
     }))
+
+    (self: super:
+      {
+        myAwesome = super.awesome.overrideAttrs (old: rec {
+          pname = "myAwesome";
+          version = "git-20220508-c539e0e";
+          src = super.fetchFromGitHub {
+            owner = "awesomeWM";
+            repo = "awesome";
+            rev = "c539e0e4350a42f813952fc28dd8490f42d934b3";
+            sha256 = "EDAL7NnLF2BiVI8DAlEciiZtDmwXOzCPypGTrlN/OoQ=";
+          };
+        });
+      }
+    )
   ];
   services.emacs.enable = true;