From 4896c4de9526c23b976d071036b2f2d49082ff07 Mon Sep 17 00:00:00 2001 From: Luis Guilherme Coelho Date: Fri, 5 Apr 2024 02:08:42 -0300 Subject: [PATCH] home-environments: radio: Use wireplumber-minimal for home-pipewire-service --- home-environments/radio.scm | 72 +++++++++++++++++++++---------------- 1 file changed, 41 insertions(+), 31 deletions(-) diff --git a/home-environments/radio.scm b/home-environments/radio.scm index 0bb25f4..79c73d4 100644 --- a/home-environments/radio.scm +++ b/home-environments/radio.scm @@ -13,6 +13,7 @@ #|B|# #:use-module (gnu packages bittorrent) #|C|# #:use-module (gnu packages c) #:use-module (gnu packages calendar) + #:use-module (gnu packages chromium) #:use-module (gnu packages curl) #|D|# #:use-module (gnu packages databases) #|F|# #:use-module (gnu packages file) @@ -20,14 +21,16 @@ #:use-module (gnu packages freedesktop) #|G|# #:use-module (gnu packages glib) #:use-module (gnu packages games) - #:use-module (gnu packages gnome) #:use-module (gnu packages gnu-doc) #:use-module (gnu packages gnupg) #:use-module (gnu packages guile-xyz) #|I|# #:use-module (gnu packages image-viewers) #:use-module (gnu packages image) + #:use-module (gnu packages irc) #|L|# #:use-module (gnu packages linux) + #:use-module (gnu packages llvm) #|M|# #:use-module (gnu packages maths) + #:use-module (gnu packages messaging) #:use-module (gnu packages minetest) #|P|# #:use-module (gnu packages password-utils) #:use-module (gnu packages pdf) @@ -38,8 +41,8 @@ #:use-module (gnu packages suckless) #|T|# #:use-module (gnu packages telegram) #:use-module (gnu packages terminals) + #:use-module (gnu packages tex) #:use-module (gnu packages text-editors) - #:use-module (gnu packages tor-browsers) #:use-module (gnu packages toys) #|V|# #:use-module (gnu packages version-control) #:use-module (gnu packages video) @@ -68,6 +71,7 @@ #|U|# #:use-module (radix utils) #|Radix packages|# + #|B|# #:use-module (radix packages browser-extensions) #|D|# #:use-module (radix packages disk) #|I|# #:use-module (radix packages image-viewers) #|F|# #:use-module (radix packages freedesktop) @@ -112,11 +116,10 @@ packages:web)) #|Default applications|# -(define application:browser "mullvadbrowser") +(define application:browser "chromium") (define application:editor "kak") (define application:pager "less") (define application:reader "sioyek") -(define application:shell "fish") (define application:terminal "foot") (define application:wm "river") @@ -134,7 +137,6 @@ #|freedesktop|# xdg-utils xdg-desktop-portal xdg-desktop-portal-wlr xdg-terminal-exec #|glib |# dbus - #|gnome |# adwaita-icon-theme #|image |# grim slurp #|terminals |# foot #|toys |# wayneko @@ -144,9 +146,10 @@ (define packages:development (list #|gnupg |# gnupg pinentry - #|ssh |# openssh - #|text-editors |# kak-lsp parinfer-rust guile-lsp-server + #|llvm |# clang-15 #|math |# libqalculate + #|ssh |# openssh + #|text-editors |# kakoune #;kak-lsp #;parinfer-rust #|vesion-control|# git)) (define packages:documentation @@ -157,7 +160,7 @@ (define packages:downloads (list #|bittorrent|# aria2 qbittorrent #|curl |# curl - #|video |# yt-dlp)) + #|video |# yt-dlp)) (define packages:file-managing (list #|disk |# lf @@ -172,14 +175,16 @@ font-juliamono font-liberation font-meslo-lg-dz font-misc-misc font-un font-wqy-zenhei)) -(define packages:games +#;(define packages:games (list #|games|# minetest supertuxkart xonotic)) (define packages:image (list #|image-viewers|# imv)) (define packages:messaging - (list #|telegram|# telegram-desktop)) + (list #|irc |# weechat + #|telegram |# telegram-desktop + #|messaging|# weechat-matrix)) (define packages:password (list #|password-utils|# keepassxc)) @@ -188,6 +193,9 @@ (list #|pdf |# sioyek/wayland #|syndication|# newsraft)) +(define packages:scheme + (list #|guile-xyz|# guile-srfi-197 guile-srfi-232)) + (define packages:sound (list #|linux |# wireplumber #|pulseaudio|# pamixer pavucontrol)) @@ -196,7 +204,17 @@ (list #|video|# ffmpeg mpv)) (define packages:web - (list #|tor-browsers|# mullvadbrowser)) + (list #|chromium |# ungoogled-chromium/wayland + #|browser-extensions|# darkreader/chromium)) + +#;(define packages:writing + (list #|tex|# texlive-collection-basic texlive-collection-fontsextra + texlive-collection-fontsrecommended texlive-collection-latex + texlive-collection-latexextra texlive-collection-latexrecommended + texlive-collection-luatex texlive-collection-langportuguese + texlive-collection-langenglish texlive-collection-langfrench + texlive-collection-mathscience texlive-collection-pictures + texlive-scheme-minimal)) (define home-environment (user-home-environment @@ -206,13 +224,14 @@ #|D|# packages:databases packages:desktop packages:development packages:documentation packages:downloads #|F|# packages:file-managing packages:fonts - #|G|# packages:games + #|G|# #;packages:games #|I|# packages:image #|M|# packages:messaging #|P|# packages:password - #|S|# packages:sound + #|R|# packages:reading + #|S|# packages:scheme packages:sound #|V|# packages:video - #|W|# packages:web)) + #|W|# packages:web #;packages:writing)) (services (list #|XDG services|# @@ -239,7 +258,7 @@ (exec-arg . "") (startup-wm-class . "foot")))))) (default (associate-right - ('mullvadbrowser.desktop + ('chromium.desktop `("application/xhtml+xml" "application/x-extension-htm" "application/x-extension-xhtml" @@ -253,9 +272,11 @@ "text/xml" "text/x-c" "text/x-c++" + "text/x-clojure" "text/x-diff" "text/x-lisp" "text/x-scheme" + "text/x-script.python" "text/x-shellscript" "text/x-tex")) ('lf.desktop @@ -345,21 +366,9 @@ #|Kakoune bindings for info|# ("info" . "info --init-file $XDG_CONFIG_HOME/info") - #|Easy presentation setup with xrandr|# - ("present" . ,(format #f "xrandr --output LVDS-1 ~ - --mode 1366x768 ~ - --scale 1x1 ~ - --output VGA-1 ~ - --same-as LVDS-1 ~ - --mode 1920x1080 ~ - --scale 0.711x0.711")) - - #|Listen to libre music on vern's radio|# - ("radio" . "https://radio.vern.cc") - #|Kakoune aliases for the shell|# - ("':e'" . "kak") - ("':q'" . "exit"))) + (":e" . "kak") + (":q" . "exit"))) (abbreviations (let ((@ (symbol-prefix-proc '@)) (edit (partial format #f "$EDITOR~@{ ~a~}")) @@ -493,7 +502,6 @@ ("EDITOR" . ,application:editor) ("PAGER" . ,application:pager) ("READER" . ,application:reader) - ("SHELL" . ,application:shell) ("TERMINAL" . ,application:terminal) ("VISUAL" . ,application:editor) ("WM" . ,application:wm))) @@ -524,7 +532,9 @@ (service home-dbus-service-type) #|Sound services|# - (service home-pipewire-service-type) + (service home-pipewire-service-type + (home-pipewire-configuration + (wireplumber wireplumber-minimal))) #|Battery services|# (service home-batsignal-service-type