diff options
| -rw-r--r-- | aisaka.org | 142 | ||||
| -rw-r--r-- | system-configuration.scm | 18 |
2 files changed, 80 insertions, 80 deletions
@@ -12,78 +12,78 @@ https://guix.gnu.org/en/manual/devel/en/html_node/ https://guix.gnu.org/en/manual/devel/en/html_node/System-Configuration.html #+begin_src scheme :noweb-ref system-dump :tangle system-configuration.scm -(add-to-load-path "./services") - -(define-module (aisaka-system-configuration) - #:use-module (gnu) - #:use-module (gnu packages cups) - #:use-module (gnu packages finance) - #:use-module (gnu services cups) - #:use-module (gnu services configuration) - #:use-module (gnu services desktop) - #:use-module (gnu services networking) - #:use-module (gnu services ssh) - #:use-module (gnu services xorg) - #:use-module (ssh-server)) + (add-to-load-path "./services") -(define keyboard-layout - (keyboard-layout "pl")) - -(operating-system - (locale "pl_PL.utf8") - (timezone "Europe/Warsaw") - (keyboard-layout keyboard-layout) - (host-name "aisaka") - (users (cons* (user-account (name "marek") - (comment "Marek Paśnikowski") - (group "users") - (home-directory "/home/marek") - (supplementary-groups '("audio" - "netdev" - "tor" - "video" - "wheel"))) - %base-user-accounts)) - (packages - (append - (map - <<to-package+output>> - '("netcat-openbsd" - "nss-certs" - "ntfs-3g" - "trezord" - "trezord-udev-rules")) - %base-packages)) - (services (cons* ssh-service - (service cups-service-type - (cups-configuration (extensions `(,cups-filters - ,epson-inkjet-printer-escpr)) - (web-interface? #t))) - (service gnome-desktop-service-type) - (service tor-service-type - (tor-configuration (config-file (local-file "torrc")) - (control-socket? #t))) - (udev-rules-service 'trezord trezord-udev-rules) - (modify-services %desktop-services - (elogind-service-type - configuration => - (elogind-configuration - (inherit configuration) - (handle-lid-switch 'ignore)))))) - (bootloader (bootloader-configuration (bootloader grub-bootloader) - (targets '("/dev/sda")) - (keyboard-layout keyboard-layout))) - (swap-devices - (list - <<swap>>)) - (mapped-devices - (list - <<luks>>)) - (file-systems - (append %base-file-systems - (list - <<rootfs>> - <<bootfs>>)))) + (define-module (aisaka-system-configuration) + #:use-module (gnu) + #:use-module (gnu packages cups) + #:use-module (gnu packages finance) + #:use-module (gnu services cups) + #:use-module (gnu services configuration) + #:use-module (gnu services desktop) + #:use-module (gnu services networking) + #:use-module (gnu services ssh) + #:use-module (gnu services xorg) + #:use-module (ssh-server)) + + (define keyboard-layout + (keyboard-layout "pl")) + + (operating-system + (locale "pl_PL.utf8") + (timezone "Europe/Warsaw") + (keyboard-layout keyboard-layout) + (host-name "aisaka") + (users (cons* (user-account (name "marek") + (comment "Marek Paśnikowski") + (group "users") + (home-directory "/home/marek") + (supplementary-groups '("audio" + "netdev" + "tor" + "video" + "wheel"))) + %base-user-accounts)) + (packages + (append + (map + <<to-package+output>> + '("netcat-openbsd" + "nss-certs" + "ntfs-3g" + "trezord" + "trezord-udev-rules")) + %base-packages)) + (services (cons* ssh-service + (service cups-service-type + (cups-configuration (extensions `(,cups-filters + ,epson-inkjet-printer-escpr)) + (web-interface? #t))) + (service gnome-desktop-service-type) + (service tor-service-type + (tor-configuration (config-file (local-file "torrc")) + (control-socket? #t))) + (udev-rules-service 'trezord trezord-udev-rules) + (modify-services %desktop-services + (elogind-service-type + configuration => + (elogind-configuration + (inherit configuration) + (handle-lid-switch 'ignore)))))) + (bootloader (bootloader-configuration (bootloader grub-bootloader) + (targets '("/dev/sda")) + (keyboard-layout keyboard-layout))) + (swap-devices + (list + <<swap>>)) + (mapped-devices + (list + <<luks>>)) + (file-systems + (append %base-file-systems + (list + <<rootfs>> + <<bootfs>>)))) #+end_src ** TODO Home configuration diff --git a/system-configuration.scm b/system-configuration.scm index 522b4d9..28d4dbc 100644 --- a/system-configuration.scm +++ b/system-configuration.scm @@ -73,12 +73,12 @@ (file-systems (append %base-file-systems (list - (file-system - (mount-point "/") - (device "/dev/mapper/aisaka-root") - (type "btrfs") - (dependencies mapped-devices)) - (file-system - (mount-point "/boot") - (device (uuid "4f77b5fc-56ad-43ae-b6ec-e5adc8c48587")) - (type "ext4")))))) + (file-system + (mount-point "/") + (device "/dev/mapper/aisaka-root") + (type "btrfs") + (dependencies mapped-devices)) + (file-system + (mount-point "/boot") + (device (uuid "4f77b5fc-56ad-43ae-b6ec-e5adc8c48587")) + (type "ext4")))))) |