From ea757059a8389361cb9ce7eaa1306e1dd34adf15 Mon Sep 17 00:00:00 2001 From: "c0co.channel" Date: Wed, 17 Sep 2025 23:40:25 +0100 Subject: Stablize system and home, remove laptop-home Include gstreamer for audio in VMs and rename corpo to "disposable" --- dom0/home-laptop.scm | 89 --------- dom0/home.scm | 19 +- dom0/system-laptop.scm | 7 +- dom0/system.scm | 10 +- vmstore/corpo/corpo-system.scm | 140 ------------- vmstore/corpo/files/misc-config/sway-config | 239 ----------------------- vmstore/corpo/files/nonguix-signing-key.pub | 6 - vmstore/corpo/files/scripts/sway-login | 3 - vmstore/corpo/home.scm | 81 -------- vmstore/disposable/disposable-system.scm | 141 +++++++++++++ vmstore/disposable/files/misc-config/sway-config | 239 +++++++++++++++++++++++ vmstore/disposable/files/nonguix-signing-key.pub | 6 + vmstore/disposable/files/scripts/sway-login | 3 + vmstore/disposable/home.scm | 81 ++++++++ 14 files changed, 487 insertions(+), 577 deletions(-) delete mode 100644 dom0/home-laptop.scm delete mode 100644 vmstore/corpo/corpo-system.scm delete mode 100644 vmstore/corpo/files/misc-config/sway-config delete mode 100644 vmstore/corpo/files/nonguix-signing-key.pub delete mode 100644 vmstore/corpo/files/scripts/sway-login delete mode 100644 vmstore/corpo/home.scm create mode 100644 vmstore/disposable/disposable-system.scm create mode 100644 vmstore/disposable/files/misc-config/sway-config create mode 100644 vmstore/disposable/files/nonguix-signing-key.pub create mode 100644 vmstore/disposable/files/scripts/sway-login create mode 100644 vmstore/disposable/home.scm 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))) diff --git a/vmstore/corpo/corpo-system.scm b/vmstore/corpo/corpo-system.scm deleted file mode 100644 index 930990f..0000000 --- a/vmstore/corpo/corpo-system.scm +++ /dev/null @@ -1,140 +0,0 @@ -;; Modules to import to access variables used. -(define-module (corpo system) - #:use-module (gnu) - #:use-module (gnu services guix) - #:use-module (nongnu packages linux) - #:use-module (nongnu system linux-initrd) - #:use-module (nongnu packages nvidia) - #:use-module (nongnu services nvidia) - #:use-module (corpo home)) - -(use-service-modules linux guix desktop pm audio - networking dbus xorg avahi spice) -(use-package-modules linux audio libusb wm fonts - freedesktop vim security-token cryptsetup) - -(operating-system - (locale "en_GB.utf8") - (timezone "Europe/London") - (keyboard-layout (keyboard-layout "gb")) - (host-name "corpo") - - ;; Users ('root' is implicit). - (users (cons* (user-account - (name "worker") - (comment "worker") - (password (crypt "worker" "$6$abc")) - (group "users") - (home-directory "/home/corpo") - (supplementary-groups '("wheel" "plugdev" "netdev" "audio" "video"))) - %base-user-accounts)) - - (bootloader (bootloader-configuration - (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=nouveau" - ;"nvidia_drm.modeset=1" - "quiet")) - (firmware (list linux-firmware)) - (initrd microcode-initrd) - - ;; Services (system-wide) - (services (append - (modify-services %base-services - (delete login-service-type) - (delete mingetty-service-type) - (delete console-font-service-type) - ;; Add non-free substitutes - (guix-service-type - config => - (guix-configuration - (inherit config) - (substitute-urls - (append (list "https://substitutes.nonguix.org") - %default-substitute-urls)) - (authorized-keys - (append (list (local-file "files/nonguix-signing-key.pub")) - %default-authorized-guix-keys))))) - (list - ;; NVIDIA - ;(service nvidia-service-type) - - ;; systemd dependencies - (service elogind-service-type) - - ;; spice for VMs - (service spice-vdagent-service-type) - - ;; PAM and login - (service greetd-service-type - (greetd-configuration - (greeter-supplementary-groups (list "video" "input")) - (terminals - (list - (greetd-terminal-configuration - (terminal-vt "1") - (terminal-switch #t)) - (greetd-terminal-configuration (terminal-vt "2")) - (greetd-terminal-configuration (terminal-vt "3")))))) - - (service console-font-service-type - (map (lambda (tty) - (cons tty (file-append - font-terminus - "/share/consolefonts/ter-132n"))) - '("tty1" "tty2" "tty3"))) - - (service screen-locker-service-type - (screen-locker-configuration - (name "swaylock") - (program (file-append swaylock "/bin/swaylock")) - (using-pam? #t) - (using-setuid? #t))) - - ;; Networking - (service network-manager-service-type) - (service wpa-supplicant-service-type) - - ;; dbus - (service avahi-service-type) - (service udisks-service-type) - (service accountsservice-service-type) - (service colord-service-type) - (service polkit-service-type) - (service dbus-root-service-type) - - ;; Cleanup stale font cache - fontconfig-file-system-service - - ;; Power and thermals - (service thermald-service-type) - (service power-profiles-daemon-service-type) - - ;; Xwayland - (service x11-socket-directory-service-type) - - ;; Time - (service ntp-service-type) - - ;; 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)))))) - - ;; Packages (system-wide) - (packages (cons* vim - cryptsetup - strace - %base-packages))) diff --git a/vmstore/corpo/files/misc-config/sway-config b/vmstore/corpo/files/misc-config/sway-config deleted file mode 100644 index ac6ce90..0000000 --- a/vmstore/corpo/files/misc-config/sway-config +++ /dev/null @@ -1,239 +0,0 @@ -# Default config for sway -# -# Copy this to ~/.config/sway/config and edit it to your liking. -# -# Read `man 5 sway` for a complete reference. - -### Variables -# -# Logo key. Use Mod1 for Alt. -set $mod Mod4 -# Home row direction keys, like vim -set $left h -set $down j -set $up k -set $right l -# Your preferred terminal emulator -set $term foot -# Your preferred application launcher -set $menu fuzzel - -### Output configuration -# -# Default wallpaper (more resolutions are available in /gnu/store/49nyzc50jn2svwb9i7k5739cvgaiac72-sway-1.10.1/share/backgrounds/sway/) -#output * bg #000000 solid fill -# -# Example configuration: -# -# output HDMI-A-1 resolution 1920x1080 position 1920,0 -output * resolution 1920x1080 -exec dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY -exec spice-vdagent -# You can get the names of your outputs by running: swaymsg -t get_outputs - -### Idle configuration -# -# Example configuration: -# -# exec swayidle -w \ -# timeout 300 'swaylock -f -c 000000' \ -# timeout 600 'swaymsg "output * power off"' resume 'swaymsg "output * power on"' \ -# before-sleep 'swaylock -f -c 000000' -# -# This will lock your screen after 300 seconds of inactivity, then turn off -# your displays after another 300 seconds, and turn your screens back on when -# resumed. It will also lock your screen before your computer goes to sleep. - -### Input configuration - input * { - xkb_layout "gb" - } - - input left_handed enabled -# Example configuration: -# -# input "2:14:SynPS/2_Synaptics_TouchPad" { -# dwt enabled -# tap enabled -# natural_scroll enabled -# middle_emulation enabled -# } -# -# You can get the names of your inputs by running: swaymsg -t get_inputs -# Read `man 5 sway-input` for more information about this section. - -### Key bindings -# -# Basics: -# - # Start a terminal - bindsym $mod+Return exec $term - - # Kill focused window - bindsym $mod+Shift+q kill - - # Start your launcher - bindsym $mod+d exec $menu - - # Drag floating windows by holding down $mod and left mouse button. - # Resize them with right mouse button + $mod. - # Despite the name, also works for non-floating windows. - # Change normal to inverse to use left mouse button for resizing and right - # mouse button for dragging. - floating_modifier $mod normal - - # Reload the configuration file - bindsym $mod+Shift+c reload - - # Exit sway (logs you out of your Wayland session) - bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -B 'Yes, exit sway' 'swaymsg exit' -# -# Moving around: -# - # Move your focus around - bindsym $mod+$left focus left - bindsym $mod+$down focus down - bindsym $mod+$up focus up - bindsym $mod+$right focus right - # Or use $mod+[up|down|left|right] - bindsym $mod+Left focus left - bindsym $mod+Down focus down - bindsym $mod+Up focus up - bindsym $mod+Right focus right - - # Move the focused window with the same, but add Shift - bindsym $mod+Shift+$left move left - bindsym $mod+Shift+$down move down - bindsym $mod+Shift+$up move up - bindsym $mod+Shift+$right move right - # Ditto, with arrow keys - bindsym $mod+Shift+Left move left - bindsym $mod+Shift+Down move down - bindsym $mod+Shift+Up move up - bindsym $mod+Shift+Right move right -# -# Workspaces: -# - # Switch to workspace - bindsym $mod+1 workspace number 1 - bindsym $mod+2 workspace number 2 - bindsym $mod+3 workspace number 3 - bindsym $mod+4 workspace number 4 - bindsym $mod+5 workspace number 5 - bindsym $mod+6 workspace number 6 - bindsym $mod+7 workspace number 7 - bindsym $mod+8 workspace number 8 - bindsym $mod+9 workspace number 9 - bindsym $mod+0 workspace number 10 - # Move focused container to workspace - bindsym $mod+Shift+1 move container to workspace number 1 - bindsym $mod+Shift+2 move container to workspace number 2 - bindsym $mod+Shift+3 move container to workspace number 3 - bindsym $mod+Shift+4 move container to workspace number 4 - bindsym $mod+Shift+5 move container to workspace number 5 - bindsym $mod+Shift+6 move container to workspace number 6 - bindsym $mod+Shift+7 move container to workspace number 7 - bindsym $mod+Shift+8 move container to workspace number 8 - bindsym $mod+Shift+9 move container to workspace number 9 - bindsym $mod+Shift+0 move container to workspace number 10 - # Note: workspaces can have any name you want, not just numbers. - # We just use 1-10 as the default. -# -# Layout stuff: -# - # You can "split" the current object of your focus with - # $mod+b or $mod+v, for horizontal and vertical splits - # respectively. - bindsym $mod+b splith - bindsym $mod+v splitv - - # Switch the current container between different layout styles - bindsym $mod+s layout stacking - bindsym $mod+w layout tabbed - bindsym $mod+e layout toggle split - - # Make the current focus fullscreen - bindsym $mod+f fullscreen - - # Toggle the current focus between tiling and floating mode - bindsym $mod+Shift+space floating toggle - - # Swap focus between the tiling area and the floating area - bindsym $mod+space focus mode_toggle - - # Move focus to the parent container - bindsym $mod+a focus parent -# -# Scratchpad: -# - # Sway has a "scratchpad", which is a bag of holding for windows. - # You can send windows there and get them back later. - - # Move the currently focused window to the scratchpad - bindsym $mod+Shift+minus move scratchpad - - # Show the next scratchpad window or hide the focused scratchpad window. - # If there are multiple scratchpad windows, this command cycles through them. - bindsym $mod+minus scratchpad show -# -# Resizing containers: -# -mode "resize" { - # left will shrink the containers width - # right will grow the containers width - # up will shrink the containers height - # down will grow the containers height - bindsym $left resize shrink width 10px - bindsym $down resize grow height 10px - bindsym $up resize shrink height 10px - bindsym $right resize grow width 10px - - # Ditto, with arrow keys - bindsym Left resize shrink width 10px - bindsym Down resize grow height 10px - bindsym Up resize shrink height 10px - bindsym Right resize grow width 10px - - # Return to default mode - bindsym Return mode "default" - bindsym Escape mode "default" -} -bindsym $mod+r mode "resize" -# -# Utilities: -# - # Special keys to adjust volume via PulseAudio - bindsym --locked XF86AudioMute exec pactl set-sink-mute \@DEFAULT_SINK@ toggle - bindsym --locked XF86AudioLowerVolume exec pactl set-sink-volume \@DEFAULT_SINK@ -5% - bindsym --locked XF86AudioRaiseVolume exec pactl set-sink-volume \@DEFAULT_SINK@ +5% - bindsym --locked XF86AudioMicMute exec pactl set-source-mute \@DEFAULT_SOURCE@ toggle - # Special keys to adjust brightness via brightnessctl - bindsym --locked XF86MonBrightnessDown exec brightnessctl set 5%- - bindsym --locked XF86MonBrightnessUp exec brightnessctl set 5%+ - # Special key to take a screenshot with grim - bindsym Print exec grim - -# -# Status Bar: -# -# Read `man 5 sway-bar` for more information about this section. -bar { - position top - # When the status_command prints a new line to stdout, swaybar updates. - # The default just shows the current date and time. - #status_command while date +'%Y-%m-%d %X' $HOSTNAME; do sleep 1; done - status_command while (echo $USER@$HOSTNAME $(date +'%Y-%m-%d %X')); do sleep 1; done - colors { - statusline #000000 - background #ffffff - inactive_workspace #32323200 #32323200 #5c5c5c - } -} -set $opacity 0.96 -for_window [class=".*"] opacity $opacity -for_window [app_id="foot"] opacity $opacity con_mark $HOSTNAME - -client.focused #000000 #ffffff #ffffff -client.unfocused #000000 #ffffff #ffffff - -include /gnu/store/49nyzc50jn2svwb9i7k5739cvgaiac72-sway-1.10.1/etc/sway/config.d/* diff --git a/vmstore/corpo/files/nonguix-signing-key.pub b/vmstore/corpo/files/nonguix-signing-key.pub deleted file mode 100644 index 56ee811..0000000 --- a/vmstore/corpo/files/nonguix-signing-key.pub +++ /dev/null @@ -1,6 +0,0 @@ -(public-key - (ecc - (curve Ed25519) - (q #C1FD53E5D4CE971933EC50C9F307AE2171A2D3B52C804642A7A35F84F3A4EA98#) - ) - ) diff --git a/vmstore/corpo/files/scripts/sway-login b/vmstore/corpo/files/scripts/sway-login deleted file mode 100644 index 3792a85..0000000 --- a/vmstore/corpo/files/scripts/sway-login +++ /dev/null @@ -1,3 +0,0 @@ -if [ -z "$WAYLAND_DISPLAY" ] && [ "$XDG_VTNR" -eq 1 ]; then - exec sway; -fi diff --git a/vmstore/corpo/home.scm b/vmstore/corpo/home.scm deleted file mode 100644 index a627839..0000000 --- a/vmstore/corpo/home.scm +++ /dev/null @@ -1,81 +0,0 @@ -(define-module (corpo 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 (corpo-home-environment)) - - (use-package-modules compression gnome gnome-xyz video fonts freedesktop - linux package-management pulseaudio - terminals xdisorg xorg glib wm messaging) - - (define corpo-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"))))) - - - (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-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 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 - - ;; General - zip unzip)))) diff --git a/vmstore/disposable/disposable-system.scm b/vmstore/disposable/disposable-system.scm new file mode 100644 index 0000000..fe582fa --- /dev/null +++ b/vmstore/disposable/disposable-system.scm @@ -0,0 +1,141 @@ +;; Modules to import to access variables used. +(define-module (corpo system) + #:use-module (gnu) + #:use-module (gnu services guix) + #:use-module (nongnu packages linux) + #:use-module (nongnu system linux-initrd) + #:use-module (nongnu packages nvidia) + #:use-module (nongnu services nvidia) + #:use-module (corpo home)) + +(use-service-modules linux guix desktop pm audio virtualization + networking dbus xorg avahi spice) +(use-package-modules linux audio libusb wm fonts + freedesktop vim security-token cryptsetup) + +(operating-system + (locale "en_GB.utf8") + (timezone "Europe/London") + (keyboard-layout (keyboard-layout "gb")) + (host-name "corpo") + + ;; Users ('root' is implicit). + (users (cons* (user-account + (name "worker") + (comment "worker") + (password (crypt "worker" "$6$abc")) + (group "users") + (home-directory "/home/corpo") + (supplementary-groups '("wheel" "plugdev" "netdev" "audio" "video"))) + %base-user-accounts)) + + (bootloader (bootloader-configuration + (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=nouveau" + ;"nvidia_drm.modeset=1" + "quiet")) + (firmware (list linux-firmware)) + (initrd microcode-initrd) + + ;; Services (system-wide) + (services (append + (modify-services %base-services + (delete login-service-type) + (delete mingetty-service-type) + (delete console-font-service-type) + ;; Add non-free substitutes + (guix-service-type + config => + (guix-configuration + (inherit config) + (substitute-urls + (append (list "https://substitutes.nonguix.org") + %default-substitute-urls)) + (authorized-keys + (append (list (local-file "files/nonguix-signing-key.pub")) + %default-authorized-guix-keys))))) + (list + ;; NVIDIA + ;(service nvidia-service-type) + + ;; systemd dependencies + (service elogind-service-type) + + ;; Spice and Qemu for VMs + (service spice-vdagent-service-type) + (service qemu-guest-agent-service-type) + + ;; PAM and login + (service greetd-service-type + (greetd-configuration + (greeter-supplementary-groups (list "video" "input")) + (terminals + (list + (greetd-terminal-configuration + (terminal-vt "1") + (terminal-switch #t)) + (greetd-terminal-configuration (terminal-vt "2")) + (greetd-terminal-configuration (terminal-vt "3")))))) + + (service console-font-service-type + (map (lambda (tty) + (cons tty (file-append + font-terminus + "/share/consolefonts/ter-132n"))) + '("tty1" "tty2" "tty3"))) + + (service screen-locker-service-type + (screen-locker-configuration + (name "swaylock") + (program (file-append swaylock "/bin/swaylock")) + (using-pam? #t) + (using-setuid? #t))) + + ;; Networking + (service network-manager-service-type) + (service wpa-supplicant-service-type) + + ;; dbus + (service avahi-service-type) + (service udisks-service-type) + (service accountsservice-service-type) + (service colord-service-type) + (service polkit-service-type) + (service dbus-root-service-type) + + ;; Cleanup stale font cache + fontconfig-file-system-service + + ;; Power and thermals + (service thermald-service-type) + (service power-profiles-daemon-service-type) + + ;; Xwayland + (service x11-socket-directory-service-type) + + ;; Time + (service ntp-service-type) + + ;; 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)))))) + + ;; Packages (system-wide) + (packages (cons* vim + cryptsetup + strace + %base-packages))) diff --git a/vmstore/disposable/files/misc-config/sway-config b/vmstore/disposable/files/misc-config/sway-config new file mode 100644 index 0000000..ac6ce90 --- /dev/null +++ b/vmstore/disposable/files/misc-config/sway-config @@ -0,0 +1,239 @@ +# Default config for sway +# +# Copy this to ~/.config/sway/config and edit it to your liking. +# +# Read `man 5 sway` for a complete reference. + +### Variables +# +# Logo key. Use Mod1 for Alt. +set $mod Mod4 +# Home row direction keys, like vim +set $left h +set $down j +set $up k +set $right l +# Your preferred terminal emulator +set $term foot +# Your preferred application launcher +set $menu fuzzel + +### Output configuration +# +# Default wallpaper (more resolutions are available in /gnu/store/49nyzc50jn2svwb9i7k5739cvgaiac72-sway-1.10.1/share/backgrounds/sway/) +#output * bg #000000 solid fill +# +# Example configuration: +# +# output HDMI-A-1 resolution 1920x1080 position 1920,0 +output * resolution 1920x1080 +exec dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY +exec spice-vdagent +# You can get the names of your outputs by running: swaymsg -t get_outputs + +### Idle configuration +# +# Example configuration: +# +# exec swayidle -w \ +# timeout 300 'swaylock -f -c 000000' \ +# timeout 600 'swaymsg "output * power off"' resume 'swaymsg "output * power on"' \ +# before-sleep 'swaylock -f -c 000000' +# +# This will lock your screen after 300 seconds of inactivity, then turn off +# your displays after another 300 seconds, and turn your screens back on when +# resumed. It will also lock your screen before your computer goes to sleep. + +### Input configuration + input * { + xkb_layout "gb" + } + + input left_handed enabled +# Example configuration: +# +# input "2:14:SynPS/2_Synaptics_TouchPad" { +# dwt enabled +# tap enabled +# natural_scroll enabled +# middle_emulation enabled +# } +# +# You can get the names of your inputs by running: swaymsg -t get_inputs +# Read `man 5 sway-input` for more information about this section. + +### Key bindings +# +# Basics: +# + # Start a terminal + bindsym $mod+Return exec $term + + # Kill focused window + bindsym $mod+Shift+q kill + + # Start your launcher + bindsym $mod+d exec $menu + + # Drag floating windows by holding down $mod and left mouse button. + # Resize them with right mouse button + $mod. + # Despite the name, also works for non-floating windows. + # Change normal to inverse to use left mouse button for resizing and right + # mouse button for dragging. + floating_modifier $mod normal + + # Reload the configuration file + bindsym $mod+Shift+c reload + + # Exit sway (logs you out of your Wayland session) + bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -B 'Yes, exit sway' 'swaymsg exit' +# +# Moving around: +# + # Move your focus around + bindsym $mod+$left focus left + bindsym $mod+$down focus down + bindsym $mod+$up focus up + bindsym $mod+$right focus right + # Or use $mod+[up|down|left|right] + bindsym $mod+Left focus left + bindsym $mod+Down focus down + bindsym $mod+Up focus up + bindsym $mod+Right focus right + + # Move the focused window with the same, but add Shift + bindsym $mod+Shift+$left move left + bindsym $mod+Shift+$down move down + bindsym $mod+Shift+$up move up + bindsym $mod+Shift+$right move right + # Ditto, with arrow keys + bindsym $mod+Shift+Left move left + bindsym $mod+Shift+Down move down + bindsym $mod+Shift+Up move up + bindsym $mod+Shift+Right move right +# +# Workspaces: +# + # Switch to workspace + bindsym $mod+1 workspace number 1 + bindsym $mod+2 workspace number 2 + bindsym $mod+3 workspace number 3 + bindsym $mod+4 workspace number 4 + bindsym $mod+5 workspace number 5 + bindsym $mod+6 workspace number 6 + bindsym $mod+7 workspace number 7 + bindsym $mod+8 workspace number 8 + bindsym $mod+9 workspace number 9 + bindsym $mod+0 workspace number 10 + # Move focused container to workspace + bindsym $mod+Shift+1 move container to workspace number 1 + bindsym $mod+Shift+2 move container to workspace number 2 + bindsym $mod+Shift+3 move container to workspace number 3 + bindsym $mod+Shift+4 move container to workspace number 4 + bindsym $mod+Shift+5 move container to workspace number 5 + bindsym $mod+Shift+6 move container to workspace number 6 + bindsym $mod+Shift+7 move container to workspace number 7 + bindsym $mod+Shift+8 move container to workspace number 8 + bindsym $mod+Shift+9 move container to workspace number 9 + bindsym $mod+Shift+0 move container to workspace number 10 + # Note: workspaces can have any name you want, not just numbers. + # We just use 1-10 as the default. +# +# Layout stuff: +# + # You can "split" the current object of your focus with + # $mod+b or $mod+v, for horizontal and vertical splits + # respectively. + bindsym $mod+b splith + bindsym $mod+v splitv + + # Switch the current container between different layout styles + bindsym $mod+s layout stacking + bindsym $mod+w layout tabbed + bindsym $mod+e layout toggle split + + # Make the current focus fullscreen + bindsym $mod+f fullscreen + + # Toggle the current focus between tiling and floating mode + bindsym $mod+Shift+space floating toggle + + # Swap focus between the tiling area and the floating area + bindsym $mod+space focus mode_toggle + + # Move focus to the parent container + bindsym $mod+a focus parent +# +# Scratchpad: +# + # Sway has a "scratchpad", which is a bag of holding for windows. + # You can send windows there and get them back later. + + # Move the currently focused window to the scratchpad + bindsym $mod+Shift+minus move scratchpad + + # Show the next scratchpad window or hide the focused scratchpad window. + # If there are multiple scratchpad windows, this command cycles through them. + bindsym $mod+minus scratchpad show +# +# Resizing containers: +# +mode "resize" { + # left will shrink the containers width + # right will grow the containers width + # up will shrink the containers height + # down will grow the containers height + bindsym $left resize shrink width 10px + bindsym $down resize grow height 10px + bindsym $up resize shrink height 10px + bindsym $right resize grow width 10px + + # Ditto, with arrow keys + bindsym Left resize shrink width 10px + bindsym Down resize grow height 10px + bindsym Up resize shrink height 10px + bindsym Right resize grow width 10px + + # Return to default mode + bindsym Return mode "default" + bindsym Escape mode "default" +} +bindsym $mod+r mode "resize" +# +# Utilities: +# + # Special keys to adjust volume via PulseAudio + bindsym --locked XF86AudioMute exec pactl set-sink-mute \@DEFAULT_SINK@ toggle + bindsym --locked XF86AudioLowerVolume exec pactl set-sink-volume \@DEFAULT_SINK@ -5% + bindsym --locked XF86AudioRaiseVolume exec pactl set-sink-volume \@DEFAULT_SINK@ +5% + bindsym --locked XF86AudioMicMute exec pactl set-source-mute \@DEFAULT_SOURCE@ toggle + # Special keys to adjust brightness via brightnessctl + bindsym --locked XF86MonBrightnessDown exec brightnessctl set 5%- + bindsym --locked XF86MonBrightnessUp exec brightnessctl set 5%+ + # Special key to take a screenshot with grim + bindsym Print exec grim + +# +# Status Bar: +# +# Read `man 5 sway-bar` for more information about this section. +bar { + position top + # When the status_command prints a new line to stdout, swaybar updates. + # The default just shows the current date and time. + #status_command while date +'%Y-%m-%d %X' $HOSTNAME; do sleep 1; done + status_command while (echo $USER@$HOSTNAME $(date +'%Y-%m-%d %X')); do sleep 1; done + colors { + statusline #000000 + background #ffffff + inactive_workspace #32323200 #32323200 #5c5c5c + } +} +set $opacity 0.96 +for_window [class=".*"] opacity $opacity +for_window [app_id="foot"] opacity $opacity con_mark $HOSTNAME + +client.focused #000000 #ffffff #ffffff +client.unfocused #000000 #ffffff #ffffff + +include /gnu/store/49nyzc50jn2svwb9i7k5739cvgaiac72-sway-1.10.1/etc/sway/config.d/* diff --git a/vmstore/disposable/files/nonguix-signing-key.pub b/vmstore/disposable/files/nonguix-signing-key.pub new file mode 100644 index 0000000..56ee811 --- /dev/null +++ b/vmstore/disposable/files/nonguix-signing-key.pub @@ -0,0 +1,6 @@ +(public-key + (ecc + (curve Ed25519) + (q #C1FD53E5D4CE971933EC50C9F307AE2171A2D3B52C804642A7A35F84F3A4EA98#) + ) + ) diff --git a/vmstore/disposable/files/scripts/sway-login b/vmstore/disposable/files/scripts/sway-login new file mode 100644 index 0000000..3792a85 --- /dev/null +++ b/vmstore/disposable/files/scripts/sway-login @@ -0,0 +1,3 @@ +if [ -z "$WAYLAND_DISPLAY" ] && [ "$XDG_VTNR" -eq 1 ]; then + exec sway; +fi diff --git a/vmstore/disposable/home.scm b/vmstore/disposable/home.scm new file mode 100644 index 0000000..a627839 --- /dev/null +++ b/vmstore/disposable/home.scm @@ -0,0 +1,81 @@ +(define-module (corpo 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 (corpo-home-environment)) + + (use-package-modules compression gnome gnome-xyz video fonts freedesktop + linux package-management pulseaudio + terminals xdisorg xorg glib wm messaging) + + (define corpo-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"))))) + + + (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-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 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 + + ;; General + zip unzip)))) -- cgit v1.2.3