guix: Clean up system config
Pierre Neidhardt
parent
c9df46936a
commit
9974f4dc73
|
|
@ -21,105 +21,14 @@
|
|||
(guix build-system gnu)
|
||||
(gnu packages pkg-config)
|
||||
(gnu packages libusb)
|
||||
(gnu packages gnupg)
|
||||
(gnu packages cups)
|
||||
(gnu packages emacs)
|
||||
(gnu packages version-control)
|
||||
(gnu packages mtools)
|
||||
((guix licenses) #:prefix license:)
|
||||
(guix packages)
|
||||
(srfi srfi-1))
|
||||
|
||||
(use-service-modules desktop)
|
||||
(use-package-modules bootloaders certs suckless ;; xorg
|
||||
)
|
||||
|
||||
;; (define-public linux-nonfree
|
||||
;; (package
|
||||
;; (inherit linux-libre)
|
||||
;; (name "linux-nonfree")
|
||||
;; (version (package-version linux-libre-4.14))
|
||||
;; (source
|
||||
;; (origin
|
||||
;; (method url-fetch)
|
||||
;; (uri
|
||||
;; (string-append
|
||||
;; "https://www.kernel.org/pub/linux/kernel/v4.x/"
|
||||
;; "linux-" version ".tar.xz"))
|
||||
;; (sha256
|
||||
;; (base32
|
||||
;; ;; "0c88p5vly63jsz62ff7971zl6vqzzbv5q519gi8z17ld66sf5063" ; 4.14.33
|
||||
;; ;; "0jwa2r3gpn4ahy38730b7g4xzavfqwxxwgyfhpn5ssvzsc4934gs" ; 4.16.6
|
||||
;; "1w0r7g04q9ac14krm5dmvl8sv88avsmdirvnfk964cz3n3xxbgb1" ; 4.14.69
|
||||
;; ))))))
|
||||
|
||||
;; All linux-nonfree-firmware.
|
||||
;; (define-public linux-nonfree-firmware
|
||||
;; (let ((version "0.0.0")
|
||||
;; (commit "6d5131107f2ba67a13f469ac770a55f101ba654d"))
|
||||
;; (package
|
||||
;; (name "linux-nonfree-firmware")
|
||||
;; (version version)
|
||||
;; (source (origin
|
||||
;; (method git-fetch)
|
||||
;; (uri (git-reference
|
||||
;; (url "git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git")
|
||||
;; (commit commit)))
|
||||
;; (sha256
|
||||
;; (base32
|
||||
;; "0nql7rqkx064lsw5bh6n29yfdxmp3hl4nqgp1fxdb4ys76awchg3"))))
|
||||
;; (build-system trivial-build-system)
|
||||
;; (arguments
|
||||
;; `(#:modules ((guix build utils))
|
||||
;; #:builder (begin
|
||||
;; (use-modules (guix build utils))
|
||||
;; (let ((source (assoc-ref %build-inputs "source"))
|
||||
;; (destination (string-append %output "/lib/firmware")))
|
||||
;; (mkdir-p destination)
|
||||
;; (copy-recursively source destination #:follow-symlinks? #t)
|
||||
;; #t))))
|
||||
;; (home-page "")
|
||||
;; (synopsis "Non-free firmware for the Linux kernel")
|
||||
;; (description "Non-free firmware for the Linux kernel")
|
||||
;; (license #f))))
|
||||
|
||||
;; (define (linux-firmware-version) "9d40a17beaf271e6ad47a5e714a296100eef4692")
|
||||
;; (define (linux-firmware-source version)
|
||||
;; (origin
|
||||
;; (method git-fetch)
|
||||
;; (uri (git-reference
|
||||
;; (url (string-append "https://git.kernel.org/pub/scm/linux/kernel"
|
||||
;; "/git/firmware/linux-firmware.git"))
|
||||
;; (commit version)))
|
||||
;; (file-name (string-append "linux-firmware-" version "-checkout"))
|
||||
;; (sha256
|
||||
;; (base32
|
||||
;; "099kll2n1zvps5qawnbm6c75khgn81j8ns0widiw0lnwm8s9q6ch"))))
|
||||
|
||||
;; (define-public iwlwifi-firmware-nonfree
|
||||
;; (package
|
||||
;; (name "iwlwifi-firmware-nonfree")
|
||||
;; (version (linux-firmware-version))
|
||||
;; (source (linux-firmware-source version))
|
||||
;; (build-system trivial-build-system)
|
||||
;; (arguments
|
||||
;; `(#:modules ((guix build utils))
|
||||
;; #:builder (begin
|
||||
;; (use-modules (guix build utils))
|
||||
;; (let ((source (assoc-ref %build-inputs "source"))
|
||||
;; (fw-dir (string-append %output "/lib/firmware/")))
|
||||
;; (mkdir-p fw-dir)
|
||||
;; (for-each (lambda (file)
|
||||
;; (copy-file file
|
||||
;; (string-append fw-dir (basename file))))
|
||||
;; (find-files source
|
||||
;; "iwlwifi-.*\\.ucode$|LICENSE\\.iwlwifi_firmware$"))
|
||||
;; #t))))
|
||||
;; (home-page "https://wireless.wiki.kernel.org/en/users/drivers/iwlwifi")
|
||||
;; (synopsis "Non-free firmware for Intel wifi chips")
|
||||
;; (description "Non-free iwlwifi firmware")
|
||||
;; (license (license:non-copyleft
|
||||
;; "https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/tree/LICENCE.iwlwifi_firmware?id=HEAD"))))
|
||||
(use-package-modules bootloaders certs suckless) ; xorg
|
||||
|
||||
;; Allow members of the "video" group to change the screen brightness.
|
||||
(define %backlight-udev-rule
|
||||
|
|
@ -200,11 +109,7 @@
|
|||
;; (kernel-arguments '("modprobe.blacklist=pcspkr"))
|
||||
;; (kernel-arguments '("modprobe.blacklist=nouveau"))
|
||||
;; (kernel-arguments '("pcie_port_pm=off"))
|
||||
;; (firmware (cons* linux-nonfree-firmware %base-firmware))
|
||||
(firmware (append (list
|
||||
linux-firmware-iwlwifi
|
||||
;; linux-firmware-all
|
||||
)
|
||||
(firmware (append (list linux-firmware-iwlwifi)
|
||||
%base-firmware))
|
||||
;; TODO: Remove all virtio modules.
|
||||
(initrd-modules (delete "virtio-rng" %base-initrd-modules))
|
||||
|
|
@ -253,9 +158,6 @@
|
|||
ntfs-3g
|
||||
exfat-utils
|
||||
fuse-exfat
|
||||
;; emacs
|
||||
;; git
|
||||
;; gnupg
|
||||
%base-packages))
|
||||
|
||||
(services (cons*
|
||||
|
|
|
|||
|
|
@ -8,14 +8,6 @@
|
|||
#:use-module (gnu packages linux)
|
||||
#:use-module (srfi srfi-1))
|
||||
|
||||
;; (define-public linux-custom
|
||||
;; (package
|
||||
;; (inherit linux-libre)
|
||||
;; (name "linux-custom")
|
||||
;; (native-inputs
|
||||
;; `(("kconfig" ,(local-file "./linux-custom.conf"))
|
||||
;; ,@(alist-delete "kconfig" (package-native-inputs linux-libre))))))
|
||||
|
||||
(define-public linux-nonfree
|
||||
(package
|
||||
(inherit linux-libre)
|
||||
|
|
@ -33,7 +25,7 @@
|
|||
;; 4.14.71
|
||||
"12blj3zzvzs2nz8rp1g5ykibfvm355442c31l4ijr4mxphylg93n"))))
|
||||
(native-inputs
|
||||
`(("kconfig" ,(local-file "./linux-manual.conf"))
|
||||
`(("kconfig" ,(local-file "./linux-laptop.conf"))
|
||||
,@(alist-delete "kconfig" (package-native-inputs linux-libre))))))
|
||||
|
||||
;; 250+ MB.
|
||||
|
|
|
|||
Loading…
Reference in New Issue