use the pipewire sound service

6 files changed, 73 insertions, 0 deletions

diff --git a/suweren/home.scm b/suweren/home.scm
new file mode 100644
index 0000000..fb3905c
--- /dev/null
+++ b/suweren/home.scm
@@ -0,0 +1,21 @@
+(define-module (suweren home)
+  #:use-module (gnu home)
+  #:use-module (gnu home services desktop)
+  #:use-module (gnu home services shells)
+  #:use-module (gnu home services shepherd)
+  #:use-module (gnu home services sound)
+  #:use-module (gnu services)
+  #:use-module (suweren home services)
+  #:use-module (suweren services sound))
+
+(define-public %home-environment
+  (let* ((bash (service home-bash-service-type
+			bash-configuration))
+	 (dbus (service home-dbus-service-type))
+	 (pipewire (service home-pipewire-service-type))
+	 (shepherd (service home-shepherd-service-type))
+	 (services (list bash
+			 dbus
+			 pipewire
+			 shepherd)))
+    (home-environment (services services))))
diff --git a/suweren/home/bash-profile b/suweren/home/bash-profile
new file mode 100644
index 0000000..37ea25c
--- /dev/null
+++ b/suweren/home/bash-profile
@@ -0,0 +1,2 @@
+# Honor per-interactive-shell startup file
+if [ -f ~/.bashrc ]; then . ~/.bashrc; fi
diff --git a/suweren/home/bashrc b/suweren/home/bashrc
new file mode 100644
index 0000000..10589f4
--- /dev/null
+++ b/suweren/home/bashrc
@@ -0,0 +1,31 @@
+# Bash initialization for interactive non-login shells and
+# for remote shells (info "(bash) Bash Startup Files").
+
+# Export 'SHELL' to child processes.  Programs such as 'screen'
+# honor it and otherwise use /bin/sh.
+export SHELL
+
+if [[ $- != *i* ]]
+then
+    # We are being invoked from a non-interactive shell.  If this
+    # is an SSH session (as in "ssh host command"), source
+    # /etc/profile so we get PATH and other essential variables.
+    [[ -n "$SSH_CLIENT" ]] && source /etc/profile
+
+    # Don't do anything else.
+    return
+fi
+
+# Source the system-wide file.
+source /etc/bashrc
+
+# Adjust the prompt depending on whether we're in 'guix environment'.
+if [ -n "$GUIX_ENVIRONMENT" ]
+then
+    PS1='\u@\h \w [env]\$ '
+else
+    PS1='\u@\h \w\$ '
+fi
+alias ls='ls -p --color=auto'
+alias ll='ls -l'
+alias grep='grep --color=auto'
diff --git a/suweren/home/services.scm b/suweren/home/services.scm
new file mode 100644
index 0000000..b765820
--- /dev/null
+++ b/suweren/home/services.scm
@@ -0,0 +1,11 @@
+(define-module (suweren home services)
+  #:use-module (gnu home services shells)
+  #:use-module (guix gexp))
+
+(define-public bash-configuration
+  (let ((bashrc (list (local-file "bashrc"
+				  "bashrc")))
+	(bash-profile (list (local-file "bash-profile"
+					"bash-profile"))))
+    (home-bash-configuration (bashrc bashrc)
+			     (bash-profile bash-profile))))
diff --git a/suweren/services.scm b/suweren/services.scm
index 1cd2467..9674808 100644
--- a/suweren/services.scm
+++ b/suweren/services.scm
@@ -2,6 +2,7 @@
   #:use-module (gnu services)
   #:use-module (gnu services base)
   #:use-module (gnu services desktop)
+  #:use-module (gnu services sound)
   #:use-module (services guix channels)
   #:use-module (services nonguix substitute)
   #:use-module (services plasma-desktop))
@@ -9,6 +10,7 @@
 (define-public %distribution-services
   (let ((%desktop-services*
 	 (modify-services %desktop-services
+			  (delete pulseaudio-service-type)
 			  (guix-service-type config
 					     =>
 					     (channels config))
diff --git a/suweren/services/sound.scm b/suweren/services/sound.scm
new file mode 100644
index 0000000..8067f98
--- /dev/null
+++ b/suweren/services/sound.scm
@@ -0,0 +1,6 @@
+(define-module (suweren services sound)
+  #:use-module (gnu home services sound)
+  #:use-module (gnu services))
+
+(define-public pipewire
+  (service home-pipewire-service-type))