nvf refactoring, devshell working

modules/editors/nvf/plugins/extra.nix

@@ -82,7 +82,7 @@
 in {
   programs.neovim-flake.settings.vim.extraPlugins = {
     # plugins that are pulled from nixpkgs
-    # direnv = {package = direnv-vim;};
+    direnv = {package = direnv-vim;};
     friendly-snippets = {package = friendly-snippets;};
     mkdir-nvim = {package = mkdir-nvim;};
     lazygit-nvim = {package = lazygit-nvim;};
@@ -95,7 +95,7 @@ in {
       package = nvim-surround;
       setup = "require('nvim-surround').setup {}";
     };
-    /*
+
     undotree = {
       package = undotree;
       setup = ''
@@ -103,7 +103,7 @@ in {
         vim.g.undotree_TreeVertShape = '│'
       '';
     };
-    */
+
     ssr-nvim = {
       package = ssr-nvim;
       setup = "require('ssr').setup {}";
@@ -141,7 +141,7 @@ in {
       package = pluginSources.smart-splits;
       setup = "require('smart-splits').setup {}";
     };
-    /*
+
     neotab-nvim = {
       package = pluginSources.neotab-nvim;
       setup = ''
@@ -173,7 +173,7 @@ in {
         }
       '';
     };
-    */
+
     specs-nvim = {
       package = pluginSources.specs-nvim;
       setup = ''

modules/editors/nvf/plugins/settings/terminal.nix

@@ -2,7 +2,7 @@ _: {
   programs.neovim-flake.settings.vim = {
     terminal = {
       toggleterm = {
-        enable = false;
+        enable = true;
         mappings.open = "<C-t>";
 
         setupOpts = {

modules/editors/nvf/plugins/settings/theme.nix

@@ -1,6 +1,4 @@
-{config, ...}: let
-  inherit (config.modules.other.system) username;
-in {
+_: {
   programs.neovim-flake.settings.vim = {
     theme = {
       enable = true;

modules/editors/nvf/plugins/settings/ui.nix

@@ -1,15 +1,9 @@
-{
-  config,
-  pkgs,
-  ...
-}: let
-  inherit (config.modules.other.system) username;
-in {
+_: {
   programs.neovim-flake.settings.vim = {
     ui = {
-      noice.enable = false;
+      noice.enable = true;
       colorizer.enable = true;
-      modes-nvim.enable = true;
+      modes-nvim.enable = false;
       illuminate.enable = true;
 
       breadcrumbs = {

modules/editors/nvf/plugins/settings/utility.nix

@@ -9,12 +9,12 @@
         enable = true;
         cli-package = pkgs.wakatime-cli;
       };
-      #
-      #  motion = {
-      #    hop.enable = false;
-      #    leap.enable = false;
-      #  };
-      #
+
+      motion = {
+        hop.enable = false;
+        leap.enable = false;
+      };
+
       preview = {
         glow.enable = true;
         markdownPreview.enable = true;