From 4195ae817d5cfab8253b829db0951767a7f78691 Mon Sep 17 00:00:00 2001
From: Freya Murphy <freya@freyacat.org>
Date: Mon, 28 Oct 2024 17:40:49 -0400
Subject: [PATCH] refactor home packages, update nvim config

---
 channels.scm                    |  4 +-
 home/config/nvim/lua/vimopt.lua |  6 +++
 home/config/zsh/zshrc           |  2 +-
 home/home.scm                   | 70 +++++++++++++--------------------
 4 files changed, 36 insertions(+), 46 deletions(-)

diff --git a/channels.scm b/channels.scm
index d7f7e38..4988770 100644
--- a/channels.scm
+++ b/channels.scm
@@ -3,7 +3,7 @@
         (url "https://git.savannah.gnu.org/git/guix.git")
         (branch "master")
         (commit
-          "4009d1de954d694cb11af391d4113d29c5c1379d")
+          "d29090727b328f96e79285379e4fac9a7dee316e")
         (introduction
           (make-channel-introduction
             "9edb3f66fd807b096b48283debdcddccfea34bad"
@@ -25,7 +25,7 @@
         (url "https://g.freya.cat/freya/sakura")
         (branch "main")
         (commit
-          "0601aa4f570e0f8d986c67de7c57572f935e7387")
+          "850f52efa71fe2aa9a6b165c46e822858bebb5f7")
         (introduction
           (make-channel-introduction
             "8fb2f9c2fa414754c41c1c73665e3e73e12693ab"
diff --git a/home/config/nvim/lua/vimopt.lua b/home/config/nvim/lua/vimopt.lua
index 0c519d6..c2c47b0 100644
--- a/home/config/nvim/lua/vimopt.lua
+++ b/home/config/nvim/lua/vimopt.lua
@@ -13,6 +13,12 @@ set.relativenumber = true
 set.rnu = true
 set.swapfile = false
 
+-- expand tabs in the following files
+vim.api.nvim_create_autocmd({ "BufNewFile" }, {
+	pattern = { "*.scm" },
+	command = 'silent :set expandtab=true'
+})
+
 vim.filetype.add({
 	pattern = {
 		['.*%.pl'] = 'prolog',
diff --git a/home/config/zsh/zshrc b/home/config/zsh/zshrc
index add2cf3..733fc51 100644
--- a/home/config/zsh/zshrc
+++ b/home/config/zsh/zshrc
@@ -55,7 +55,7 @@ export GROFF_NO_SGR=1
 
 # enable zsh auto suggestions
 autoload compinit && compinit
-source $GUIX_PROFILE/share/zsh/zsh-autosuggestions/zsh-autosuggestions.zsh
+source $GUIX_PROFILE/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh
 source $GUIX_PROFILE/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
 ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=#696e8a"
 ZSH_AUTOSUGGEST_STRATEGY=(completion history)
diff --git a/home/home.scm b/home/home.scm
index 54b362c..c3dbf16 100644
--- a/home/home.scm
+++ b/home/home.scm
@@ -18,26 +18,34 @@
              (gnu home services)
              (freya certs)
              (sakura services pipewire)
-             (sakura packages shells)
-             (sakura packages librewolf)
-             (sakura packages vim)
              (sakura packages gnome-xyz)
-             (sakura packages shells)
-             (sakura packages wm)
-             (sakura packages hypr)
-             (sakura packages networking)
-             (sakura packages audio))
+             (sakura packages vim))
 
 
 (home-environment
   ;; Below is the list of packages that will show up in your
   ;; Home profile, unser ~/.guix-home/profile.
+
   (packages (append (specifications->packages (list ; sway
                                                     "swayfx"
                                                     "swaybg"
                                                     "swayidle"
                                                     "swaylock-effects"
 
+                                                    ; hyprland
+                                                    "hyprland"
+                                                    "hyprlock"
+                                                    "hyprpaper"
+                                                    "hypridle"
+                                                    "hyprland-plugins"
+                                                    "hyprland-contrib"
+                                                    "hyprland-plugin-hy3"
+
+                                                    ; xdg
+                                                    "xdg-desktop-portal-wlr"
+                                                    "xdg-desktop-portal-gtk"
+                                                    "xdg-desktop-portal-hyprland"
+
                                                     ; desktop programs
                                                     "gnome-keyring"
                                                     "gimp"
@@ -48,13 +56,16 @@
                                                     "libnotify"
                                                     "waybar"
                                                     "network-manager-applet"
-
-                                                    ; xdg
-                                                    "xdg-desktop-portal-wlr"
-                                                    "xdg-desktop-portal-gtk"
+                                                    "wl-clip-persist"
+                                                    "easyeffects"
+                                                    "librewolf-wrapped"
+                                                    "gamescope"
+                                                    "overskride"
 
                                                     ; gtk
                                                     "wxwidgets"
+                                                    "lavanda-gtk-theme"
+                                                    "mint-themes"
 
                                                     ; terminal
                                                     "alacritty"
@@ -106,6 +117,7 @@
 
                                                     ; shell
                                                     "zsh-syntax-highlighting"
+                                                    "zsh-autosuggestions"
                                                     "tree-sitter-cli"
                                                     "neofetch"
                                                     "pfetch"
@@ -119,37 +131,9 @@
                                                     "wine64"
                                                     "winetricks"))
 
-            (list ; system
-                  freya-ca-certs
-
-                  ; programs
-                  easyeffects
-                  librewolf-wrapped
-                  gamescope
-
-                  ; gtk
-                  lavanda-gtk-theme
-                  orchis-theme-2024
-                  mint-themes
-
-                  ; shell
-                  zsh-autosuggestions
-                  vim-plug
-
-                  ; desktop
-
-                  ; bluetooth
-                  overskride
-
-                  ; hyprwm
-                  hyprland
-                  hyprlock
-                  hyprpaper
-                  hypridle
-                  hyprland-plugin-hy3
-                  hyprland-plugins
-                  hyprland-contrib
-                  xdg-desktop-portal-hyprland)))
+            ; add ca certs and ambiguous packages
+            (list freya-ca-certs
+                  orchis-theme-2024)))
 
   ;; Below is the list of Home services.  To search for available
   ;; services, run 'guix home search KEYWORD' in a terminal.