summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--channels.scm6
-rw-r--r--home-config/home-configuration.scm4
-rw-r--r--modules/ryan-config/base-system.scm3
-rw-r--r--modules/ryan-packages/mozilla.scm21
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 @@
3 (url "https://git.savannah.gnu.org/git/guix.git") 3 (url "https://git.savannah.gnu.org/git/guix.git")
4 (branch "master") 4 (branch "master")
5 (commit 5 (commit
6 "69951a61a1d8f1f2135ea2dc836738be282b97bc") 6 "c3f15443bc6d457758aad1326dcc6dcad9cf8d6e")
7 (introduction 7 (introduction
8 (make-channel-introduction 8 (make-channel-introduction
9 "9edb3f66fd807b096b48283debdcddccfea34bad" 9 "9edb3f66fd807b096b48283debdcddccfea34bad"
@@ -14,7 +14,7 @@
14 (url "https://gitlab.com/nonguix/nonguix") 14 (url "https://gitlab.com/nonguix/nonguix")
15 (branch "master") 15 (branch "master")
16 (commit 16 (commit
17 "5baccd1d72594b4c85e958c2f34cac923345acb3") 17 "a4356defe7d4ee9b0ac6789d67f94d00714a9409")
18 (introduction 18 (introduction
19 (make-channel-introduction 19 (make-channel-introduction
20 "897c1a470da759236cc11798f4e0a5f7d4d59fbc" 20 "897c1a470da759236cc11798f4e0a5f7d4d59fbc"
@@ -25,7 +25,7 @@
25 (url "https://codeberg.org/hako/rosenthal.git") 25 (url "https://codeberg.org/hako/rosenthal.git")
26 (branch "trunk") 26 (branch "trunk")
27 (commit 27 (commit
28 "0e31205d7392c450bf33de24d7f0cc38aa82d4d5") 28 "2c967e048f53aaaef002f114a9ee6c985be1278b")
29 (introduction 29 (introduction
30 (make-channel-introduction 30 (make-channel-introduction
31 "7677db76330121a901604dfbad19077893865f35" 31 "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 @@
114 "password-store" 114 "password-store"
115 "node" 115 "node"
116 "kanshi" 116 "kanshi"
117 "firefox" 117 ;"firefox"
118 "git-lfs")) 118 "git-lfs"))
119 (list my-neovim wl-mirror calcurse-fixed))) 119 (list my-neovim wl-mirror firefox-wrapped calcurse-fixed)))
120 120
121 ;; Below is the list of Home services. To search for available 121 ;; Below is the list of Home services. To search for available
122 ;; services, run 'guix home search KEYWORD' in a terminal. 122 ;; 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 @@
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)