diff options
| -rw-r--r-- | guix/system-base.scm (renamed from guix/system.scm) | 78 |
1 files changed, 41 insertions, 37 deletions
diff --git a/guix/system.scm b/guix/system-base.scm index bde2fb9..0f0e877 100644 --- a/guix/system.scm +++ b/guix/system-base.scm @@ -1,13 +1,16 @@ ;; TODO: Use this as a base module and seperate each system/machine -(use-modules (gnu) - (gnu services) - (gnu services dbus) - (gnu services desktop) - (gnu system) - (gnu system setuid) - (gnu system nss) - (nongnu packages linux) - (nongnu system linux-initrd)) + +(define-module (system-base) + #:use-module (gnu) + #:use-module (gnu services) + #:use-module (gnu services dbus) + #:use-module (gnu system) + #:use-module (gnu system setuid) + #:use-module (gnu system nss) + #:use-module (nongnu packages linux) + #:use-module (nongnu system linux-initrd) + #:use-module (rosenthal services networking) + #:export (system-base)) (use-service-modules cups desktop networking ssh xorg docker guix admin pm docker) @@ -35,7 +38,7 @@ (group "users") (home-directory "/home/thanos") (supplementary-groups '("wheel" "netdev" "audio" "video" "docker"))) - %base-user-accounts)) + %base-user-accounts)) ;; Packages installed system-wide. (packages @@ -57,7 +60,7 @@ (map (lambda (tty) ;; Use a larger font for HIDPI screens (cons tty (file-append - font-terminus + font-terminus "/share/consolefonts/ter-132n"))) '("tty1" "tty2" "tty3"))) @@ -73,7 +76,11 @@ (greetd-terminal-configuration (terminal-vt "2")) (greetd-terminal-configuration - (terminal-vt "3")))))) + (terminal-vt "3")) + (greetd-terminal-configuration + (terminal-vt "4")) + (greetd-terminal-configuration + (terminal-vt "5")))))) (service gnome-desktop-service-type) @@ -82,16 +89,13 @@ (openssh-configuration (permit-root-login 'prohibit-password))) - ;; (service static-networking-service-type - ;; (list %loopback-static-networking)) - ;; TODO: Fix swaylock (service screen-locker-service-type - (screen-locker-configuration - (name "swaylock") - (program (file-append swaylock "/bin/swaylock")) - (using-pam? #t) - (using-setuid? #f))) + (screen-locker-configuration + (name "swaylock") + (program (file-append swaylock "/bin/swaylock")) + (using-pam? #t) + (using-setuid? #f))) ;; Networking services (service network-manager-service-type) @@ -102,7 +106,7 @@ (service tor-service-type) (service cups-service-type) - ;; + ;; (service avahi-service-type) (service udisks-service-type) (service upower-service-type) @@ -116,8 +120,9 @@ (service thermald-service-type) (service tlp-service-type (tlp-configuration - (cpu-boost-on-ac? #t) - (wifi-pwr-on-bat? #t)))) + (cpu-boost-on-ac? #t) + (wifi-pwr-on-bat? #t))) + (service tailscale-service-type)) (modify-services %base-services (delete login-service-type) @@ -126,14 +131,13 @@ (bootloader (bootloader-configuration - (bootloader grub-efi-bootloader) - (targets (list "/boot/efi")) - (keyboard-layout keyboard-layout))) - + (bootloader grub-efi-bootloader) + (targets (list "/boot/efi")) + (keyboard-layout keyboard-layout))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (swap-devices (list (swap-space - (target (uuid - "10551e45-7810-4171-a4b2-87372ae5bdb4"))))) + (target (uuid + "10551e45-7810-4171-a4b2-87372ae5bdb4"))))) ;; run 'lsblk -f' to get UUIDs. (file-systems (cons* (file-system @@ -147,13 +151,13 @@ 'ext4)) (type "ext4")) (file-system - (mount-point "/") - (device (uuid + (mount-point "/") + (device (uuid "e350994d-4c98-4d04-9867-29c9fc779026" 'ext4)) - (type "ext4")) - (file-system - (mount-point "/boot/efi") - (device (uuid "F2A9-FB50" - 'fat32)) - (type "vfat")) %base-file-systems))) + (type "ext4")) + (file-system + (mount-point "/boot/efi") + (device (uuid "F2A9-FB50" + 'fat32)) + (type "vfat")) %base-file-systems))) |