diff --git a/configuration.nix b/configuration.nix
index 6465ea4..d63f27f 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -230,6 +230,8 @@
   # Or disable the firewall altogether.
   # networking.firewall.enable = false;
 
+  nix.settings.experimental-features = [ "nix-command" "flakes" ];
+
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It‘s perfectly fine and recommended to leave
diff --git a/home.nix b/home.nix
index 71498e6..bd99399 100644
--- a/home.nix
+++ b/home.nix
@@ -60,6 +60,26 @@
     # '';
   };
 
+  programs.neovim = {
+    enable = true;
+    viAlias = true;
+    vimAlias = true;
+    extraConfig = ''
+    filetype plugin indent on
+    " On pressing tab, insert 2 spaces
+    set expandtab
+    " show existing tab with 2 spaces width
+    set tabstop=2
+    set softtabstop=2
+    " when indenting with '>', use 2 spaces width
+    set shiftwidth=2
+    '';
+  };
+
+
+  services.lorri.enable = true;
+  programs.direnv.enable = true;
+
   programs.firefox = {
     enable = true;
     nativeMessagingHosts = [ pkgs.kdePackages.plasma-browser-integration ];
@@ -87,6 +107,7 @@
   #
   home.sessionVariables = {
     EDITOR = "emacsclient --create-frame";
+    DIRENV_LOG_FORMAT = ""; #remove if direnv.silent becomes available
   };
 
   #nixpkgs.config.allowUnfree = true;
diff --git a/programs/emacs.nix b/programs/emacs.nix
index 6e2cef6..0c13573 100644
--- a/programs/emacs.nix
+++ b/programs/emacs.nix
@@ -9,6 +9,7 @@
     ripgrep
     pandoc
     fd
+    nixfmt-rfc-style
 
     #html/prettier
     vscode-langservers-extracted
@@ -30,6 +31,7 @@
     rustfmt
     rust-analyzer
     clippy
+    gcc
   ];
   services.emacs = {
     enable = true;
diff --git a/programs/zsh.nix b/programs/zsh.nix
index e45f3b7..bf3eb63 100644
--- a/programs/zsh.nix
+++ b/programs/zsh.nix
@@ -13,7 +13,7 @@
     '';
     oh-my-zsh = {
       enable = true;
-      plugins = [ "git" ];
+      plugins = [ "git" "direnv" ];
     };
     plugins = [
       {