freya/dotfiles-guix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor services, syncthing, update audio packages

Browse source
This commit is contained in:
Freya Murphy 2024-08-11 17:43:39 -04:00
parent 9b03642a08
commit 01f9c0119a
Signed by: freya
GPG key ID: 744AB800E383AE52
8 changed files with 115 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
channels.scm
View file

@ -3,7 +3,7 @@
(url "https://git.savannah.gnu.org/git/guix.git") (url "https://git.savannah.gnu.org/git/guix.git")
(branch "master") (branch "master")
(commit (commit
"5e567587dd4abf51f9a6fa44f5a852dde1115ce9") "de714bcb46d61922e0efc10783ea23fb0202f583")
(introduction (introduction
(make-channel-introduction (make-channel-introduction
"9edb3f66fd807b096b48283debdcddccfea34bad" "9edb3f66fd807b096b48283debdcddccfea34bad"
@ -14,7 +14,7 @@
(url "https://gitlab.com/nonguix/nonguix") (url "https://gitlab.com/nonguix/nonguix")
(branch "master") (branch "master")
(commit (commit
"1b0594dc534d834be6f3facec98dee13db2a2299") "57d6d0cd4beb489e045231eb7066073ebe8a0dc5")
(introduction (introduction
(make-channel-introduction (make-channel-introduction
"897c1a470da759236cc11798f4e0a5f7d4d59fbc" "897c1a470da759236cc11798f4e0a5f7d4d59fbc"

2
home/config/zsh/zprofile
View file

@ -80,7 +80,7 @@ while true; do
"h") "h")
echo "Launching Hyprland..." echo "Launching Hyprland..."
export XDG_CURRENT_DESKTOP=Hyprland export XDG_CURRENT_DESKTOP=Hyprland
exec dbus-run-session Hyprland &> $HOME/.log/Hyprland exec Hyprland &> $HOME/.log/Hyprland
;; ;;
"t") "t")
exec cage -s kitty -- -o font_size=14 &> $HOME/.log/kitty exec cage -s kitty -- -o font_size=14 &> $HOME/.log/kitty

13
home/home.scm
View file

@ -14,6 +14,7 @@
(gnu home services shells) (gnu home services shells)
(gnu home services desktop) (gnu home services desktop)
(gnu home services gnupg) (gnu home services gnupg)
(gnu home services syncthing)
(gnu home services) (gnu home services)
(freya services pipewire) (freya services pipewire)
(freya packages shells) (freya packages shells)
@ -189,11 +190,19 @@
(".nix-channels" ,(local-file "nix-channels")) (".nix-channels" ,(local-file "nix-channels"))
(".gitconfig" ,(local-file "config/git/gitconfig")))) (".gitconfig" ,(local-file "config/git/gitconfig"))))
(service home-pipewire-service-type) (service home-syncthing-service-type
(service home-dbus-service-type) (syncthing-configuration
(user (getenv "USER"))
(group (getenv "USER"))
(home (string-append (getenv "HOME") "/sync"))
(home-service? #t)))
(service home-gpg-agent-service-type (service home-gpg-agent-service-type
(home-gpg-agent-configuration (home-gpg-agent-configuration
(pinentry-program (pinentry-program
(file-append pinentry "/bin/pinentry")) (file-append pinentry "/bin/pinentry"))
(ssh-support? #t))) (ssh-support? #t)))
(service home-pipewire-service-type)
(service home-dbus-service-type)
))) )))

56
modules/freya/packages/linux.scm
View file

@ -1,18 +1,18 @@
(define-module (freya packages linux) (define-module (freya packages linux)
#:use-module (guix download)
#:use-module (guix packages)
#:use-module (guix gexp) #:use-module (guix gexp)
#:use-module (guix utils)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages python-xyz) #:use-module (gnu packages python-xyz)
#:use-module (guix git-download) #:use-module (freya packages pulseaudio))
#:use-module (guix utils)
#:use-module (freya packages networking))
(define-public bluez-new (define-public bluez-new
(package (package
(inherit bluez) (inherit bluez)
(version "5.72") (version "5.77")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -21,17 +21,44 @@
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0vjk4ihywzv8k07bxq7clqgi2afrw54nfp0gcnxw35m98nipz7a9")))) "04h82lfhxh4vd1pyavk1nfrcxc0z5qg5jmsgal9mh22a3pf2y0sx"))))
(arguments (list (arguments (list
#:configure-flags #:configure-flags
#~(list "--sysconfdir=/etc" #~(list (string-append "--prefix=" #$output)
"--sysconfdir=/etc"
"--localstatedir=/var" "--localstatedir=/var"
"--enable-library" "--enable-library"
"--disable-manpages" "--disable-manpages"
"--disable-systemd" "--disable-systemd"
"--enable-hid2hci" "--enable-hid2hci"
(string-append "--with-dbusconfdir=" #$output "/etc") (string-append "--with-dbusconfdir=" #$output "/etc")
(string-append "--with-udevdir=" #$output "/lib/udev")))))) (string-append "--with-udevdir=" #$output "/lib/udev"))
#:phases
#~(modify-phases %standard-phases
(add-after 'configure 'fix-makefile
(lambda _
(substitute* "Makefile"
(("install-confDATA:") "install-IGNORED:")
(("install-confDATA") "")
(("bluetoothd-fix-permissions:") "install-IGNORED2:")
(("bluetoothd-fix-permissions") "")))))
))
))
(define-public alsa-lib-new
(package
(inherit alsa-lib)
(name "alsa-lib")
(version "1.2.12")
(source (origin
(method url-fetch)
(uri (string-append
"ftp://ftp.alsa-project.org/pub/lib/alsa-lib-"
version ".tar.bz2"))
(sha256
(base32
"1lnh38wii8mnwp3n4hnqa718rgi52rq6ix1llsjrs9r7hs8css28"))))))
(define-public pipewire-new (define-public pipewire-new
@ -49,10 +76,13 @@
(base32 (base32
"0cvbyklzqcdr9zj7k7psb24xp8cxb9fdksrd74r68zvnbbix1qlx")))) "0cvbyklzqcdr9zj7k7psb24xp8cxb9fdksrd74r68zvnbbix1qlx"))))
(inputs (inputs
(modify-inputs (modify-inputs (package-inputs pipewire)
(package-inputs pipewire) (delete "alsa-lib")
(delete "alsa-lib") (delete "bluez")
(prepend alsa-lib-new))))) (delete "pulseaudio")
(prepend alsa-lib-new)
(prepend bluez-new)
(prepend pulseaudio-new)))))
(define-public wireplumber-new (define-public wireplumber-new

23
modules/freya/packages/networking.scm
View file

@ -1,6 +1,8 @@
(define-module (freya packages networking) (define-module (freya packages networking)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix gexp) #:use-module (guix gexp)
#:use-module (guix utils)
#:use-module (guix build utils)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix git-download) #:use-module (guix git-download)
@ -22,8 +24,7 @@
#:use-module (gnu packages rust) #:use-module (gnu packages rust)
#:use-module (freya packages linux) #:use-module (freya packages linux)
#:use-module (freya packages crates-io) #:use-module (freya packages crates-io)
#:use-module (guix utils) #:use-module (freya packages pulseaudio))
#:use-module (guix build utils))
(define overskride-version (define overskride-version
"0.5.7") "0.5.7")
@ -119,8 +120,7 @@
gcc-13 gcc-13
dbus dbus
libadwaita libadwaita
pipewire-new pulseaudio-new
pulseaudio
bluez-new)) bluez-new))
(home-page "https://github.com/kaii-lb/overskride") (home-page "https://github.com/kaii-lb/overskride")
(synopsis "A simple yet powerful bluetooth client.") (synopsis "A simple yet powerful bluetooth client.")
@ -137,18 +137,3 @@
(delete "bluez") (delete "bluez")
(prepend bluez-new))))) (prepend bluez-new)))))
(define-public alsa-lib-new
(package
(inherit alsa-lib)
(name "alsa-lib")
(version "1.2.12")
(source (origin
(method url-fetch)
(uri (string-append
"ftp://ftp.alsa-project.org/pub/lib/alsa-lib-"
version ".tar.bz2"))
(sha256
(base32
"1lnh38wii8mnwp3n4hnqa718rgi52rq6ix1llsjrs9r7hs8css28"))))))

