diff options
| -rw-r--r-- | vmstore/corpo/corpo-system.scm | 172 | ||||
| -rw-r--r-- | vmstore/corpo/files/misc-config/sway-config | 239 | ||||
| -rw-r--r-- | vmstore/corpo/files/scripts/sway-login | 3 | ||||
| -rw-r--r-- | vmstore/corpo/home.scm | 67 |
4 files changed, 481 insertions, 0 deletions
diff --git a/vmstore/corpo/corpo-system.scm b/vmstore/corpo/corpo-system.scm new file mode 100644 index 0000000..8f84c0e --- /dev/null +++ b/vmstore/corpo/corpo-system.scm @@ -0,0 +1,172 @@ +;; 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 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" "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)) + + ;; Non-free + (kernel linux) + (kernel-arguments '("modprobe.blacklist=noveau" + ;"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) + ;(service kernel-module-loader-service-type + ;'("nvidia")) + ;; 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) + (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) + (service accountsservice-service-type) + (service colord-service-type) + (service polkit-service-type) + (service dbus-root-service-type) + + ;; Cleanup stayle 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 + (udev-rules-service 'pipewire-add-udev-rules pipewire) + + ;; 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 new file mode 100644 index 0000000..ac6ce90 --- /dev/null +++ b/vmstore/corpo/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 <identifier> 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/scripts/sway-login b/vmstore/corpo/files/scripts/sway-login new file mode 100644 index 0000000..3792a85 --- /dev/null +++ b/vmstore/corpo/files/scripts/sway-login @@ -0,0 +1,3 @@ +if [ -z "$WAYLAND_DISPLAY" ] && [ "$XDG_VTNR" -eq 1 ]; then + exec sway; +fi diff --git a/vmstore/corpo/home.scm b/vmstore/corpo/home.scm new file mode 100644 index 0000000..5211c57 --- /dev/null +++ b/vmstore/corpo/home.scm @@ -0,0 +1,67 @@ +(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 fonts freedesktop + linux package-management pulseaudio + terminals xdisorg xorg glib wm) + + (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"))) + + (service home-bash-service-type + (home-bash-configuration + (bash-profile (list (local-file "./files/scripts/sway-login"))))) + + (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-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 + + ;; Audio + alsa-utils pavucontrol + + ;; General + zip unzip)))) |