From 75b0bef3a2d27c76ae5f5c6705a597e5530cf05a Mon Sep 17 00:00:00 2001
From: Ryan Schanzenbacher <ryan@rschanz.org>
Date: Tue, 26 Mar 2024 10:05:44 -0400
Subject: [PATCH] fixed firefox? also updated channels and kernel

---
 channels.scm                        |  6 +++---
 home-config/home-configuration.scm  |  4 ++--
 modules/ryan-config/base-system.scm |  3 ++-
 modules/ryan-packages/mozilla.scm   | 21 ++++++++-------------
 4 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/channels.scm b/channels.scm
index 0a56287..6f77fb8 100644
--- a/channels.scm
+++ b/channels.scm
@@ -3,7 +3,7 @@
         (url "https://git.savannah.gnu.org/git/guix.git")
         (branch "master")
         (commit
-          "69951a61a1d8f1f2135ea2dc836738be282b97bc")
+          "c3f15443bc6d457758aad1326dcc6dcad9cf8d6e")
         (introduction
           (make-channel-introduction
             "9edb3f66fd807b096b48283debdcddccfea34bad"
@@ -14,7 +14,7 @@
         (url "https://gitlab.com/nonguix/nonguix")
         (branch "master")
         (commit
-          "5baccd1d72594b4c85e958c2f34cac923345acb3")
+          "a4356defe7d4ee9b0ac6789d67f94d00714a9409")
         (introduction
           (make-channel-introduction
             "897c1a470da759236cc11798f4e0a5f7d4d59fbc"
@@ -25,7 +25,7 @@
         (url "https://codeberg.org/hako/rosenthal.git")
         (branch "trunk")
         (commit
-          "0e31205d7392c450bf33de24d7f0cc38aa82d4d5")
+          "2c967e048f53aaaef002f114a9ee6c985be1278b")
         (introduction
           (make-channel-introduction
             "7677db76330121a901604dfbad19077893865f35"
diff --git a/home-config/home-configuration.scm b/home-config/home-configuration.scm
index c3214cc..77bfdbb 100644
--- a/home-config/home-configuration.scm
+++ b/home-config/home-configuration.scm
@@ -114,9 +114,9 @@
                                                     "password-store"
                                                     "node"
                                                     "kanshi"
-                                                    "firefox"
+                                                    ;"firefox"
                                                     "git-lfs"))
-                    (list my-neovim wl-mirror calcurse-fixed)))
+                    (list my-neovim wl-mirror firefox-wrapped calcurse-fixed)))
 
   ;; Below is the list of Home services.  To search for available
   ;; services, run 'guix home search KEYWORD' in a terminal.
diff --git a/modules/ryan-config/base-system.scm b/modules/ryan-config/base-system.scm
index 2e58dcf..fe41181 100644
--- a/modules/ryan-config/base-system.scm
+++ b/modules/ryan-config/base-system.scm
@@ -100,7 +100,7 @@
 
 (define-public base-operating-system
   (operating-system
-    (kernel linux)
+    (kernel linux-6.8)
     (firmware (list linux-firmware))
     (locale "en_US.utf8")
     (timezone "America/New_York")
@@ -187,6 +187,7 @@
                               (unix-sock-group "libvirt")))
                    (service virtlog-service-type)
                    (simple-service 'spice-polkit polkit-service-type (list spice-gtk))
+                   (simple-service 'hwdb-creation etc-service-type (list `("udev-here-oneoneone" ,(plain-file "issue" "test\n"))))
                    (service bluetooth-service-type
                             (bluetooth-configuration
                               (bluez bluez-ryan)
diff --git a/modules/ryan-packages/mozilla.scm b/modules/ryan-packages/mozilla.scm
index 1e87336..86a1485 100644
--- a/modules/ryan-packages/mozilla.scm
+++ b/modules/ryan-packages/mozilla.scm
@@ -9,20 +9,15 @@
   #:use-module (guix build-system trivial)
   #:use-module (nongnu packages mozilla))
 
-(define firefox*
-  (package/inherit
-   firefox
-    (inputs
-    (modify-inputs
-     (package-inputs firefox)
-     (delete "pipewire")
-     (append pipewire)))))
-
-(define-public firefox-wayland-new
+(define-public firefox-wrapped
   (package
-    (inherit firefox)
-    (name "firefox-wayland-new")
-    (native-inputs '())
+    (name "firefox-wrapped")
+    (source #f)
+    (version "0.1")
+    (synopsis "Simple wrapper for pipewire in firefox")
+    (description "Simple wrapper for pipewire in firefox")
+    (home-page "http://mozilla.org/")
+    (license license:mpl2.0)
     (inputs
      `(("bash" ,bash-minimal)
        ("pipewire" ,pipewire)