diff options
Diffstat (limited to '.config/guix')
| -rw-r--r-- | .config/guix/base.scm | 44 | ||||
| -rwxr-xr-x[-rw-r--r--] | .config/guix/channels.scm | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | .config/guix/common.scm | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | .config/guix/fsociety.scm | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | .config/guix/guix-packages/testing.scm | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | .config/guix/personal-channel.scm | 0 |
6 files changed, 30 insertions, 14 deletions
diff --git a/.config/guix/base.scm b/.config/guix/base.scm index ee45460..194f74a 100644 --- a/.config/guix/base.scm +++ b/.config/guix/base.scm @@ -19,7 +19,7 @@ ;;(define-public base-operating-system (operating-system - (host-name "fsociety") + (host-name "zeus") (kernel linux) (firmware (list linux-firmware @@ -72,6 +72,7 @@ `("emacs-exwm" "emacs-desktop-environment" "emacs" + "bash" "xrandr" "picom" "gnome" @@ -103,23 +104,38 @@ ;; This is the default list of services we ;; are appending to. %desktop-services)) - (bootloader (bootloader-configuration - (bootloader grub-bootloader) - (targets (list "/dev/nvme0n1")) - (keyboard-layout keyboard-layout))) - (swap-devices (list (swap-space - (target (uuid - "a8d782da-f1ea-477e-9b47-cf5aa431e893"))))) + (bootloader (bootloader-configuration + (bootloader grub-efi-bootloader) + (targets (list "/boot/efi")) + (keyboard-layout keyboard-layout))) + (mapped-devices (list (mapped-device + (source (uuid + "0594b592-ddcb-4a3c-958d-c773d7a85d93")) + (target "cryptroot") + (type luks-device-mapping)) + (mapped-device + (source (uuid + "a44f40ec-94c3-457a-a9ed-5db5396f3aea")) + (target "crypthome") + (type luks-device-mapping)))) + + ;; The list of file systems that get "mounted". The unique + ;; file system identifiers there ("UUIDs") can be obtained + ;; by running 'blkid' in a terminal. (file-systems (cons* (file-system (mount-point "/boot/efi") - (device (uuid "021E-83B3" + (device (uuid "98B8-B93E" 'fat32)) (type "vfat")) (file-system (mount-point "/") - (device (uuid - "2bb282ae-7b2d-45c3-92b1-b1524177defb" - 'ext4)) - (type "ext4")) %base-file-systems))) - ;) + (device "/dev/mapper/cryptroot") + (type "ext4") + (dependencies mapped-devices)) + (file-system + (mount-point "/home") + (device "/dev/mapper/crypthome") + (type "ext4") + (dependencies mapped-devices)) %base-file-systems))) + diff --git a/.config/guix/channels.scm b/.config/guix/channels.scm index 0e0b69a..0e0b69a 100644..100755 --- a/.config/guix/channels.scm +++ b/.config/guix/channels.scm diff --git a/.config/guix/common.scm b/.config/guix/common.scm index 64666d7..64666d7 100644..100755 --- a/.config/guix/common.scm +++ b/.config/guix/common.scm diff --git a/.config/guix/fsociety.scm b/.config/guix/fsociety.scm index 173d5fd..173d5fd 100644..100755 --- a/.config/guix/fsociety.scm +++ b/.config/guix/fsociety.scm diff --git a/.config/guix/guix-packages/testing.scm b/.config/guix/guix-packages/testing.scm index 5fa374c..5fa374c 100644..100755 --- a/.config/guix/guix-packages/testing.scm +++ b/.config/guix/guix-packages/testing.scm diff --git a/.config/guix/personal-channel.scm b/.config/guix/personal-channel.scm index 5a9fcba..5a9fcba 100644..100755 --- a/.config/guix/personal-channel.scm +++ b/.config/guix/personal-channel.scm |