From 75b0bef3a2d27c76ae5f5c6705a597e5530cf05a Mon Sep 17 00:00:00 2001 From: Ryan Schanzenbacher Date: Tue, 26 Mar 2024 10:05:44 -0400 Subject: fixed firefox? also updated channels and kernel --- modules/ryan-config/base-system.scm | 3 ++- modules/ryan-packages/mozilla.scm | 21 ++++++++------------- 2 files changed, 10 insertions(+), 14 deletions(-) (limited to 'modules') 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) -- cgit v1.2.3