From 426df5d5095b0eb6ec763fc11343f2097bd53803 Mon Sep 17 00:00:00 2001
From: Tyler Murphy <tylerm@tylerm.dev>
Date: Wed, 6 Sep 2023 12:39:00 -0400
Subject: [PATCH] refactor

---
 home-config/home-configuration.scm       | 11 +++--------
 modules/home-config/base-system.scm      |  2 +-
 modules/home-packages/vim.scm            | 15 +++++++++++++++
 modules/home-services/virtualization.scm |  8 ++++----
 4 files changed, 23 insertions(+), 13 deletions(-)
 create mode 100644 modules/home-packages/vim.scm

diff --git a/home-config/home-configuration.scm b/home-config/home-configuration.scm
index 372eb0f..0270199 100644
--- a/home-config/home-configuration.scm
+++ b/home-config/home-configuration.scm
@@ -6,7 +6,6 @@
 
 (use-modules (gnu home)
              (gnu packages)
-             (gnu packages vim)
              (gnu packages gcc)
              (gnu packages gnupg)
              (gnu packages virtualization)
@@ -19,14 +18,9 @@
              (gnu home services)
              (home-services pipewire)
              (home-packages mozillia)
+             (home-packages vim)
              (home-packages audio))
 
-(define my-neovim
-  (package
-    (inherit neovim)
-    (native-inputs
-      (modify-inputs (package-native-inputs neovim)
-             (prepend gcc-12)))))
 
 (home-environment
   ;; Below is the list of packages that will show up in your
@@ -77,7 +71,7 @@
                                                     "tree-sitter-cli"
                                                     "python-pynvim"))
 
-            (list my-neovim easyeffects firefox-wayland-new)))
+            (list neovim-new easyeffects firefox-wayland-new)))
 
   ;; Below is the list of Home services.  To search for available
   ;; services, run 'guix home search KEYWORD' in a terminal.
@@ -86,6 +80,7 @@
                   (home-zsh-configuration
                    (zshrc (list (local-file "zsh/zshrc")))
                    (zprofile (list (local-file "zsh/zprofile")))))
+
          (service home-xdg-configuration-files-service-type
                   `(("nvim/init.vim" ,(local-file "nvim/init.vim"))
                     ("sway" ,(local-file "sway" #:recursive? #t))
diff --git a/modules/home-config/base-system.scm b/modules/home-config/base-system.scm
index e8e26de..7a4b2b2 100644
--- a/modules/home-config/base-system.scm
+++ b/modules/home-config/base-system.scm
@@ -122,7 +122,7 @@
                     (publish-workstation? #f))) ; do not advertise, I want this to be as silent as possible
                (service docker-service-type)
                (service nix-service-type)
-               (service my-libvirt-service-type)
+               (service libvirt-service-type-new)
                (service virtlog-service-type)
                (service bluetooth-service-type)
                (service pam-limits-service-type)
diff --git a/modules/home-packages/vim.scm b/modules/home-packages/vim.scm
new file mode 100644
index 0000000..1caf0f3
--- /dev/null
+++ b/modules/home-packages/vim.scm
@@ -0,0 +1,15 @@
+(define-module (home-packages vim)
+               #:use-module (guix packages)
+               #:use-module (gnu packages)
+               #:use-module (guix git-download)
+               #:use-module (guix utils)
+               #:use-module (gnu packages vim)
+               #:use-module (gnu packages gcc))
+
+(define-public neovim-new
+  (package
+    (inherit neovim)
+    (name "neovim-new")
+    (native-inputs
+      (modify-inputs (package-native-inputs neovim)
+             (prepend gcc-12)))))
diff --git a/modules/home-services/virtualization.scm b/modules/home-services/virtualization.scm
index 3dd12c2..aeb7fe7 100644
--- a/modules/home-services/virtualization.scm
+++ b/modules/home-services/virtualization.scm
@@ -9,7 +9,7 @@
                #:use-module (gnu home services)
                #:use-module (guix gexp))
 
-(define my-libvirt
+(define libvirt-new
   (package
     (inherit libvirt)
     (inputs
@@ -20,15 +20,15 @@
   `(("/usr/share/OVMF/OVMF_CODE.fd", 
     (file-append ovmf "/share/firmware/ovmf_x64.bin"))))
 
-(define-public my-libvirt-service-type
+(define-public libvirt-service-type-new
   (service-type 
-    (name 'my-libvirt)
+    (name 'libvirt-new)
     (extensions
       (list
         (service-extension libvirt-service-type
                            (lambda (config)
                            (libvirt-configuration
-                             (libvirt my-libvirt)
+                             (libvirt libvirt-new)
                              (unix-sock-group "libvirt")))
                            )
         (service-extension special-files-service-type