diff options
| -rw-r--r-- | tw/home/btl.scm | 1 | ||||
| -rw-r--r-- | tw/home/cern.scm | 1 | ||||
| -rw-r--r-- | tw/home/frm.scm | 1 | ||||
| -rw-r--r-- | tw/home/lap.scm | 1 | ||||
| -rw-r--r-- | tw/services/desktop.scm | 20 |
5 files changed, 8 insertions, 16 deletions
diff --git a/tw/home/btl.scm b/tw/home/btl.scm index 9449b1c3..200153ea 100644 --- a/tw/home/btl.scm +++ b/tw/home/btl.scm @@ -50,7 +50,6 @@ (service home-desktop-service-type (home-desktop-configuration - (bluetooth? #t) (monitors (list (home-monitor-configuration (name "DisplayPort-2") diff --git a/tw/home/cern.scm b/tw/home/cern.scm index 842b8658..d86ef727 100644 --- a/tw/home/cern.scm +++ b/tw/home/cern.scm @@ -55,7 +55,6 @@ (service home-desktop-service-type (home-desktop-configuration - (bluetooth? #t) (battery-name "BAT0") (ac-adapter-name "AC") (thermal-zone "0") diff --git a/tw/home/frm.scm b/tw/home/frm.scm index b3de1b74..2a0e5481 100644 --- a/tw/home/frm.scm +++ b/tw/home/frm.scm @@ -55,7 +55,6 @@ (service home-desktop-service-type (home-desktop-configuration - (bluetooth? #t) (battery-name "BAT1") (ac-adapter-name "ACAD") (monitors diff --git a/tw/home/lap.scm b/tw/home/lap.scm index eb28b7cf..e0ee5980 100644 --- a/tw/home/lap.scm +++ b/tw/home/lap.scm @@ -98,7 +98,6 @@ (service home-desktop-service-type (home-desktop-configuration (nvidia-driver? #t) - (bluetooth? #t) (battery-name "BAT0") (ac-adapter-name "AC") (monitors diff --git a/tw/services/desktop.scm b/tw/services/desktop.scm index 28f91e46..74dec352 100644 --- a/tw/services/desktop.scm +++ b/tw/services/desktop.scm @@ -98,8 +98,6 @@ NVIDIA driver?") (desktop-background (file-like (file-append tw-background "/share/backgrounds/tw/blobs.png")) "An image that will be set as the desktop background.") - (bluetooth? (boolean #f) "Whether the device has Bluetooth hardware. If -true, configure the user interface to use it.") (battery-name maybe-string "The device name of the system's battery, if any. See @code{/sys/class/power_supply}.") (ac-adapter-name maybe-string "The device name of the system's mains power @@ -293,7 +291,7 @@ show_border=1 (define (home-shepherd-services config) "Run various daemons in my user profile." (match-record config <home-desktop-configuration> - (nvidia-driver? bluetooth? desktop-background battery-name ac-adapter-name thermal-zone monitors) + (nvidia-driver? desktop-background battery-name ac-adapter-name thermal-zone monitors) `(,(shepherd-service (documentation "NetworkManager applet; provides a GUI for network connections.") (provision '(nm-applet)) @@ -303,6 +301,13 @@ show_border=1 (stop #~(make-kill-destructor))) ,(shepherd-service + (documentation "Blueman applet; provides a GUI for connection to bluetooth devices.") + (provision '(blueman-applet)) + (start #~(make-forkexec-constructor + (list #$(file-append blueman "/bin/blueman-applet")))) + (stop #~(make-kill-destructor))) + + ,(shepherd-service (documentation "Dunst notification daemon; displays desktop notifications.") (provision '(dunst)) (requirement '(x11-display)) @@ -379,15 +384,6 @@ show_border=1 (system* #$(file-append hsetroot "/bin/hsetroot") "-cover" (replace-home #$desktop-background))))) - ,@(if bluetooth? - (list (shepherd-service - (documentation "Blueman applet; provides a GUI for connection to bluetooth devices.") - (provision '(blueman-applet)) - (start #~(make-forkexec-constructor - (list #$(file-append blueman "/bin/blueman-applet")))) - (stop #~(make-kill-destructor)))) - '()) - ,@(map (compose (cut polybar-service <> battery-name ac-adapter-name thermal-zone) home-monitor-configuration-name) monitors)))) |