diff --git a/home/modules/audio.nix b/home/modules/audio.nix
index ee37a50d..24227586 100644
--- a/home/modules/audio.nix
+++ b/home/modules/audio.nix
@@ -45,6 +45,7 @@ in {
         autostart = mkBoolOpt false "Autoload Noisetorch suppression";
       };
 
+      # TODO: Store easyeffects presets/config (dconf com/github/wwmm/easyeffects ?)
       easyeffects = {
         enable = mkEnableOpt "EasyEffects";
         autostart = mkBoolOpt false "Autoload EasyEffects suppression profile";
diff --git a/home/modules/kitty.nix b/home/modules/kitty.nix
index 5f74145c..19eafb74 100644
--- a/home/modules/kitty.nix
+++ b/home/modules/kitty.nix
@@ -5,7 +5,7 @@ with mylib.modules;
 
 let
   cfg = config.modules.kitty;
-  cfgnv = config.modules.neovim;
+  # cfgnv = config.modules.neovim;
 in {
 
   options.modules.kitty = {
@@ -13,8 +13,6 @@ in {
   };
 
   config = mkIf cfg.enable {
-    # TODO: Copy config from Arch dots, also move the entire config folder (to allow ephemereal configs)
-    # TODO: Light/Dark theme option
     programs.kitty = {
       enable = true;
       font = {
@@ -23,8 +21,9 @@ in {
         size = 12;
       };
 
+      # TODO: Configure
       settings = {
-        editor = (if cfgnv.enable then "nvim" else "nano");
+        editor = "nvim";
         scrollback_lines = 10000;
         window_padding_width = 10;
         # hide_window_decorations = "yes";
diff --git a/home/modules/neovim.nix b/home/modules/neovim.nix
index a9d05f15..771f5d74 100644
--- a/home/modules/neovim.nix
+++ b/home/modules/neovim.nix
@@ -9,10 +9,16 @@ in {
 
   options.modules.neovim = {
     enable = mkEnableOpt "NeoVim";
-    alias = mkBoolOpt "Link nvim to vim/vi";
+    alias = mkBoolOpt false "Link nvim to vim/vi";
   };
 
   config = mkIf cfg.enable {
+    # TODO: Configure by enabled editor
+    home.sessionVariables = {
+      EDITOR = "nvim";
+      VISUAL = "nvim";
+    };
+
     programs.neovim = {
       enable = true;
 
@@ -42,8 +48,9 @@ in {
 
       plugins = with pkgs.vimPlugins; [
         # vim-nix
+        # YouCompleteMe
         surround-nvim
-        # lightline-vim
+
         {
           plugin = lualine-nvim;
           config = ''
@@ -52,10 +59,8 @@ in {
             EOF
           '';
         }
-        # vim-gitgutter
-        # YouCompleteMe
-        {
 
+        {
           plugin = nvim-autopairs;
           config = ''
             lua << EOF
@@ -63,9 +68,9 @@ in {
             EOF
           '';
         }
+
         {
-          plugin = (nvim-treesitter.withPlugins
-            (plugins: pkgs.tree-sitter.allGrammars));
+          plugin = (nvim-treesitter.withPlugins (plugins: pkgs.tree-sitter.allGrammars));
           config = ''
             lua << EOF
             require('nvim-treesitter.configs').setup {