diff options
| author | Timo Wilken | 2023-09-12 21:16:20 +0200 |
|---|---|---|
| committer | Timo Wilken | 2023-09-12 21:20:19 +0200 |
| commit | a082af65ad53e4703b9540647aff9a716fdda86b (patch) | |
| tree | 4d18f2d547878caa4aec18e80fc7653a984338c7 /tw/home/cern.scm | |
| parent | d44b9efda2d387430e63c1d6cd426c88bcde2eda (diff) | |
Factor out common desktop services
Most of the code for setting desktop layouts is common between machines.
Also, make the blueman-applet service reusable.
Diffstat (limited to 'tw/home/cern.scm')
| -rw-r--r-- | tw/home/cern.scm | 37 |
1 files changed, 13 insertions, 24 deletions
diff --git a/tw/home/cern.scm b/tw/home/cern.scm index 8c6ed7d5..b03a1348 100644 --- a/tw/home/cern.scm +++ b/tw/home/cern.scm @@ -30,6 +30,7 @@ #:use-module (tw packages catppuccin) #:use-module (tw packages xorg) #:use-module (tw gexp) + #:use-module (tw services desktop) #:use-module (tw services git) #:use-module (tw services gnupg) #:use-module (tw theme)) @@ -104,30 +105,18 @@ (nighttime-brightness 0.7) (extra-content "fade=0"))) ; with fade=1, restarting redshift causes flickering for a few secs - (simple-service 'xorg-setup-services home-shepherd-service-type - (list - (polybar-service "DP-2") - (polybar-service "DP-1-8") - - (shepherd-service - (documentation "Set up X displays on login.") - (provision '(xorg-setup)) - (one-shot? #t) - (start #~(lambda _ - (system* #$(file-append numlockx "/bin/numlockx") "on") - ;; Turn off the monitors if there is no input for 10 minutes. - (system* #$(file-append xset "/bin/xset") "dpms" "600" "600" "600") - (system* #$(file-append xrandr "/bin/xrandr") - "--output" "DP-2" "--primary" "--auto") - (system* #$(file-append xrandr "/bin/xrandr") - ;; This can do 4K but HiDPI is a pain. - "--output" "DP-1-8" "--mode" "1920x1080" "--rate" "60.00" - "--left-of" "DP-2") - ;; Set the desktop background picture. Hopefully doing this just after - ;; xrandr works and sets it for both screens. - (system* #$(file-append hsetroot "/bin/hsetroot") "-cover" - (string-append (getenv "XDG_CONFIG_HOME") - "/X11/ridge-view.jpg"))))))) + (service home-desktop-layout-service-type + (home-desktop-layout-configuration + (desktop-background "~/.config/X11/ridge-view.jpg") + (monitors + (list (home-monitor-configuration + (name "DP-2") + (xrandr-options '("--primary" "--auto"))) + (home-monitor-configuration + (name "DP-1-8") + ;; This can do 4K but HiDPI is a pain. + (xrandr-options '("--mode" "1920x1080" "--rate" "60.00" + "--left-of" "DP-2"))))))) ;; On my work machine, Git must always use my work PGP key. (service home-git-service-type |