diff options
author | Ryan Schanzenbacher <ryan@rschanz.org> | 2024-03-26 10:05:44 -0400 |
---|---|---|
committer | Ryan Schanzenbacher <ryan@rschanz.org> | 2024-03-26 10:05:44 -0400 |
commit | 75b0bef3a2d27c76ae5f5c6705a597e5530cf05a (patch) | |
tree | 61425e88f8cf3ba162b339572b08130d8a5a0f7d /modules | |
parent | 752de9a6d554b2849281507f841e4adaadf209cf (diff) |
fixed firefox? also updated channels and kernel
Diffstat (limited to 'modules')
-rw-r--r-- | modules/ryan-config/base-system.scm | 3 | ||||
-rw-r--r-- | modules/ryan-packages/mozilla.scm | 21 |
2 files changed, 10 insertions, 14 deletions
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 @@ | |||
100 | 100 | ||
101 | (define-public base-operating-system | 101 | (define-public base-operating-system |
102 | (operating-system | 102 | (operating-system |
103 | (kernel linux) | 103 | (kernel linux-6.8) |
104 | (firmware (list linux-firmware)) | 104 | (firmware (list linux-firmware)) |
105 | (locale "en_US.utf8") | 105 | (locale "en_US.utf8") |
106 | (timezone "America/New_York") | 106 | (timezone "America/New_York") |
@@ -187,6 +187,7 @@ | |||
187 | (unix-sock-group "libvirt"))) | 187 | (unix-sock-group "libvirt"))) |
188 | (service virtlog-service-type) | 188 | (service virtlog-service-type) |
189 | (simple-service 'spice-polkit polkit-service-type (list spice-gtk)) | 189 | (simple-service 'spice-polkit polkit-service-type (list spice-gtk)) |
190 | (simple-service 'hwdb-creation etc-service-type (list `("udev-here-oneoneone" ,(plain-file "issue" "test\n")))) | ||
190 | (service bluetooth-service-type | 191 | (service bluetooth-service-type |
191 | (bluetooth-configuration | 192 | (bluetooth-configuration |
192 | (bluez bluez-ryan) | 193 | (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 @@ | |||
9 | #:use-module (guix build-system trivial) | 9 | #:use-module (guix build-system trivial) |
10 | #:use-module (nongnu packages mozilla)) | 10 | #:use-module (nongnu packages mozilla)) |
11 | 11 | ||
12 | (define firefox* | 12 | (define-public firefox-wrapped |
13 | (package/inherit | ||
14 | firefox | ||
15 | (inputs | ||
16 | (modify-inputs | ||
17 | (package-inputs firefox) | ||
18 | (delete "pipewire") | ||
19 | (append pipewire))))) | ||
20 | |||
21 | (define-public firefox-wayland-new | ||
22 | (package | 13 | (package |
23 | (inherit firefox) | 14 | (name "firefox-wrapped") |
24 | (name "firefox-wayland-new") | 15 | (source #f) |
25 | (native-inputs '()) | 16 | (version "0.1") |
17 | (synopsis "Simple wrapper for pipewire in firefox") | ||
18 | (description "Simple wrapper for pipewire in firefox") | ||
19 | (home-page "http://mozilla.org/") | ||
20 | (license license:mpl2.0) | ||
26 | (inputs | 21 | (inputs |
27 | `(("bash" ,bash-minimal) | 22 | `(("bash" ,bash-minimal) |
28 | ("pipewire" ,pipewire) | 23 | ("pipewire" ,pipewire) |