From 9f931b563f01f2a8d04c050fe13c0f8fe2672779 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moritz=20B=C3=B6hme?= <mail@moritzboeh.me>
Date: Fri, 19 Jul 2024 16:58:38 +0200
Subject: [PATCH] refactor: small clean up

---
 modules/programs/nvim/plugins/ui.nix | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/modules/programs/nvim/plugins/ui.nix b/modules/programs/nvim/plugins/ui.nix
index 96e28c2..a8614b6 100644
--- a/modules/programs/nvim/plugins/ui.nix
+++ b/modules/programs/nvim/plugins/ui.nix
@@ -1,36 +1,38 @@
 { pkgs, lib, inputs, ... }:
 
-with builtins;
+let
+  inherit (lib) readFile;
+in
 {
-  config.home-manager.users.moritz.programs.neovim.lazy.plugins = with pkgs.vimPlugins; [
+  config.home-manager.users.moritz.programs.neovim.lazy.plugins = [
     {
-      plugin = which-key-nvim;
+      plugin = pkgs.vimPlugins.which-key-nvim;
       lazy = false;
       conf = readFile ./lua/which-key-nvim.lua;
     }
     {
-      plugin = catppuccin-nvim;
+      plugin = pkgs.vimPlugins.catppuccin-nvim;
       conf = readFile ./lua/catppuccin-nvim.lua;
       lazy = false;
       priority = 99;
     }
     {
-      plugin = todo-comments-nvim;
-      dependencies = [{ plugin = plenary-nvim; }];
+      plugin = pkgs.vimPlugins.todo-comments-nvim;
+      dependencies = [{ plugin = pkgs.vimPlugins.plenary-nvim; }];
       opts = { };
     }
     {
-      plugin = dressing-nvim;
+      plugin = pkgs.vimPlugins.dressing-nvim;
       event = [ "VeryLazy" ];
     }
     {
-      plugin = gitsigns-nvim;
+      plugin = pkgs.vimPlugins.gitsigns-nvim;
       event = [ "BufReadPost" "BufNewFile" ];
       conf = readFile ./lua/gitsigns-nvim.lua;
-      dependencies = [{ plugin = which-key-nvim; }];
+      dependencies = [{ plugin = pkgs.vimPlugins.which-key-nvim; }];
     }
     {
-      plugin = pkgs.vimUtils.buildVimPlugin {
+      plugin = pkgs.vimPlugins.pkgs.vimUtils.buildVimPlugin {
         pname = "hawtkeys-nvim";
         version = lib.my.mkVersionInput inputs.hawtkeys-nvim;
         src = inputs.hawtkeys-nvim;
@@ -38,8 +40,8 @@ with builtins;
       cmd = [ "Hawtkeys" "HawtkeysAll" "HawtkeysDupes" ];
       opts = { };
       dependencies = [
-        { plugin = plenary-nvim; }
-        { plugin = nvim-treesitter; }
+        { plugin = pkgs.vimPlugins.plenary-nvim; }
+        { plugin = pkgs.vimPlugins.nvim-treesitter; }
       ];
     }
   ];