34
modules/freya/packages/pulseaudio.scm Normal file
View file

@ -0,0 +1,34 @@
(define-module (freya packages pulseaudio)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix packages)
#:use-module (guix gexp)
#:use-module (guix utils)
#:use-module (gnu packages)
#:use-module (gnu packages pulseaudio)
#:use-module (freya packages linux))
(define-public pulseaudio-new
(package
(inherit pulseaudio)
(name "pulseaudio")
(version "17.0")
(source (origin
(method url-fetch)
(uri (string-append
"https://freedesktop.org/software/pulseaudio/releases/"
name "-" version ".tar.xz"))
(sha256
(base32
"1dc7xdfbn5rknwsvv5m2ijfwnqrap208liwyhiykjghsczb98dq5"))))
(arguments
(substitute-keyword-arguments (package-arguments pulseaudio)
((#:phases phases)
#~(modify-phases #$phases
(delete 'check)))))
(inputs
(modify-inputs (package-inputs pulseaudio)
(delete "alsa-lib")
(delete "bluez")
(prepend alsa-lib-new)
(prepend bluez-new)))))

6
modules/freya/packages/qt.scm
View file

@ -51,9 +51,9 @@
coreutils)) coreutils))
(inputs (inputs
(list qtbase-5)) (list qtbase-5))
(home-page "") (home-page "https://github.com/qt/qtstyleplugins")
(synopsis "") (synopsis "Additional style plugins for Qt")
(description "") (description "Additional style plugins for Qt")
(license license:expat)))) (license license:expat))))

