diff options
Diffstat (limited to 'dom0')
| -rw-r--r-- | dom0/home-laptop.scm | 89 | ||||
| -rw-r--r-- | dom0/home.scm | 19 | ||||
| -rw-r--r-- | dom0/system-laptop.scm | 7 | ||||
| -rw-r--r-- | dom0/system.scm | 10 |
4 files changed, 17 insertions, 108 deletions
diff --git a/dom0/home-laptop.scm b/dom0/home-laptop.scm deleted file mode 100644 index f1146b7..0000000 --- a/dom0/home-laptop.scm +++ /dev/null @@ -1,89 +0,0 @@ -(define-module (dom0 home) - #:use-module (gnu) - #:use-module (gnu packages gnupg) - #:use-module (gnu services) - #:use-module (gnu home) - #:use-module (gnu home services) - #:use-module (gnu home services pm) - #:use-module (gnu home services sound) - #:use-module (gnu home services shells) - #:use-module (gnu home services desktop) - #:use-module (gnu home services gnupg) - #:use-module (gnu home services xdg) - #:use-module (guix gexp) - #:export (dom0-home-environment)) - - (use-package-modules compression gnome gnome-xyz video fonts freedesktop - linux package-management pulseaudio ssh - terminals xdisorg xorg glib virtualization - wm messaging) - - (define dom0-home-environment - (home-environment - (services - (list - (simple-service 'profile-env-vars-service - home-environment-variables-service-type - '(;; Sort dot files first in ls - ("LC_COLLATE" . "C") - - ;; vim instead of nano - ("VISUAL" . "vim") - ("EDITOR" . "vim") - - ;; Wayland - ("XDG_CURRENT_DESKTOP" . "sway") - ("XDG_SESSION_TYPE" . "wayland") - ("RTC_USE_PIPEWIRE" . "true") - ("SDL_VIDEODRIVER" . "wayland") - ("MOZ_ENABLE_WAYLAND" . "1") - ("CLUTTER_BACKEND" . "wayland") - ("ELM_ENGINE" . "wayland_egl") - ("ECORE_EVAS_ENGINE" . "wayland-egl") - ("QT_QPA_PLATFORM" . "wayland-egl") - - ;; JAVA - ("_JAVA_AWT_WM_NONREPARENTING" . #t) - - ;; env-vars for Flatpak visibility - ("XDG_DATA_DIRS" . "$XDG_DATA_DIRS:$HOME/.local/share/flatpak/exports/share"))) - - (service home-bash-service-type - (home-bash-configuration - (bash-profile (list (local-file "files/scripts/sway-login") - (plain-file "bash-profile" "flatpak -u remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo"))) - (bashrc (list (local-file "files/scripts/gpg-agent-tty"))))) - - (simple-service 'xdg-user-directories-config-service - home-xdg-user-directories-service-type - (home-xdg-user-directories-configuration - (download "$HOME/Downloads"))) - - (service home-xdg-configuration-files-service-type - `(("sway/config" ,(local-file "./files/misc-config/sway-config")))) - - (service home-gpg-agent-service-type - (home-gpg-agent-configuration - (pinentry-program - (file-append pinentry "/bin/pinentry")) - (ssh-support? #t))) - - (service home-dbus-service-type) - (service home-pipewire-service-type))) - - (packages (list xorg-server-xwayland - sway swayidle swaylock fuzzel foot - grimshot wl-clipboard network-manager-applet - xdg-desktop-portal xdg-desktop-portal-gtk - xdg-desktop-portal-wlr xdg-utils xdg-dbus-proxy shared-mime-info - - ;; Flatpak and XDG - flatpak (list glib "bin") ; flatpak dependency - xdg-desktop-portal xdg-desktop-portal-gtk xdg-desktop-portal-wlr - xdg-utils xdg-dbus-proxy shared-mime-info - - ;; Audio - alsa-utils pavucontrol - - ;; General - openssh zip unzip)))) diff --git a/dom0/home.scm b/dom0/home.scm index 0b76b53..2668850 100644 --- a/dom0/home.scm +++ b/dom0/home.scm @@ -11,13 +11,15 @@ #:use-module (gnu home services gnupg) #:use-module (gnu home services xdg) #:use-module (nongnu packages nvidia) + #:use-module (nongnu services nvidia) #:use-module (guix gexp) + #:use-module (nonguix transformations) #:export (dom0-home-environment)) - (use-package-modules compression gnome gnome-xyz video fonts freedesktop + (use-package-modules compression gnome gnome-xyz music video fonts freedesktop linux package-management pulseaudio ssh terminals xdisorg xorg glib virtualization - wm messaging) + wm messaging gstreamer) (define dom0-home-environment (home-environment @@ -70,7 +72,9 @@ (ssh-support? #t))) (service home-dbus-service-type) - (service home-pipewire-service-type))) + (service home-pipewire-service-type + (home-pipewire-configuration + (pipewire (replace-mesa pipewire)))))) (packages (append (map replace-mesa (list flatpak sway)) (list xorg-server-xwayland @@ -82,9 +86,14 @@ xdg-desktop-portal xdg-desktop-portal-gtk xdg-desktop-portal-wlr xdg-utils xdg-dbus-proxy shared-mime-info - + + ;; virt-man + virt-manager ;; Audio alsa-utils pavucontrol - + ;; gstreamer + gstreamer gst-plugins-base gst-plugins-good + gst-plugins-bad gst-plugins-ugly gst-libav ;; General openssh zip unzip))))) +dom0-home-environment diff --git a/dom0/system-laptop.scm b/dom0/system-laptop.scm index 20bdc89..b300cdb 100644 --- a/dom0/system-laptop.scm +++ b/dom0/system-laptop.scm @@ -6,8 +6,7 @@ #:use-module (nongnu packages linux) #:use-module (nongnu system linux-initrd) #:use-module (nongnu packages nvidia) - #:use-module (nongnu services nvidia) - #:use-module (dom0 home)) + #:use-module (nongnu services nvidia)) (use-service-modules linux guix desktop pm audio virtualization networking dbus xorg avahi spice) @@ -162,10 +161,6 @@ ;; udev (udev-rules-service 'pipewire-add-udev-rules pipewire) - ;; dom0 home - (service guix-home-service-type - `(("dom0" ,dom0-home-environment)))))) - ;; Packages (system-wide) (packages (cons* vim git diff --git a/dom0/system.scm b/dom0/system.scm index 72039a1..05437b4 100644 --- a/dom0/system.scm +++ b/dom0/system.scm @@ -6,8 +6,7 @@ #:use-module (nongnu packages linux) #:use-module (nongnu system linux-initrd) #:use-module (nongnu packages nvidia) - #:use-module (nongnu services nvidia) - #:use-module (dom0 home)) + #:use-module (nongnu services nvidia)) (use-service-modules linux guix desktop pm audio virtualization networking dbus xorg avahi spice) @@ -161,16 +160,11 @@ (service virtlog-service-type) ;; udev - (udev-rules-service 'pipewire-add-udev-rules pipewire) - - ;; dom0 home - (service guix-home-service-type - `(("dom0" ,dom0-home-environment)))))) + (udev-rules-service 'pipewire-add-udev-rules pipewire)))) ;; Packages (system-wide) (packages (cons* vim git - (replace-mesa virt-manager) cryptsetup strace %base-packages))) |