diff --git a/docs/manual/installation/modules/home-manager.md b/docs/manual/installation/modules/home-manager.md
index cf56acc3..a2170159 100644
--- a/docs/manual/installation/modules/home-manager.md
+++ b/docs/manual/installation/modules/home-manager.md
@@ -44,15 +44,12 @@ Followed by importing the home-manager module somewhere in your configuration.
   };
 
   outputs = { nixpkgs, home-manager, nvf, ... }: let
-    system = "x86_64-linux";
-    pkgs = nixpkgs.legacyPackages.${system};
-  in {
+  system = "x86_64-linux"; in {
     # ↓ this is your home output in the flake schema, expected by home-manager
-    "your-username@your-hostname" = home-manager.lib.homeManagerConfiguration {
-      inherit pkgs;
+    "your-username@your-hostname" = home-manager.lib.homeManagerConfiguration
       modules = [
         nvf.homeManagerModules.default # <- this imports the home-manager module that provides the options
-        ./home.nix # <- your home entrypoint, `programs.nvf.*` may be defined here
+        ./home.nix # <- your home entrypoint
       ];
     };
   };
diff --git a/docs/manual/installation/modules/nixos.md b/docs/manual/installation/modules/nixos.md
index ae5ce939..d8be2035 100644
--- a/docs/manual/installation/modules/nixos.md
+++ b/docs/manual/installation/modules/nixos.md
@@ -42,12 +42,13 @@ Followed by importing the NixOS module somewhere in your configuration.
     nvf.url = "github:notashelf/nvf";
   };
 
-  outputs = { nixpkgs, nvf, ... }: {
+  outputs = { nixpkgs, nvf, ... }: let
+  system = "x86_64-linux"; in {
     # ↓ this is your host output in the flake schema
-    nixosConfigurations."your-hostname" = nixpkgs.lib.nixosSystem {
+    nixosConfigurations."yourUsername»" = nixpkgs.lib.nixosSystem {
       modules = [
         nvf.nixosModules.default # <- this imports the NixOS module that provides the options
-        ./configuration.nix # <- your host entrypoint, `programs.nvf.*` may be defined here
+        ./configuration.nix # <- your host entrypoint
       ];
     };
   };
diff --git a/modules/plugins/utility/wakatime/config.nix b/modules/plugins/utility/wakatime/config.nix
index 675f0034..a1892e7b 100644
--- a/modules/plugins/utility/wakatime/config.nix
+++ b/modules/plugins/utility/wakatime/config.nix
@@ -1,22 +1,18 @@
 {
   config,
-  pkgs,
   lib,
+  pkgs,
   ...
 }: let
   inherit (lib.modules) mkIf;
-  inherit (lib.meta) getExe;
 
   cfg = config.vim.utility.vim-wakatime;
 in {
   config = mkIf cfg.enable {
-    vim = {
-      startPlugins = [pkgs.vimPlugins.vim-wakatime];
+    vim.startPlugins = [pkgs.vimPlugins.vim-wakatime];
 
-      # Wakatime configuration is stored as vim globals.
-      globals = {
-        "wakatime_CLIPath" = mkIf (cfg.cli-package != null) "${getExe cfg.cli-package}";
-      };
-    };
+    vim.pluginRC.vim-wakatime = mkIf (cfg.cli-package != null) ''
+      vim.g.wakatime_CLIPath = "${cfg.cli-package}"
+    '';
   };
 }
diff --git a/modules/plugins/utility/wakatime/default.nix b/modules/plugins/utility/wakatime/default.nix
index c72189d5..d6d67d57 100644
--- a/modules/plugins/utility/wakatime/default.nix
+++ b/modules/plugins/utility/wakatime/default.nix
@@ -1,4 +1,4 @@
-{
+_: {
   imports = [
     ./config.nix
     ./vim-wakatime.nix
diff --git a/modules/plugins/utility/wakatime/vim-wakatime.nix b/modules/plugins/utility/wakatime/vim-wakatime.nix
index 04f27868..6b853821 100644
--- a/modules/plugins/utility/wakatime/vim-wakatime.nix
+++ b/modules/plugins/utility/wakatime/vim-wakatime.nix
@@ -1,24 +1,18 @@
 {
-  pkgs,
   lib,
+  pkgs,
   ...
 }: let
   inherit (lib.options) mkEnableOption mkOption;
   inherit (lib.types) nullOr package;
 in {
   options.vim.utility.vim-wakatime = {
-    enable = mkEnableOption ''
-      automatic time tracking and metrics generated from your programming activity [vim-wakatime]
-    '';
+    enable = mkEnableOption "vim-wakatime: live code statistics";
 
     cli-package = mkOption {
       type = nullOr package;
-      default = pkgs.wakatime-cli;
-      example = null;
-      description = ''
-        The package that should be used for wakatime-cli.
-        Set as null to use the default path in {env}`$XDG_DATA_HOME`
-      '';
+      default = pkgs.wakatime;
+      description = "The package that should be used for wakatime-cli. Set as null to use the default path in `$XDG_DATA_HOME`";
     };
   };
 }