package vim plug

home-config/home-configuration.scm

@@ -88,7 +88,8 @@
                   easyeffects 
                   firefox-wayland-new 
                   lavanda-gtk-theme 
-                  zsh-autosuggestions)))
+                  zsh-autosuggestions
+                  vim-plug)))
 
   ;; Below is the list of Home services.  To search for available
   ;; services, run 'guix home search KEYWORD' in a terminal.
@@ -101,7 +102,7 @@
          (service home-xdg-configuration-files-service-type
                   `(("nvim/init.vim" ,(local-file "nvim/init.vim"))
                     ("sway" ,(local-file "sway" #:recursive? #t))
-                    ;("waybar" ,(local-file "waybar" #:recursive? #t))
+                    ("waybar" ,(local-file "waybar" #:recursive? #t))
                     ("alacritty" ,(local-file "alacritty" #:recursive? #t))
                     ("lvim" ,(local-file "lvim" #:recursive? #t))
                     ("mako" ,(local-file "mako" #:recursive? #t))
@@ -115,18 +116,15 @@
                     ("home-manager/home.nix" ,(local-file "nix-home-manager/home.nix")) ))
          
          (service home-files-service-type
-                  `((".local/share/nvim/site/autoload/plug.vim" ,(local-file "nvim/plug.vim"))
+                  `((".local/share/nvim/site/autoload/plug.vim" ,(file-append vim-plug "/share/vim/plug.vim"))
                     (".ssh/config" ,(local-file "ssh/config"))
                     (".gnupg/sshcontrol" ,(local-file "gnupg/sshcontrol"))
-                    ;;(".gnupg/gpg-agent.conf" ,(local-file "gnupg/gpg-agent.conf"))
                     (".local/share/fonts" ,(local-file "fonts" #:recursive? #t))
-                    ;;(".local/share/themes" ,(local-file "themes" #:recursive? #t))
                     (".local/share/applications" ,(local-file "applications" #:recursive? #t))
                     (".local/share/icons" ,(local-file "icons" #:recursive? #t))
                     (".gtkrc-2.0" ,(local-file "gtk/gtkrc-2.0"))
                     (".nix-channels" ,(local-file "nix-channels"))
                     (".gitconfig" ,(local-file "git/gitconfig"))))
-                    ;;(".zsh/zsh-autosuggestions" ,(local-file "zsh/zsh-autosuggestions" #:recursive? #t))))
 
          (service home-pipewire-service-type)
          (service home-dbus-service-type)

home-config/waybar/style.css

@@ -2,6 +2,8 @@
     font-family: "Fira Mono", "Font Awesome 6 Pro", monospace;
     font-size: 13.5px;
     transition: none;
+    margin: 0;
+    padding: 0;
 }
 
 /*

modules/home-packages/vim.scm

@@ -1,8 +1,10 @@
 (define-module (home-packages vim)
+               #:use-module ((guix licenses) #:prefix license:)
                #:use-module (guix packages)
                #:use-module (gnu packages)
                #:use-module (guix git-download)
                #:use-module (guix utils)
+               #:use-module (guix build-system trivial)
                #:use-module (gnu packages vim)
                #:use-module (gnu packages gcc))
 
@@ -13,3 +15,36 @@
     (native-inputs
       (modify-inputs (package-native-inputs neovim)
              (prepend gcc-12)))))
+
+(define-public vim-plug
+  (package
+   (name "vim-plug")
+   (version "0.11.0")
+   (source
+     (origin
+      (method git-fetch)
+      (uri (git-reference
+             (url "https://github.com/junegunn/vim-plug")
+             (commit version)))
+     (sha256
+       (base32
+         "0bfgadn31n516x0m0kr88jk9x79rl6zllnwij759wpazmw1p0xg8"))
+     (file-name (git-file-name name version))))
+   (build-system trivial-build-system)
+   (arguments
+     '(#:modules ((guix build utils))
+       #:builder
+       (begin
+         (use-modules (guix build utils))
+         (let* ((out    (assoc-ref %outputs "out"))
+                (bin    (string-append out "/share/vim"))
+                (source (assoc-ref %build-inputs "source")))
+           (mkdir-p bin)
+           (chdir source)
+           (install-file "plug.vim" bin)))))
+   (home-page "https://github.com/vinceliuice/Lavanda-gtk-e")
+   (synopsis "Minimalist Vim Plugin Manager")
+   (description "Minimalist Vim Plugin Manager")
+   (license license:expat)))
+
+