diff --git a/config.scm b/config.scm deleted file mode 100755 index c335493..0000000 --- a/config.scm +++ /dev/null @@ -1,85 +0,0 @@ -(use-modules (gnu) - ((gnu packages anthy) #:select (anthy)) - ((gnu packages certs) #:select (nss-certs)) - ((gnu packages gnome) #:select (gvfs)) - ((gnu packages file-systems) #:select (davfs2)) - ((gnu packages ibus) #:select (ibus ibus-anthy)) - ((gnu packages wm) #:select (i3-wm)) - ((gnu services desktop) #:select (xfce-desktop-service-type %desktop-services)) - ((gnu services xorg) #:select (set-xorg-configuration xorg-configuration)) - (gnu system)) -(use-modules (nongnu packages linux) - (nongnu system linux-initrd)) - -(define %utils - (list anthy davfs2 gvfs i3-wm ibus ibus-anthy nss-certs)) - -(define (my-services keyboard-layout) - (append - (list - (service xfce-desktop-service-type) - (set-xorg-configuration - (xorg-configuration (keyboard-layout keyboard-layout)))) - (modify-services %desktop-services - (guix-service-type config => - (guix-configuration - (inherit config) - (substitute-urls - (cons* "https://substitutes.nonguix.org" - %default-substitute-urls)) - (authorized-keys - (cons* (local-file "./nonguix.key.pub") - %default-authorized-guix-keys))))))) - -(operating-system - (locale "fr_FR.utf8") - (timezone "Europe/Paris") - (keyboard-layout (keyboard-layout "fr" "bepo" #:options '("ctrl:swapcaps"))) - (host-name "rose") - (users (cons* (user-account - (name "kook") - (comment "Grou-grou") - (group "users") - (home-directory "/home") - (supplementary-groups - '("wheel" "netdev" "audio" "video" "kvm"))) - %base-user-accounts)) - (packages - (append - %utils - %base-packages)) - (services (my-services keyboard-layout)) - (kernel linux) - (initrd microcode-initrd) - (firmware (list linux-firmware)) - (bootloader - (bootloader-configuration - (bootloader grub-efi-bootloader) - (targets '("/boot/efi")) - (keyboard-layout keyboard-layout))) - (mapped-devices - (list (mapped-device - (source (uuid "c896e07f-d2ed-4390-8ce0-b82080d1bdc2")) - (target "HOME") - (type luks-device-mapping)))) - (file-systems - (cons* (file-system - (mount-point "/") - (device (uuid "60c115b5-08f2-435b-95e5-d3b81ffba4f4" 'ext4)) - (type "ext4")) - (file-system - (mount-point "/home") - (device (uuid "73dc31f8-844d-4a87-bf54-4fb86a49469c" 'ext4)) - (type "ext4") - (dependencies mapped-devices)) - (file-system - (mount-point "/boot/efi") - (device (uuid "545B-970F" 'fat32)) - (type "vfat")) - (file-system - (mount-point "/tmp") - (device "tmpfs") - (type "tmpfs") - (check? #f) - (options "size=50%")) - %base-file-systems))) diff --git a/packages.scm b/packages.scm index c1312fc..12bdc63 100644 --- a/packages.scm +++ b/packages.scm @@ -26,29 +26,25 @@ (gnu packages xfce) (gnu packages xorg)) +(define blanc-x11-cursors (load "/home/Bureau/blanc/guix.scm")) + (define %desktop (list arc-icon-theme arc-theme - claws-mail + blanc-x11-cursors evince font-google-noto font-openmoji - gcc-toolchain - ghc - git ;guide htop mplayer nitrogen - openssh pavucontrol pragha pwgen recutils - rsync tmux - ungoogled-chromium unzip vim-full vim-solarized @@ -57,6 +53,18 @@ xrandr zip)) +(define %dev + (list + gcc-toolchain + ghc + git)) + +(define %web + (list + claws-mail + ungoogled-chromium + )) + (define %heavy (list libreoffice @@ -64,10 +72,9 @@ pandoc qemu)) - (define %network (list curl - netcat)) - -(packages->manifest (append %desktop %heavy %network)) + netcat + openssh + rsync)) diff --git a/pine.packages.scm b/pine.packages.scm new file mode 100644 index 0000000..d795c25 --- /dev/null +++ b/pine.packages.scm @@ -0,0 +1,3 @@ +(load "packages.scm") + +(packages->manifest (append %desktop %dev %heavy %network %web)) diff --git a/pine.system.scm b/pine.system.scm new file mode 100644 index 0000000..b754464 --- /dev/null +++ b/pine.system.scm @@ -0,0 +1,30 @@ +(use-modules (gnu) + (gnu system)) +(use-modules (nongnu packages linux) + (nongnu system linux-initrd)) + +(load "system.common.scm") + +(let ((os (install-to (uuid "???" 'ext4)))) + (operating-system + (inherit os) + (host-name "pine") + (services + (modify-services + (xfce-desktop-services os))) + (mapped-devices + (list (mapped-device + (source (uuid "???")) + (target "HOME") + (type luks-device-mapping)))) + (file-systems + (cons* (file-system + (mount-point "/home") + (device (uuid "???" 'ext4)) + (type "ext4") + (dependencies mapped-devices)) + (file-system + (mount-point "/boot/efi") + (device (uuid "???" 'fat32)) + (type "vfat")) + (operating-system-file-systems os))))) diff --git a/rose.packages.scm b/rose.packages.scm new file mode 100644 index 0000000..d795c25 --- /dev/null +++ b/rose.packages.scm @@ -0,0 +1,3 @@ +(load "packages.scm") + +(packages->manifest (append %desktop %dev %heavy %network %web)) diff --git a/rose.system.scm b/rose.system.scm new file mode 100644 index 0000000..93c6c91 --- /dev/null +++ b/rose.system.scm @@ -0,0 +1,42 @@ +(use-modules (gnu) + (gnu system)) +(use-modules (nongnu packages linux) + (nongnu system linux-initrd)) + +(load "system.common.scm") + +(let ((os (install-to (uuid "60c115b5-08f2-435b-95e5-d3b81ffba4f4" 'ext4)))) + (operating-system + (inherit os) + (host-name "rose") + (services + (modify-services + (xfce-desktop-services os) + (guix-service-type config => + (guix-configuration + (inherit config) + (substitute-urls + (cons* "https://substitutes.nonguix.org" + %default-substitute-urls)) + (authorized-keys + (cons* (local-file "./nonguix.key.pub") + %default-authorized-guix-keys)))))) + (kernel linux) + (initrd microcode-initrd) + (firmware (list linux-firmware)) + (mapped-devices + (list (mapped-device + (source (uuid "c896e07f-d2ed-4390-8ce0-b82080d1bdc2")) + (target "HOME") + (type luks-device-mapping)))) + (file-systems + (cons* (file-system + (mount-point "/home") + (device (uuid "73dc31f8-844d-4a87-bf54-4fb86a49469c" 'ext4)) + (type "ext4") + (dependencies mapped-devices)) + (file-system + (mount-point "/boot/efi") + (device (uuid "545B-970F" 'fat32)) + (type "vfat")) + (operating-system-file-systems os))))) diff --git a/system.common.scm b/system.common.scm new file mode 100755 index 0000000..d68354f --- /dev/null +++ b/system.common.scm @@ -0,0 +1,57 @@ +(use-modules (gnu) + ((gnu packages anthy) #:select (anthy)) + ((gnu packages certs) #:select (nss-certs)) + ((gnu packages gnome) #:select (gvfs)) + ((gnu packages file-systems) #:select (davfs2)) + ((gnu packages ibus) #:select (ibus ibus-anthy)) + ((gnu packages wm) #:select (i3-wm)) + ((gnu services desktop) #:select (xfce-desktop-service-type %desktop-services)) + ((gnu services xorg) #:select (set-xorg-configuration xorg-configuration)) + (gnu system) + (rnrs io ports)) +(use-modules (nongnu packages linux) + (nongnu system linux-initrd)) + +(define %utils + (list anthy davfs2 gvfs i3-wm ibus ibus-anthy nss-certs)) + +(define (read-file file-path) + (get-string-all (open-input-file file-path))) + +(define (xfce-desktop-services os) + (append + (list + (service xfce-desktop-service-type) + (set-xorg-configuration + (xorg-configuration + (keyboard-layout (operating-system-keyboard-layout os)) + (extra-config (list (read-file "touchpad.conf")))))) + %desktop-services)) + +(define (install-to root-fs) + (operating-system + (locale "fr_FR.utf8") + (timezone "Europe/Paris") + (keyboard-layout (keyboard-layout "fr" "bepo" #:options '("ctrl:swapcaps"))) + (host-name "stub") + (users (cons* (user-account + (name "kook") + (comment "Grou-grou") + (group "users") + (home-directory "/home") + (supplementary-groups + '("wheel" "netdev" "audio" "video" "kvm"))) + %base-user-accounts)) + (packages + (append %utils %base-packages)) + (bootloader + (bootloader-configuration + (bootloader grub-efi-bootloader) + (targets '("/boot/efi")) + (keyboard-layout keyboard-layout))) + (file-systems + (cons (file-system + (mount-point "/") + (device root-fs) + (type "ext4")) + %base-file-systems))))