From 32c943e19323b7be2a15aa18d575e03074a7e6c4 Mon Sep 17 00:00:00 2001 From: "c0co.channel" Date: Wed, 10 Sep 2025 01:32:17 +0100 Subject: Tidy .scms, more XDG env vars, virtman to syswide --- dom0/home.scm | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) (limited to 'dom0/home.scm') diff --git a/dom0/home.scm b/dom0/home.scm index ee1028d..16bec95 100644 --- a/dom0/home.scm +++ b/dom0/home.scm @@ -13,10 +13,10 @@ #:use-module (guix gexp) #:export (dom0-home-environment)) - (use-package-modules compression gnome fonts freedesktop + (use-package-modules compression gnome gnome-xyz video fonts freedesktop linux package-management pulseaudio ssh terminals xdisorg xorg glib virtualization - wm) + wm messaging) (define dom0-home-environment (home-environment @@ -40,12 +40,24 @@ ("CLUTTER_BACKEND" . "wayland") ("ELM_ENGINE" . "wayland_egl") ("ECORE_EVAS_ENGINE" . "wayland-egl") - ("QT_QPA_PLATFORM" . "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"))) + (bash-profile (list (local-file "files/scripts/sway-login") + ("flatpak -u remote-add --if-not-exists flathub https://flathub.org/repo/flathub.pakrepo")) (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")))) @@ -55,20 +67,23 @@ (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 + grimshot wl-clipboard wl-paste network-manager-applet xdg-desktop-portal xdg-desktop-portal-gtk xdg-desktop-portal-wlr xdg-utils xdg-dbus-proxy shared-mime-info - ;; Flatpak - flatpak (list glib "bin") + ;; 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 - virt-manager openssh zip unzip)))) + openssh zip unzip)))) -- cgit v1.2.3 From cd080424127bb8e91ba4df7f36aa7b541d35752b Mon Sep 17 00:00:00 2001 From: "c0co.channel" Date: Wed, 10 Sep 2025 17:50:26 +0100 Subject: Rework for dekstop and nvidia display src --- dom0/home.scm | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) (limited to 'dom0/home.scm') diff --git a/dom0/home.scm b/dom0/home.scm index 16bec95..0b76b53 100644 --- a/dom0/home.scm +++ b/dom0/home.scm @@ -10,6 +10,7 @@ #:use-module (gnu home services desktop) #:use-module (gnu home services gnupg) #:use-module (gnu home services xdg) + #:use-module (nongnu packages nvidia) #:use-module (guix gexp) #:export (dom0-home-environment)) @@ -51,7 +52,7 @@ (service home-bash-service-type (home-bash-configuration (bash-profile (list (local-file "files/scripts/sway-login") - ("flatpak -u remote-add --if-not-exists flathub https://flathub.org/repo/flathub.pakrepo")) + (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 @@ -71,19 +72,19 @@ (service home-dbus-service-type) (service home-pipewire-service-type))) - (packages (list xorg-server-xwayland - sway swayidle swaylock fuzzel foot - grimshot wl-clipboard wl-paste 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 + (packages (append (map replace-mesa (list flatpak sway)) + (list xorg-server-xwayland + swayidle swaylock fuzzel foot + grimshot wl-clipboard network-manager-applet - ;; Audio - alsa-utils pavucontrol - - ;; General - openssh zip unzip)))) + ;; XDG and Flatpak dependency + (list glib "bin") + 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))))) -- cgit v1.2.3