23
modules/freya/system.scm
View file

@ -35,6 +35,7 @@
#:use-module (freya packages gl) #:use-module (freya packages gl)
#:use-module (freya packages qt) #:use-module (freya packages qt)
#:use-module (freya packages wm) #:use-module (freya packages wm)
#:use-module (freya packages pulseaudio)
#:use-module (freya packages networking) #:use-module (freya packages networking)
#:use-module (freya packages virtualization)) #:use-module (freya packages virtualization))
@ -106,7 +107,6 @@
; needed programs ; needed programs
"qemu" "qemu"
"pulseaudio" ; pactl
"alsa-utils" "alsa-utils"
"neovim" "neovim"
@ -151,6 +151,9 @@
; bluetooth ; bluetooth
bluez-new bluez-new
; pactl
pulseaudio-new
; system ; system
virt-manager-ovmf virt-manager-ovmf
freya-ca-certs freya-ca-certs
@ -159,12 +162,15 @@
(services (services
(append (list (append (list
; system
(service nix-service-type)
(service pam-limits-service-type)
(service openssh-service-type) (service openssh-service-type)
(service pcscd-service-type) ; networking
(service spice-vdagent-service-type)
(simple-service 'wireguard-module (simple-service 'wireguard-module
kernel-module-loader-service-type kernel-module-loader-service-type
'("wireguard")) '("wireguard"))
; printing
(service cups-service-type (service cups-service-type
(cups-configuration (cups-configuration
(web-interface? #t))) (web-interface? #t)))
@ -172,21 +178,25 @@
(avahi-configuration (avahi-configuration
(publish? #f) (publish? #f)
(publish-workstation? #f))) (publish-workstation? #f)))
; docker
(service docker-service-type) (service docker-service-type)
(service containerd-service-type) (service containerd-service-type)
(service nix-service-type) ; vms
(service libvirt-service-type (service libvirt-service-type
(libvirt-configuration (libvirt-configuration
(libvirt libvirt-ovmf) (libvirt libvirt-ovmf)
(unix-sock-group "libvirt") (unix-sock-group "libvirt")
(tls-port "16555"))) (tls-port "16555")))
(service virtlog-service-type) (service virtlog-service-type)
(service spice-vdagent-service-type)
; audio
(service bluetooth-service-type (service bluetooth-service-type
(bluetooth-configuration (bluetooth-configuration
(bluez bluez-new) (bluez bluez-new)
(experimental #t) (experimental #t)
(fast-connectable? #t))) (fast-connectable? #t)))
(service pam-limits-service-type) ; yubikey
(service pcscd-service-type)
(udev-rules-service 'fido2 libfido2 #:groups '("plugdev"))) (udev-rules-service 'fido2 libfido2 #:groups '("plugdev")))
(modify-services %desktop-services (modify-services %desktop-services
@ -205,7 +215,8 @@
(delete pulseaudio-service-type) (delete pulseaudio-service-type)
(delete gdm-service-type) (delete gdm-service-type)
(delete avahi-service-type) (delete avahi-service-type)
(delete alsa-service-type)))) (delete alsa-service-type)
(delete screen-locker-service-type))))
(name-service-switch %mdns-host-lookup-nss) (name-service-switch %mdns-host-lookup-nss)