tower-guix: add /media mounts and xdg-user-dirs
This commit is contained in:
parent
340573426b
commit
e8690220d7
|
@ -2,11 +2,15 @@
|
||||||
#:use-module (fschl utils)
|
#:use-module (fschl utils)
|
||||||
#:use-module (fschl systems base)
|
#:use-module (fschl systems base)
|
||||||
#:use-module (fschl systems common)
|
#:use-module (fschl systems common)
|
||||||
; #:use-module (fschl home-services pipewire)
|
;; #:use-module (fschl home-services pipewire)
|
||||||
#:use-module (fschl home-services xsettingsd)
|
#:use-module (fschl home-services xsettingsd)
|
||||||
|
#:use-module (gnu)
|
||||||
#:use-module (gnu home)
|
#:use-module (gnu home)
|
||||||
|
#:use-module (gnu home services xdg)
|
||||||
|
#:use-module (gnu home services sound)
|
||||||
#:use-module (gnu packages file-systems)
|
#:use-module (gnu packages file-systems)
|
||||||
#:use-module (gnu services)
|
#:use-module (gnu services)
|
||||||
|
#:use-module (gnu services docker)
|
||||||
#:use-module (gnu system)
|
#:use-module (gnu system)
|
||||||
#:use-module (gnu system uuid)
|
#:use-module (gnu system uuid)
|
||||||
#:use-module (gnu system file-systems)
|
#:use-module (gnu system file-systems)
|
||||||
|
@ -19,7 +23,19 @@
|
||||||
(service home-xsettingsd-service-type
|
(service home-xsettingsd-service-type
|
||||||
(home-xsettingsd-configuration
|
(home-xsettingsd-configuration
|
||||||
(dpi 180)))
|
(dpi 180)))
|
||||||
; (service home-pipewire-service-type)
|
;; (service home-pipewire-service-type)
|
||||||
|
(simple-service
|
||||||
|
'xdg-user-directories-config-service
|
||||||
|
home-xdg-user-directories-service-type
|
||||||
|
(home-xdg-user-directories-configuration
|
||||||
|
(desktop "$HOME/desktop")
|
||||||
|
(documents "/media/store/Documents")
|
||||||
|
(download "/media/store/Downloads")
|
||||||
|
(music "/media/store/Music")
|
||||||
|
(pictures "/media/store/Pictures")
|
||||||
|
(publicshare "/media/store/Public")
|
||||||
|
(templates "/media/store/Templates")
|
||||||
|
(videos "/media/store/Videos")))
|
||||||
common-home-services))))
|
common-home-services))))
|
||||||
|
|
||||||
(define system
|
(define system
|
||||||
|
@ -27,18 +43,30 @@
|
||||||
(inherit base-operating-system)
|
(inherit base-operating-system)
|
||||||
(host-name "tower-guix")
|
(host-name "tower-guix")
|
||||||
|
|
||||||
;; Add sof-firmware drivers for audio on ThinkPad x230
|
(keyboard-layout (keyboard-layout "de" "altgr-intl" #:options '("ctrl:nocaps")))
|
||||||
;; (firmware (list linux-firmware sof-firmware))
|
(bootloader (bootloader-configuration
|
||||||
|
(bootloader grub-efi-bootloader)
|
||||||
;; (source (uuid "ad42a856-8e7c-4844-a55a-23ba4bd03dcc"))
|
(targets '("/boot/efi"))
|
||||||
;; (target "system-root")
|
(keyboard-layout keyboard-layout)))
|
||||||
;; (type luks-device-mapping))))
|
|
||||||
|
|
||||||
(file-systems (cons*
|
(file-systems (cons*
|
||||||
(file-system
|
(file-system
|
||||||
(device "/dev/nvme0n1p3")
|
(device "/dev/nvme0n1p3")
|
||||||
(mount-point "/")
|
(mount-point "/")
|
||||||
(type "ext4"))
|
(type "ext4"))
|
||||||
|
(file-system
|
||||||
|
(device "/dev/sdd1")
|
||||||
|
(mount-point "/media/store")
|
||||||
|
(type "ext4"))
|
||||||
|
(file-system
|
||||||
|
(device "/dev/sda1")
|
||||||
|
(mount-point "/media/docs")
|
||||||
|
(type "ext4"))
|
||||||
|
(file-system
|
||||||
|
;; (device "/dev/nvme0n1p1")
|
||||||
|
(device (uuid "7241-D6CA" 'fat))
|
||||||
|
(mount-point "/boot/efi")
|
||||||
|
(type "vfat"))
|
||||||
%base-file-systems))))
|
%base-file-systems))))
|
||||||
|
|
||||||
;; Return home or system config based on environment variable
|
;; Return home or system config based on environment variable
|
||||||
|
|
Loading…
Reference in New Issue