From c40b1e50b3ac3c9636413729f36ef1a4a76140c6 Mon Sep 17 00:00:00 2001
From: Freya Murphy <freya@freyacat.org>
Date: Thu, 24 Oct 2024 12:39:04 -0400
Subject: [PATCH] refactor home & system with sakura updates

---
 home/home.scm            | 25 ++++++++++++-------------
 modules/freya/system.scm |  7 -------
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/home/home.scm b/home/home.scm
index 2752008..09542f4 100644
--- a/home/home.scm
+++ b/home/home.scm
@@ -25,7 +25,6 @@
              (sakura packages shells)
              (sakura packages wm)
              (sakura packages hypr)
-             (sakura packages linux)
              (sakura packages networking)
              (sakura packages audio))
 
@@ -33,12 +32,21 @@
 (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 ; desktop env
+  (packages (append (specifications->packages (list ; sway
                                                     "swayfx"
                                                     "swaybg"
                                                     "swayidle"
+                                                    "swaylock-effects"
+
+                                                    ; desktop programs
+                                                    "gnome-keyring"
+                                                    "gimp"
+                                                    "ungoogled-chromium"
+                                                    "steam"
+                                                    "nautilus"
                                                     "cage"
                                                     "libnotify"
+                                                    "waybar"
 
                                                     ; xdg
                                                     "xdg-desktop-portal-wlr"
@@ -47,15 +55,10 @@
                                                     ; gtk
                                                     "wxwidgets"
 
-                                                    ; desktop programs
-                                                    "gnome-keyring"
-                                                    "gimp"
-                                                    "ungoogled-chromium"
-                                                    "steam"
-
                                                     ; terminal
                                                     "alacritty"
                                                     "kitty"
+                                                    "neovim"
 
                                                     ; desktop integration
                                                     "i3-autotiling"
@@ -119,9 +122,8 @@
                   freya-ca-certs
 
                   ; programs
-                  neovim-new
                   easyeffects
-                  librewolf-new
+                  librewolf-wrapped
                   gamescope
 
                   ; gtk
@@ -134,11 +136,8 @@
                   vim-plug
 
                   ; desktop
-                  swaylock-effects-new
-                  waybar-new
 
                   ; bluetooth
-                  blueman-new
                   overskride
 
                   ; hyprwm
diff --git a/modules/freya/system.scm b/modules/freya/system.scm
index 395cb29..113cad2 100644
--- a/modules/freya/system.scm
+++ b/modules/freya/system.scm
@@ -25,8 +25,6 @@
            #:use-module (nongnu packages linux)
            #:use-module (freya certs)
            #:use-module (sakura packages qt)
-           #:use-module (sakura packages linux)
-           #:use-module (sakura packages pulseaudio)
            #:use-module (sakura packages virtualization)
            #:use-module (sakura bootloader uki))
 
@@ -189,10 +187,6 @@
     (list ; qt
           qt5-styleplugins
           qt6gtk2
-          ; bluetooth
-          bluez-new
-          ; pactl
-          pulseaudio-new
           ; system
           virt-manager-ovmf)
     ;; append base freya backages
@@ -278,7 +272,6 @@
           ; bluetooth
           (service bluetooth-service-type
                    (bluetooth-configuration
-                     (bluez bluez-new)
                      (experimental #t)
                      (fast-connectable? #t)))
           ; yubikey