diff options
Diffstat (limited to 'vmstore')
| -rw-r--r-- | vmstore/corpo/corpo-system.scm | 68 | ||||
| -rw-r--r-- | vmstore/corpo/files/nonguix-signing-key.pub | 6 | ||||
| -rw-r--r-- | vmstore/corpo/home.scm | 32 |
3 files changed, 47 insertions, 59 deletions
diff --git a/vmstore/corpo/corpo-system.scm b/vmstore/corpo/corpo-system.scm index 8f84c0e..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,44 +26,23 @@ (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 - (bootloader grub-efi-bootloader) - (targets (list "/boot/efi")) - (keyboard-layout keyboard-layout))) - - ;; replace post-install - (swap-devices (list (swap-space - (target (uuid - "7a22a333-6a5d-41fe-93a2-e5781031cfd6"))))) - ;; luks setup - uncomment post-install - ;; and provide source UUID once known - (mapped-devices (list (mapped-device - (source (uuid "0c5d284e-e0c7-4dc3-bbca-f82ee6bb82e3")) - (target "system-root") - (type luks-device-mapping)))) - - - ;; List of file systems to mount - ;; Run 'blkid' for UUIDs. - ;; Will change after install - (file-systems (cons* (file-system - (mount-point "/boot/efi") - (device (uuid "6919-B0C9" - 'fat32)) - (type "vfat")) - (file-system - (device (file-system-label "system-root")) - (mount-point "/") - (type "ext4") - (dependencies mapped-devices)) - %base-file-systems)) + (bootloader grub-bootloader) + (targets '("/dev/vda")) + (terminal-outputs '(console)))) + + (file-systems (cons (file-system + (mount-point "/") + (device "/dev/vda1") + (type "ext4")) + %base-file-systems)) ;; Non-free (kernel linux) - (kernel-arguments '("modprobe.blacklist=noveau" + (kernel-arguments '("modprobe.blacklist=nouveau" ;"nvidia_drm.modeset=1" "quiet")) (firmware (list linux-firmware)) @@ -89,8 +68,7 @@ (list ;; NVIDIA ;(service nvidia-service-type) - ;(service kernel-module-loader-service-type - ;'("nvidia")) + ;; systemd dependencies (service elogind-service-type) @@ -124,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) @@ -145,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 @@ -158,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/files/nonguix-signing-key.pub b/vmstore/corpo/files/nonguix-signing-key.pub new file mode 100644 index 0000000..56ee811 --- /dev/null +++ b/vmstore/corpo/files/nonguix-signing-key.pub @@ -0,0 +1,6 @@ +(public-key + (ecc + (curve Ed25519) + (q #C1FD53E5D4CE971933EC50C9F307AE2171A2D3B52C804642A7A35F84F3A4EA98#) + ) + ) diff --git a/vmstore/corpo/home.scm b/vmstore/corpo/home.scm index 5211c57..a627839 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 @@ -39,12 +39,26 @@ ("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") + (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"))) + (service home-xdg-configuration-files-service-type `(("sway/config" ,(local-file "./files/misc-config/sway-config")))) @@ -54,11 +68,11 @@ (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 - 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-dbus-proxy shared-mime-info ;; Audio alsa-utils pavucontrol |