From 05f88e027336cc39c89380c72a04510d9fdb6c78 Mon Sep 17 00:00:00 2001 From: nik gaffney Date: Mon, 29 Jul 2024 13:25:07 +0200 Subject: [PATCH] Put in earplugs --- README.org | 3 +- channel/zzkt/packages/firmware.scm | 4 +- .../zzkt/packages/fonts-bye-bye-binary.scm | 9 ++-- channel/zzkt/packages/fonts.scm | 6 +++ channel/zzkt/packages/python-xyz.scm | 7 +++ config/framework13-system.org | 51 ++++++++++++------- 6 files changed, 52 insertions(+), 28 deletions(-) diff --git a/README.org b/README.org index c62a584..9598204 100644 --- a/README.org +++ b/README.org @@ -31,9 +31,10 @@ add to =~/.config/guix/channels.scm= (or wherever local channel declarations are (name 'zzkt) (url "https://gitlab.com/zzkt/guix") (branch "endless") + (commit "c24ecaae83f67d495a3951f372c69c2682c090a9") (introduction (make-channel-introduction - "fc0ada85de1980e1fc9ee50672d827c0c17c3e7d" + "c24ecaae83f67d495a3951f372c69c2682c090a9" (openpgp-fingerprint "24A7 4604 91E6 A60F 5BB4 A00F 989F 5E6E DB47 8160")))) #+END_SRC diff --git a/channel/zzkt/packages/firmware.scm b/channel/zzkt/packages/firmware.scm index aa57f20..f9ddc05 100644 --- a/channel/zzkt/packages/firmware.scm +++ b/channel/zzkt/packages/firmware.scm @@ -76,8 +76,8 @@ (define-public fwupd-zzkt (package - (name "fwupd-zzkt") - (version "1.8.14") + (name "fwupd-lvfs") + (version "1.9.18") (source (origin (method git-fetch) (uri (git-reference diff --git a/channel/zzkt/packages/fonts-bye-bye-binary.scm b/channel/zzkt/packages/fonts-bye-bye-binary.scm index e2d7416..7bc709d 100644 --- a/channel/zzkt/packages/fonts-bye-bye-binary.scm +++ b/channel/zzkt/packages/fonts-bye-bye-binary.scm @@ -16,10 +16,7 @@ ;;; You should have received a copy of the GNU General Public License ;;; along with GNU Guix. If not, see . -;; as seen near gnu/packages/fonts.scm - (define-module (zzkt packages fonts-bye-bye-binary) - #:use-module (ice-9 regex) #:use-module (guix utils) #:use-module ((guix licenses) #:prefix license:) @@ -86,7 +83,7 @@ (define-public font-baskervvol (package - (name "font-") + (name "font-baskervvol") (version "V1.0 — 2022") (source (origin @@ -107,7 +104,7 @@ (define-public font-dindong (package - (name "font-") + (name "font-dindong") (version "1") (source (origin @@ -128,7 +125,7 @@ (define-public font-homoneta (package - (name "font-") + (name "font-homoneta") (version "1") (source (origin diff --git a/channel/zzkt/packages/fonts.scm b/channel/zzkt/packages/fonts.scm index f1ff09e..f755af4 100644 --- a/channel/zzkt/packages/fonts.scm +++ b/channel/zzkt/packages/fonts.scm @@ -33,6 +33,12 @@ ;; various fonts & foundries ;; https://github.com/dharmatype/Bebas-Neue +;; https://fonts.google.com/specimen/Spline+Sans +;; https://github.com/lettersoup/Sofia-Sans +;; https://fontesk.com/sofia-sans-typeface/ + +;; more generally -> https://fontesk.com/license/ofl-gpl/ + (define-public font-monaspace (package diff --git a/channel/zzkt/packages/python-xyz.scm b/channel/zzkt/packages/python-xyz.scm index 8286668..93d1616 100644 --- a/channel/zzkt/packages/python-xyz.scm +++ b/channel/zzkt/packages/python-xyz.scm @@ -61,6 +61,8 @@ (license license:expat))) ;; via guix import pypi -r mausoleum +;; really? pytoml==0.1.13 +;; also requires pyqt5 (define-public python-mausoleum (package @@ -81,3 +83,8 @@ (description "This package provides a Python GUI, CLI, and wrapper for Tomb.") (license #f))) + + +;; via guix import pypi -r amphi-etl +;; requires `https://github.com/benfred/py-spy' to be built (rust) +;; cargo install py-spy diff --git a/config/framework13-system.org b/config/framework13-system.org index 8b4e8e7..71e8928 100644 --- a/config/framework13-system.org +++ b/config/framework13-system.org @@ -483,30 +483,43 @@ initrd with AMD microcode blobs (keyboard-layout keyboard-layout))) #+end_src -** swap device - % swapon --show -% swapon -L swap -#+begin_src scheme - (swap-devices (list (swap-space - (target (file-system-label "swap"))))) -#+end_src - ** file systems & mount points +Using LUKS for encrypted partitions requires =mapped-devices= + +#+BEGIN_SRC scheme :session + (mapped-devices (list (mapped-device + (source (uuid + "9b5d47cd-d865-4ec9-81ec-30565fa767e4")) + (target "cryptroot") + (type luks-device-mapping)))) +#+END_SRC + The list of file systems that get mounted. The unique file system identifiers ("UUIDs") can be obtained by running =blkid= in a terminal. #+begin_src scheme - (file-systems (cons* (file-system - (mount-point "/boot/efi") - (device (uuid "8B3C-3BC0" 'fat32)) - (type "vfat")) - (file-system - (mount-point "/") - (device (uuid - "e0ece027-0396-4546-8aba-2ce91285d061" - 'ext4)) - (type "ext4")) - %base-file-systems)) + (file-systems (cons* (file-system + (mount-point "/boot/efi") + (device (uuid "0D77-7016" 'fat32)) + (type "vfat")) + (file-system + (mount-point "/") + (device "/dev/mapper/cryptroot") + (type "ext4") + (dependencies mapped-devices)) %base-file-systems)) +#+end_src + +** swap device + +keep swap file within the encrypted partition: + - dd if=/dev/zero of=/mnt/swapfile bs=1M count=32768 + - chmod 0600 /mnt/swapfile && mkswap /mnt/swapfile && swapon + - UUID=31a16935-3c08-4a5f-a35c-e28773954a3f + +#+begin_src scheme +;; (swap-devices (list (swap-space +;; (target (file-system-label "swap"))))) + (swap-devices `("/mnt/swapfile")) #+end_src ** FIN