Tidy .scms, more XDG env vars, virtman to syswide

2 files changed, 30 insertions, 25 deletions

diff --git a/vmstore/corpo/corpo-system.scm b/vmstore/corpo/corpo-system.scm
index 3544847..930990f 100644
--- a/vmstore/corpo/corpo-system.scm
+++ b/vmstore/corpo/corpo-system.scm
@@ -11,7 +11,7 @@
 (use-service-modules linux guix desktop pm audio 
 		     networking dbus xorg avahi spice)
 (use-package-modules linux audio libusb wm fonts
-		     freedesktop vim cryptsetup)
+		     freedesktop vim security-token cryptsetup)
 
 (operating-system
   (locale "en_GB.utf8")
@@ -26,7 +26,7 @@
 		  (password (crypt "worker" "$6$abc"))
                   (group "users")
                   (home-directory "/home/corpo")
-                  (supplementary-groups '("wheel" "netdev" "audio" "video")))
+                  (supplementary-groups '("wheel" "plugdev" "netdev" "audio" "video")))
                 %base-user-accounts))
 
   (bootloader (bootloader-configuration
@@ -42,7 +42,7 @@
 
   ;; Non-free
   (kernel linux)
-  (kernel-arguments '("modprobe.blacklist=noveau"
+  (kernel-arguments '("modprobe.blacklist=nouveau"
 		      ;"nvidia_drm.modeset=1"
 		      "quiet"))
   (firmware (list linux-firmware))
@@ -68,8 +68,7 @@
 	      (list 
 	      ;; NVIDIA
 	      ;(service nvidia-service-type)
-              ;(service kernel-module-loader-service-type 
-		       ;'("nvidia"))
+	      
 	      ;; systemd dependencies
 	      (service elogind-service-type)
 
@@ -103,19 +102,9 @@
 			 (using-setuid? #t)))
 
 	      ;; Networking
-	      ;(service network-manager-service-type)
+	      (service network-manager-service-type)
 	      (service wpa-supplicant-service-type)
-	      (service static-networking-service-type
-	      	       (list (static-networking
-	      		       (addresses
-	      			 (list (network-address
-	      				 (device "eth0")
-	      				 (value "10.0.2.15/24"))))
-	      		       (routes
-	      			 (list (network-route
-	      				  (destination "default")
-	      				  (gateway "10.0.2.2"))))
-	      		       (name-servers '("208.67.222.222")))))
+	      
 	      ;; dbus
 	      (service avahi-service-type)
 	      (service udisks-service-type)
@@ -124,7 +113,7 @@
 	      (service polkit-service-type)
 	      (service dbus-root-service-type)
 
-	      ;; Cleanup stayle font cache
+	      ;; Cleanup stale font cache
               fontconfig-file-system-service
 
 	      ;; Power and thermals
@@ -137,9 +126,9 @@
 	      ;; Time
 	      (service ntp-service-type)
 
-	      ;; udev
+	      ;; udev including yubikey
 	      (udev-rules-service 'pipewire-add-udev-rules pipewire)
-	      
+	      (udev-rules-service 'fido2 libfido2 #:groups '("plugdev"))
 	      ;; corpo home
 	      (service guix-home-service-type
 		       `(("worker" ,corpo-home-environment))))))
diff --git a/vmstore/corpo/home.scm b/vmstore/corpo/home.scm
index 5211c57..eaf1a7c 100644
--- a/vmstore/corpo/home.scm
+++ b/vmstore/corpo/home.scm
@@ -13,9 +13,9 @@
  #:use-module (guix gexp)
  #:export (corpo-home-environment))
  
- (use-package-modules compression gnome fonts freedesktop
+ (use-package-modules compression gnome gnome-xyz video fonts freedesktop
 		      linux package-management pulseaudio
-		      terminals xdisorg xorg glib wm)
+		      terminals xdisorg xorg glib wm messaging)
  
  (define corpo-home-environment
   (home-environment
@@ -40,11 +40,25 @@
 		  ("ELM_ENGINE" . "wayland_egl")
 		  ("ECORE_EVAS_ENGINE" . "wayland-egl")
 		  ("QT_QPA_PLATFORM" . "wayland-egl")))
+		  
+	  	  ;; JAVA 
+	  	  ("_JAVA_AWT_WM_NONREPARENTING")
+		  
+	  	  ;; env-vars for Flatpak visibility
+		  ("XDG_DATA_DIRS". "$XDG_DATA_DIRS:$HOME/.local/share/flatpak/exports/share" #t)
+
 
 	  (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")))))
+	  
+	  
+	  (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"))))
 
@@ -53,12 +67,14 @@
 
       (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 dependency
+		      xdg-desktop-portal xdg-desktop-portal-gtk xdg-desktop-portal-wlr
+		      xdg-utils xdg-bus-proxy shared-mime-info
 
 		      ;; Audio
 		      alsa-utils pavucontrol