From 18357af871d760c558ef736a05c3dc34f3609453 Mon Sep 17 00:00:00 2001
From: Ryan Schanzenbacher <ryan@rschanz.org>
Date: Thu, 20 Apr 2023 18:17:46 -0400
Subject: [PATCH] Changed neovim configuration to build using gcc 12

---
 home-config/home-configuration.scm | 78 +++++++++++++++++++-----------
 1 file changed, 50 insertions(+), 28 deletions(-)

diff --git a/home-config/home-configuration.scm b/home-config/home-configuration.scm
index 65bc5f5..3593eaf 100644
--- a/home-config/home-configuration.scm
+++ b/home-config/home-configuration.scm
@@ -6,36 +6,52 @@
 
 (use-modules (gnu home)
              (gnu packages)
+             (gnu packages vim)
+             (gnu packages gcc)
              (gnu services)
+             (guix packages)
              (guix gexp)
-             (gnu home services shells))
+             (gnu home services shells)
+             (gnu home services))
+
+(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
   ;; Home profile, under ~/.guix-home/profile.
-  (packages (specifications->packages (list "bat"
-                                            "qrencode"
-                                            "libreoffice"
-                                            "flatpak"
-                                            "gnupg"
-                                            "lsof"
-                                            "pavucontrol"
-                                            "bind:utils"
-                                            ;"firefox"
-                                            "irssi"
-                                            "font-cns11643"
-                                            "syncthing"
-                                            "perl"
-                                            "tor"
-                                            "unzip"
-                                            "alacritty"
-                                            "htop"
-                                            "curl"
-                                            "neovim"
-                                            "weechat"
-                                            "icedove-minimal"
-                                            "gimp"
-                                            "git")))
+  (packages (append (specifications->packages (list   "bat"
+                                                        "qrencode"
+                                                        "binutils"
+                                                        "gcc-toolchain"
+                                                        "libreoffice"
+                                                        "flatpak"
+                                                        "gnupg"
+                                                        "lsof"
+                                                        "pavucontrol"
+                                                        "bind:utils"
+                                                        "firefox"
+                                                        "irssi"
+                                                        "font-cns11643"
+                                                        "syncthing"
+                                                        "perl"
+                                                        "tor"
+                                                        "unzip"
+                                                        "alacritty"
+                                                        "htop"
+                                                        "curl"
+                                                        ;"my-neovim"
+                                                        "weechat"
+                                                        "icedove-minimal"
+                                                        "gimp"
+                                                        "python"
+                                                        "sqlite"
+                                                        "git"))
+                    (list my-neovim)))
 
   ;; Below is the list of Home services.  To search for available
   ;; services, run 'guix home search KEYWORD' in a terminal.
@@ -43,10 +59,16 @@
    (list (service home-bash-service-type
                   (home-bash-configuration
                    (aliases '(("grep" . "grep --color=auto") ("ll" . "ls -l")
-                              ("ls" . "ls -p --color=auto")))
+                              ("ls" . "ls -p --color=auto")
+                              ("python" . "python3")))
                    (bashrc (list (local-file
-                                  "/home/ryan/.config/guix/home-config/.bashrc"
+                                  "/home/ryan/.config/guix/home-config/bashrc"
                                   "bashrc")))
                    (bash-profile (list (local-file
-                                        "/home/ryan/.config/guix/home-config/.bash_profile"
-                                        "bash_profile"))))))))
+                                        "/home/ryan/.config/guix/home-config/bash_profile"
+                                        "bash_profile")))))
+         (service home-xdg-configuration-files-service-type
+                  `(("nvim/init.vim" ,(local-file "nvim/config/init.vim"))
+                    ("nvim/after/ftplugin/markdown/custom.vim" ,(local-file "nvim/config/after/ftplugin/markdown/custom.vim")) ))
+         (service home-files-service-type
+                  `((".local/share/nvim/site/autoload/plug.vim" ,(local-file "nvim/plugin-manager/plug.vim")) )))))