mirror of
https://gitlab.com/nonguix/nonguix.git
synced 2025-10-02 02:14:59 +00:00
Compare commits
12 commits
00681fb375
...
3050799aa8
Author | SHA1 | Date | |
---|---|---|---|
|
3050799aa8 | ||
|
382df31152 | ||
|
bfe682b9ab | ||
|
70a0de71d0 | ||
|
5c13dbf132 | ||
|
8e6ff96702 | ||
|
922f4bb6fd | ||
|
f70b0b8bb5 | ||
|
2e3b8f313a | ||
|
64dd30d302 | ||
|
4674639f43 | ||
|
121e455aac |
4 changed files with 31 additions and 24 deletions
|
@ -15,6 +15,7 @@
|
||||||
#:use-module (guix packages)
|
#:use-module (guix packages)
|
||||||
#:use-module (guix build-system font)
|
#:use-module (guix build-system font)
|
||||||
#:use-module (guix build-system copy)
|
#:use-module (guix build-system copy)
|
||||||
|
#:use-module ((guix licenses) #:prefix license:)
|
||||||
#:use-module (nonguix licenses))
|
#:use-module (nonguix licenses))
|
||||||
|
|
||||||
(define mscorefont
|
(define mscorefont
|
||||||
|
@ -293,21 +294,22 @@ automatically align with text labels."))
|
||||||
(define-public font-apple-color-emoji
|
(define-public font-apple-color-emoji
|
||||||
(package
|
(package
|
||||||
(name "font-apple-color-emoji")
|
(name "font-apple-color-emoji")
|
||||||
(version "18.0d4e1")
|
(version "17.4")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append
|
(uri (string-append
|
||||||
"https://github.com/pharcosyle/apple-fonts"
|
"https://github.com/samuelngs/apple-emoji-linux"
|
||||||
"/releases/download"
|
"/releases/download/v" version "/AppleColorEmoji.ttf"))
|
||||||
"/Apple-Color-Emoji-" version "/Apple.Color.Emoji.ttc"))
|
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "06i1ady7b2g1i2hl3f8yxn64g2i82c2ni9vdw25gpdqdj28vyqw3"))))
|
(base32 "1wahjmbfm1xgm58madvl21451a04gxham5vz67gqz1cvpi0cjva8"))))
|
||||||
(build-system font-build-system)
|
(build-system font-build-system)
|
||||||
(home-page "https://www.apple.com")
|
(home-page "https://github.com/samuelngs/apple-emoji-linux")
|
||||||
(synopsis "Apple Color Emoji typeface by Apple.")
|
(synopsis "Apple Color Emoji for Linux")
|
||||||
(description "Color and black-and-white Apple emoji fonts.")
|
(description "A color typeface used by iOS and macOS to display emoji.")
|
||||||
(license (nonfree "https://www.apple.com"))))
|
(license
|
||||||
|
(list license:asl2.0
|
||||||
|
(nonfree "https://www.apple.com")))))
|
||||||
|
|
||||||
(define-public font-apple-symbols
|
(define-public font-apple-symbols
|
||||||
(package
|
(package
|
||||||
|
|
|
@ -83,7 +83,7 @@ its core.")
|
||||||
(define-public signal-desktop
|
(define-public signal-desktop
|
||||||
(package
|
(package
|
||||||
(name "signal-desktop")
|
(name "signal-desktop")
|
||||||
(version "7.57.0")
|
(version "7.58.0")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
|
@ -92,7 +92,7 @@ its core.")
|
||||||
"https://updates.signal.org/desktop/apt/pool/s/" name "/" name "_" version
|
"https://updates.signal.org/desktop/apt/pool/s/" name "/" name "_" version
|
||||||
"_amd64.deb"))
|
"_amd64.deb"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "0xy4xfyx58v0869x0inypy9rgnbcxzrdnfh3r8qq00640wfj9j2c"))))
|
(base32 "1bhh9z7mclxlzq4pfs695pnkb5x36wm5ihniydvzqqi2g3xjbqam"))))
|
||||||
(supported-systems '("x86_64-linux"))
|
(supported-systems '("x86_64-linux"))
|
||||||
(build-system chromium-binary-build-system)
|
(build-system chromium-binary-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
|
|
|
@ -228,9 +228,9 @@ ACTION==\"unbind\", SUBSYSTEM==\"pci\", ATTR{vendor}==\"0x10de\", ATTR{class}==\
|
||||||
(define-public nvidia-driver
|
(define-public nvidia-driver
|
||||||
(package
|
(package
|
||||||
(name "nvidia-driver")
|
(name "nvidia-driver")
|
||||||
(version "570.153.02")
|
(version "570.169")
|
||||||
(source (nvidia-source
|
(source (nvidia-source
|
||||||
version "1dp1bpx4scx7lzqnajn75q5zjlbfvpjych3ils7zlxlmyvj8d20l"))
|
version "0r9phz9rv0n208f61lvv3m492387mjmqk4gph3ww7iawg53shcjz"))
|
||||||
(build-system copy-build-system)
|
(build-system copy-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
(list #:modules '((guix build copy-build-system)
|
(list #:modules '((guix build copy-build-system)
|
||||||
|
@ -627,9 +627,9 @@ add @code{nvidia_drm.modeset=1} to @code{kernel-arguments} as well.")
|
||||||
(define-public nvidia-settings
|
(define-public nvidia-settings
|
||||||
(package
|
(package
|
||||||
(name "nvidia-settings")
|
(name "nvidia-settings")
|
||||||
(version "570.153.02")
|
(version "570.169")
|
||||||
(source (nvidia-settings-source
|
(source (nvidia-settings-source
|
||||||
name version "1qvvsrhlswpnv9aldqnynjch8y1x219ccsk3w4rfrw3swxm9qvp6"))
|
name version "15sxzczan9kq55hyiq73arls95lsdakpfbbzf4b6741fjfgd8kfh"))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
(list #:tests? #f ;no test suite
|
(list #:tests? #f ;no test suite
|
||||||
|
|
|
@ -2,6 +2,8 @@
|
||||||
;;; Copyright © 2025 Hilton Chain <hako@ultrarare.space>
|
;;; Copyright © 2025 Hilton Chain <hako@ultrarare.space>
|
||||||
|
|
||||||
(define-module (nonguix transformations)
|
(define-module (nonguix transformations)
|
||||||
|
#:use-module (srfi srfi-1)
|
||||||
|
#:use-module (srfi srfi-26)
|
||||||
#:use-module (guix channels)
|
#:use-module (guix channels)
|
||||||
#:use-module (guix diagnostics)
|
#:use-module (guix diagnostics)
|
||||||
#:use-module (guix gexp)
|
#:use-module (guix gexp)
|
||||||
|
@ -74,10 +76,11 @@ FIXME: GUIX-SOURCE? is disabled by default due to performance issue."
|
||||||
(cons %nonguix-signing-key
|
(cons %nonguix-signing-key
|
||||||
(guix-configuration-authorized-keys config)))
|
(guix-configuration-authorized-keys config)))
|
||||||
(substitute-urls
|
(substitute-urls
|
||||||
`(,@(guix-configuration-substitute-urls config)
|
(delete-duplicates
|
||||||
,@(if substitutes?
|
`(,@(guix-configuration-substitute-urls config)
|
||||||
'("https://substitutes.nonguix.org")
|
,@(if substitutes?
|
||||||
'()))))))))))
|
'("https://substitutes.nonguix.org")
|
||||||
|
'())))))))))))
|
||||||
|
|
||||||
(define* (nonguix-transformation-linux #:key (linux linux)
|
(define* (nonguix-transformation-linux #:key (linux linux)
|
||||||
(firmware (list linux-firmware))
|
(firmware (list linux-firmware))
|
||||||
|
@ -128,11 +131,13 @@ TODO: Xorg configuration."
|
||||||
(operating-system
|
(operating-system
|
||||||
(inherit os)
|
(inherit os)
|
||||||
(kernel-arguments
|
(kernel-arguments
|
||||||
`("modprobe.blacklist=nouveau"
|
(delete-duplicates
|
||||||
,@(if kernel-mode-setting?
|
(cons* "modprobe.blacklist=nouveau"
|
||||||
'("nvidia_drm.modeset=1")
|
(string-append
|
||||||
'())
|
"nvidia_drm.modeset=" (if kernel-mode-setting? "1" "0"))
|
||||||
,@(operating-system-user-kernel-arguments os)))
|
(remove
|
||||||
|
(cut string-prefix? "nvidia_drm.modeset=" <>)
|
||||||
|
(operating-system-user-kernel-arguments os)))))
|
||||||
(services
|
(services
|
||||||
`(,(or (assoc-ref %presets driver)
|
`(,(or (assoc-ref %presets driver)
|
||||||
(leave
|
(leave
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue