From 5627fe1a21009c19f59880617713d754f0bc2d27 Mon Sep 17 00:00:00 2001 From: nik gaffney Date: Tue, 29 Oct 2024 11:47:54 +0100 Subject: [PATCH] Put in earplugs --- config/framework13-system.org | 44 ++++++++++++++++++++--------------- config/framework13-system.scm | 27 ++++++++++++--------- config/home-configuration.org | 21 +++++++++++++---- config/home-configuration.scm | 13 +++++++++-- 4 files changed, 69 insertions(+), 36 deletions(-) diff --git a/config/framework13-system.org b/config/framework13-system.org index a9cfaa9..10aac3d 100644 --- a/config/framework13-system.org +++ b/config/framework13-system.org @@ -72,7 +72,7 @@ Some kernel corruption may be required to enable WIFI. Since the non-free kernel #+begin_src scheme (define-public linux-FWL13 - (corrupt-linux linux-libre-6.9 + (corrupt-linux linux-libre-6.11 #:name "linux-fwl13" #:configs '("CONFIG_MT7921E=m"))) #+end_src @@ -87,7 +87,7 @@ The =operating-system= declaration (timezone "Europe/Amsterdam") #+end_src -hosts file for local & LAN name resolving and persistent =/etc/hosts= (maybe convert to =hosts-service-type=) +hosts file for local & LAN name resolving and persistent =/etc/hosts= (maybe convert to =hosts-service-type=) #+BEGIN_SRC scheme :session (hosts-file (local-file "hosts.conf")) @@ -113,9 +113,9 @@ Kernel & driver details - https://www.kernel.org/doc/html/latest/gpu/amdgpu/module-parameters.html - https://community.frame.work/t/solved-backlight-brightness-issues/36065/13 -Using =linux-6.9= from nonguix (which includes =CONFIG_MT7921E= by default as of 6.7.2) +Using =linux-6.11= from nonguix (which includes =CONFIG_MT7921E= by default as of 6.7.2) #+begin_src scheme - (kernel linux-6.9) + (kernel linux-6.11) ;; (kernel linux-FWL13) #+end_src @@ -123,12 +123,16 @@ testing [[https://community.frame.work/t/adaptive-backlight-management-abm/41055 #+BEGIN_SRC scheme ;; (kernel-arguments '("amdgpu.abmlevel=3")) ;; (kernel-arguments '("modprobe.blacklist=hid_sensor_hub")) ;; required prior to 6.7 - (kernel-arguments '("splash" "quiet")) + (kernel-arguments (cons* "resume=/swapfile" + "splash" "quiet") + %default-kernel-arguments) #+END_SRC …and required firmware (should be possible to reduce to specifics) #+begin_src scheme - (firmware (list linux-firmware)) + (firmware (list linux-firmware + amdgpu-firmware + amd-microcode)) ;; (firmware (list amdgpu-firmware ;; amd-microcode ;; realtek-firmware)) @@ -381,7 +385,7 @@ Trackpad config using [[https://www.mankier.com/4/libinput][libinput]] #+end_src *** desktop environments -Provide Gnome, KDE (plasma) and xfce as desktop environments. exwm is enabled automatically via module. +Provide Gnome, KDE (plasma) and/or xfce as desktop environments. exwm is enabled automatically via module. #+begin_src scheme (service plasma-desktop-service-type) ;; (service gnome-desktop-service-type) @@ -433,14 +437,14 @@ real-time scheduling for the =realtime= group (sound, supercollider, etc) #+end_src *** firmware updates - via fwdup + via fwdup (incomplete) #+BEGIN_SRC emacs-lisp - (simple-service 'fwupd-dbus dbus-root-service-type - (list fwupd-nonfree)) + ;; (simple-service 'fwupd-dbus dbus-root-service-type + ;; (list fwupd-nonfree)) #+END_SRC *** modify desktop services -If gdm is reconfigured (see above) or any other display manager is declared, gdm needs to be removed from =%desktop-services= +If gdm is reconfigured (see above) or any other display manager is declared, gdm needs to be removed from =%desktop-services= #+begin_src scheme ) ;; end services list @@ -505,7 +509,7 @@ Using LUKS for encrypted partitions requires =mapped-devices= (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. +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 @@ -516,20 +520,22 @@ The list of file systems that get mounted. The unique file system identifiers (mount-point "/") (device "/dev/mapper/cryptroot") (type "ext4") - (dependencies mapped-devices)) %base-file-systems)) + (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 + - dd if=/dev/zero of=/swapfile bs=1M count=32768 + - chmod 0600 /swapfile && mkswap /swapfile && swapon + - add "resume=/swapfile" to =kernel-arguments= #+begin_src scheme -;; (swap-devices (list (swap-space -;; (target (file-system-label "swap"))))) - (swap-devices `("/mnt/swapfile")) + (swap-devices (list (swap-space + (target "/swapfile") + (dependencies mapped-devices)))) + #+end_src ** FIN diff --git a/config/framework13-system.scm b/config/framework13-system.scm index f158fb7..a1cadb2 100644 --- a/config/framework13-system.scm +++ b/config/framework13-system.scm @@ -1,6 +1,6 @@ ;; -*- mode: scheme; coding: utf-8; -*- ;; -;; tangled from framework13-system.org on 2024-08-02 11:16:35+02:00) +;; tangled from framework13-system.org on 2024-10-29 11:47:13+01:00) (use-modules (gnu) (gnu packages) @@ -35,7 +35,7 @@ vpn) (define-public linux-FWL13 - (corrupt-linux linux-libre-6.9 + (corrupt-linux linux-libre-6.11 #:name "linux-fwl13" #:configs '("CONFIG_MT7921E=m"))) @@ -51,14 +51,18 @@ #:options '("ctrl:nocaps" "altwin:swap_lalt_lwin"))) - (kernel linux-6.9) + (kernel linux-6.11) ;; (kernel linux-FWL13) ;; (kernel-arguments '("amdgpu.abmlevel=3")) ;; (kernel-arguments '("modprobe.blacklist=hid_sensor_hub")) ;; required prior to 6.7 - (kernel-arguments '("splash" "quiet")) + (kernel-arguments (cons* "resume=/swapfile" + "splash" "quiet") + %default-kernel-arguments) - (firmware (list linux-firmware)) + (firmware (list linux-firmware + amdgpu-firmware + amd-microcode)) ;; (firmware (list amdgpu-firmware ;; amd-microcode ;; realtek-firmware)) @@ -279,8 +283,8 @@ writable = yes (service cups-service-type) - (simple-service 'fwupd-dbus dbus-root-service-type - (list fwupd-nonfree)) + ;; (simple-service 'fwupd-dbus dbus-root-service-type + ;; (list fwupd-nonfree)) ) ;; end services list @@ -326,10 +330,11 @@ writable = yes (mount-point "/") (device "/dev/mapper/cryptroot") (type "ext4") - (dependencies mapped-devices)) %base-file-systems)) + (dependencies mapped-devices)) + %base-file-systems)) -;; (swap-devices (list (swap-space -;; (target (file-system-label "swap"))))) - (swap-devices `("/mnt/swapfile")) + (swap-devices (list (swap-space + (target "/swapfile") + (dependencies mapped-devices)))) ) ;; end operating-system declaration diff --git a/config/home-configuration.org b/config/home-configuration.org index 7737039..da255ce 100644 --- a/config/home-configuration.org +++ b/config/home-configuration.org @@ -65,10 +65,13 @@ Packages that will show up in the home profile under =~/.guix-home/profile= (th "rbw" #+END_SRC *** KDE packages -various features not installed as part of =plasma-desktop-service= +various features not installed as part of =plasma-desktop-service= #+BEGIN_SRC scheme "dolphin-plugins" - "akonadi" + "spectacle" ;; screencapture + "akonadi" ;; PIM + "kamoso" ;; webcam + "okular" ;; doc viewer #+END_SRC *** terminal kitty config located in =dotfiles/.config/kitty/kitty.conf= @@ -82,7 +85,9 @@ kitty config located in =dotfiles/.config/kitty/kitty.conf= "notmuch" #+END_SRC *** graphics +drivers for opengl, opencl, vulkan, etc and some apps #+BEGIN_SRC scheme + "mesa" "mesa-opencl" "vulkan-loader" "vulkan-tools" "scribus" "inkscape" "gimp" @@ -107,6 +112,14 @@ kitty config located in =dotfiles/.config/kitty/kitty.conf= "python" "gcc-toolchain" "git" "git:send-email" + "cryptsetup" + "glances" + "file" +#+END_SRC + +*** research & reading +#+BEGIN_SRC scheme :session + "zotero" #+END_SRC *** network & interconnect @@ -247,7 +260,7 @@ using [[https://syncthing.net/][syncthing]] for local & point-to-point filesync #+END_SRC *** sound - via pipewire which requires dbus (see also [[https://guix.gnu.org/manual/devel/en/html_node/Sound-Home-Services.html][guix manual]]) + via pipewire which requires dbus (see also [[https://guix.gnu.org/manual/devel/en/html_node/Sound-Home-Services.html][guix manual]]) #+BEGIN_SRC scheme (service home-dbus-service-type) @@ -258,7 +271,7 @@ using [[https://syncthing.net/][syncthing]] for local & point-to-point filesync #+END_SRC *** fonts - ( see -> https://guix.gnu.org/manual/devel/en/html_node/Fonts-Home-Services.html) + (see -> https://guix.gnu.org/manual/devel/en/html_node/Fonts-Home-Services.html) #+BEGIN_SRC scheme )) ;; end services diff --git a/config/home-configuration.scm b/config/home-configuration.scm index 98d8ed4..5088de6 100644 --- a/config/home-configuration.scm +++ b/config/home-configuration.scm @@ -1,6 +1,6 @@ ;; -*- mode: scheme; coding: utf-8; -*- ;; -;; tangled from home-configuration.org on 2024-08-02 11:17:18+02:00) +;; tangled from home-configuration.org on 2024-10-29 11:47:07+01:00) (use-modules (gnu) (gnu home) @@ -35,7 +35,10 @@ "rbw" "dolphin-plugins" - "akonadi" + "spectacle" ;; screencapture + "akonadi" ;; PIM + "kamoso" ;; webcam + "okular" ;; doc viewer "kitty" @@ -43,6 +46,7 @@ "getmail6" "notmuch" + "mesa" "mesa-opencl" "vulkan-loader" "vulkan-tools" "scribus" "inkscape" "gimp" @@ -63,6 +67,11 @@ "python" "gcc-toolchain" "git" "git:send-email" + "cryptsetup" + "glances" + "file" + + "zotero" "librewolf" ;; "nyxt"