summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dom0/files/misc-config/sway-config4
-rw-r--r--dom0/files/scripts/sway-login2
-rw-r--r--dom0/files/scripts/sway-login-laptop3
-rw-r--r--dom0/home-laptop.scm89
-rw-r--r--dom0/home.scm33
-rw-r--r--dom0/system.scm14
-rw-r--r--vmstore/corpo/home.scm20
7 files changed, 128 insertions, 37 deletions
diff --git a/dom0/files/misc-config/sway-config b/dom0/files/misc-config/sway-config
index fd4e37f..60e6eed 100644
--- a/dom0/files/misc-config/sway-config
+++ b/dom0/files/misc-config/sway-config
@@ -28,7 +28,7 @@ output * bg $HOME/.config/guix-config/dom0/files/wallpapers/taclnc.png fill
# output HDMI-A-1 resolution 1920x1080 position 1920,0
output * resolution 1920x1080
exec dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY
-exec spice-vdagent
+# exec spice-vdagent
# You can get the names of your outputs by running: swaymsg -t get_outputs
### Idle configuration
@@ -222,7 +222,7 @@ bar {
# When the status_command prints a new line to stdout, swaybar updates.
# The default just shows the current date and time.
- status_command while (echo "!! WARNING !! THIS IS Dom0 !! $(date +'%Y-%m-%d %X'); do sleep 1; done
+ status_command while (echo "! ! WARNING ! ! THIS IS Dom0 ! ! $(date +'%Y-%m-%d %X')"); do sleep 1; done
colors {
statusline #ffffff
diff --git a/dom0/files/scripts/sway-login b/dom0/files/scripts/sway-login
index 3792a85..2711786 100644
--- a/dom0/files/scripts/sway-login
+++ b/dom0/files/scripts/sway-login
@@ -1,3 +1,3 @@
if [ -z "$WAYLAND_DISPLAY" ] && [ "$XDG_VTNR" -eq 1 ]; then
- exec sway;
+ exec sway --unsupported-gpu;
fi
diff --git a/dom0/files/scripts/sway-login-laptop b/dom0/files/scripts/sway-login-laptop
new file mode 100644
index 0000000..3792a85
--- /dev/null
+++ b/dom0/files/scripts/sway-login-laptop
@@ -0,0 +1,3 @@
+if [ -z "$WAYLAND_DISPLAY" ] && [ "$XDG_VTNR" -eq 1 ]; then
+ exec sway;
+fi
diff --git a/dom0/home-laptop.scm b/dom0/home-laptop.scm
new file mode 100644
index 0000000..f1146b7
--- /dev/null
+++ b/dom0/home-laptop.scm
@@ -0,0 +1,89 @@
+(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 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)))))
diff --git a/dom0/system.scm b/dom0/system.scm
index 6cd02c5..72039a1 100644
--- a/dom0/system.scm
+++ b/dom0/system.scm
@@ -42,11 +42,11 @@
;; replace post-install
(swap-devices (list (swap-space
(target (uuid
- "7a22a333-6a5d-41fe-93a2-e5781031cfd6")))))
+ "c7e7ee28-23ba-4ec1-b206-19a4e6297083")))))
;; luks setup - uncomment post-install
;; and provide source UUID once known
(mapped-devices (list (mapped-device
- (source (uuid "0c5d284e-e0c7-4dc3-bbca-f82ee6bb82e3"))
+ (source (uuid "61e732e5-97ca-41d8-a1cf-3672eb97e6f8"))
(target "system-root")
(type luks-device-mapping))))
@@ -56,7 +56,7 @@
;; Will change after install
(file-systems (cons* (file-system
(mount-point "/boot/efi")
- (device (uuid "6919-B0C9"
+ (device (uuid "3BC7-90B1"
'fat32))
(type "vfat"))
(file-system
@@ -94,8 +94,7 @@
(list
;; NVIDIA
(service nvidia-service-type)
- ;(service kernel-module-loader-service-type
- ;'("nvidia"))
+
;; systemd dependencies
(service elogind-service-type)
@@ -157,7 +156,8 @@
;; Virtualization
(service libvirt-service-type
(libvirt-configuration
- (libvirt (patch-libvirt libvirt))))
+ (libvirt (patch-libvirt libvirt))
+ (qemu (replace-mesa qemu))))
(service virtlog-service-type)
;; udev
@@ -170,7 +170,7 @@
;; Packages (system-wide)
(packages (cons* vim
git
- virt-manager
+ (replace-mesa virt-manager)
cryptsetup
strace
%base-packages)))
diff --git a/vmstore/corpo/home.scm b/vmstore/corpo/home.scm
index eaf1a7c..a627839 100644
--- a/vmstore/corpo/home.scm
+++ b/vmstore/corpo/home.scm
@@ -39,25 +39,25 @@
("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")
+ ("_JAVA_AWT_WM_NONREPARENTING" . #t)
;; env-vars for Flatpak visibility
- ("XDG_DATA_DIRS". "$XDG_DATA_DIRS:$HOME/.local/share/flatpak/exports/share" #t)
+ ("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")
- ("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")))))
(simple-service 'xdg-user-directories-config-service
home-xdg-user-directories-service-type
(home-xdg-user-directories-configuration
- (download "$HOME/Downloads"))))
+ (download "$HOME/Downloads")))
(service home-xdg-configuration-files-service-type
`(("sway/config" ,(local-file "./files/misc-config/sway-config"))))
@@ -67,14 +67,12 @@
(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
+ grimshot wl-clipboard network-manager-applet
- ;; Flatpak
- flatpak (list glib "bin") ; flatpak dependency
+ ;; XDG and Flatpak dependency
+ flatpak (list glib "bin")
xdg-desktop-portal xdg-desktop-portal-gtk xdg-desktop-portal-wlr
- xdg-utils xdg-bus-proxy shared-mime-info
+ xdg-utils xdg-dbus-proxy shared-mime-info
;; Audio
alsa-utils pavucontrol
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-06 04:24:41 +0000