From d22a11448e9d1c5d653b43c8b7f79e30706d8afd Mon Sep 17 00:00:00 2001 From: nik gaffney Date: Sun, 14 Apr 2024 13:48:11 +0200 Subject: [PATCH] Put in earplugs --- config/framework13-system.org | 23 +++++++++++------------ config/framework13-system.scm | 17 ++++++++--------- config/home-configuration.org | 26 +++++++++++++++----------- config/home-configuration.scm | 22 +++++++++++++--------- 4 files changed, 47 insertions(+), 41 deletions(-) diff --git a/config/framework13-system.org b/config/framework13-system.org index 4a2c9c7..4a75744 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.7 + (corrupt-linux linux-libre-6.8 #:name "linux-fwl13" #:configs '("CONFIG_MT7921E=m"))) #+end_src @@ -115,14 +115,15 @@ Kernel & driver details Using =linux-6.7= from nonguix (which includes =CONFIG_MT7921E= by default as of 6.7.2) #+begin_src scheme - (kernel linux-6.7) ;; previously (kernel linux-FWL13) + (kernel linux-6.8) + ;; (kernel linux-FWL13) #+end_src testing [[https://community.frame.work/t/adaptive-backlight-management-abm/41055][Adaptive Backlight Management (ABM)]] #+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 '("splash" "quiet")) #+END_SRC …and required firmware (should be possible to reduce to specifics) @@ -191,7 +192,6 @@ Packages installed system-wide. Users can also install packages under their own "xfce4-session" "xfce4-panel" ;; gnome extras - "gnome-tweaks" "gvfs" ; sddm "chili-sddm-theme" @@ -202,7 +202,7 @@ Packages installed system-wide. Users can also install packages under their own #+end_src ** system services -Below is the list of enabled system services. To search for any available services, run 'guix system search KEYWORD' in a terminal. +Below is the list of enabled system services. To search for any available services, run =guix system search KEYWORD= in a terminal. #+begin_src scheme (services @@ -222,15 +222,14 @@ Below is the list of enabled system services. To search for any available servi *** mail use dovecot for local IMAP -#+begin_src scheme +#+begin_src scheme (service dovecot-service-type (dovecot-configuration (mail-location "maildir:%h/Maildir:LAYOUT=fs"))) #+end_src *** iptables - =iptables= configuration to allow SSH on port 22, IMAPS on 993, wireguard (wg0), mDNS and local smb for 192.168.0.0/16 #+BEGIN_SRC scheme :session @@ -375,10 +374,10 @@ Trackpad config using [[https://www.mankier.com/4/libinput][libinput]] *** desktop environments Provide Gnome, KDE (plasma) and xfce as desktop environments. exwm is enabled automatically via module. #+begin_src scheme - ;; (service plasma-desktop-service-type) + (service plasma-desktop-service-type) ;; (service gnome-desktop-service-type) ;; (service xfce-desktop-service-type) - (service lxqt-desktop-service-type) + ;; (service lxqt-desktop-service-type) #+end_src *** file sharing @@ -479,11 +478,11 @@ initrd with AMD microcode blobs #+end_src ** swap device - + % swapon --show +% swapon -L swap #+begin_src scheme (swap-devices (list (swap-space - (target (uuid - "e7cc2ca5-169a-4511-865f-d2d7ed72c05c"))))) + (target (file-system-label "swap"))))) #+end_src ** file systems & mount points diff --git a/config/framework13-system.scm b/config/framework13-system.scm index abfaec4..585668f 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-03-07 16:38:09+01:00) +;; tangled from framework13-system.org on 2024-04-14 13:37:25+02:00) (use-modules (gnu) (gnu packages) @@ -35,7 +35,7 @@ vpn) (define-public linux-FWL13 - (corrupt-linux linux-libre-6.7 + (corrupt-linux linux-libre-6.8 #:name "linux-fwl13" #:configs '("CONFIG_MT7921E=m"))) @@ -51,11 +51,12 @@ #:options '("ctrl:nocaps" "altwin:swap_lalt_lwin"))) - (kernel linux-6.7) ;; previously (kernel linux-FWL13) + (kernel linux-6.8) + ;; (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 '("splash" "quiet")) (firmware (list linux-firmware)) ;; (firmware (list amdgpu-firmware @@ -106,7 +107,6 @@ "xfce4-session" "xfce4-panel" ;; gnome extras - "gnome-tweaks" "gvfs" ; sddm "chili-sddm-theme" @@ -239,10 +239,10 @@ COMMIT Option \"AccelProfile\" \"adaptive\" EndSection")))))) - ;; (service plasma-desktop-service-type) + (service plasma-desktop-service-type) ;; (service gnome-desktop-service-type) ;; (service xfce-desktop-service-type) - (service lxqt-desktop-service-type) + ;; (service lxqt-desktop-service-type) (service samba-service-type (samba-configuration @@ -305,8 +305,7 @@ writable = yes (keyboard-layout keyboard-layout))) (swap-devices (list (swap-space - (target (uuid - "e7cc2ca5-169a-4511-865f-d2d7ed72c05c"))))) + (target (file-system-label "swap"))))) (file-systems (cons* (file-system (mount-point "/boot/efi") diff --git a/config/home-configuration.org b/config/home-configuration.org index 514f464..1fbbb92 100644 --- a/config/home-configuration.org +++ b/config/home-configuration.org @@ -43,7 +43,7 @@ echo ";; -*- mode: scheme; coding: utf-8; -*- * home environment ** packages -Packages that will show up in the home profile under =~/.guix-home/profile= +Packages that will show up in the home profile under =~/.guix-home/profile= (this setup might make more sense split into several composible profiles or project based manifest files) #+BEGIN_SRC scheme (home-environment @@ -57,11 +57,12 @@ Packages that will show up in the home profile under =~/.guix-home/profile= "libreoffice" "rsync" "gnupg" - "rbw" "crda" "htop" "tree" "password-store" + "tomb" + "rbw" #+END_SRC *** KDE packages various features not installed as part of =plasma-desktop-service= @@ -95,6 +96,8 @@ kitty config located in =dotfiles/.config/kitty/kitty.conf= "audacity" "qpwgraph" "patchage" + "aubio" + "ffmpeg" #+END_SRC *** programming, dev & ops #+BEGIN_SRC scheme :session @@ -108,7 +111,7 @@ kitty config located in =dotfiles/.config/kitty/kitty.conf= *** network & interconnect #+BEGIN_SRC scheme - "firefox" + "librewolf" ;; "nyxt" "nextcloud-client" "nmap" @@ -194,16 +197,16 @@ zsh (and/or completions and/or [[https://lists.gnu.org/archive/html/help-guix/20 ;; configs in $XDG_CONFIG_HOME/zsh (xdg-flavor? #t) (environment-variables - '(("HISTFILE" . "$XDG_CONFIG_HOME/zsh/.history") + '(("HISTFILE" . "$HOME/.config/zsh/.history") ("HISTSIZE" . "800000") ("SAVEHIST" . "800000"))))) #+END_SRC -the zsh dotfiles are managed by =home-dotfiles-service= for now. +the zsh dotfiles are added manually rather than using dotfiles-service (duplicate errors when managed by =home-dotfiles-service= ) #+BEGIN_SRC scheme - ;; (zshenv - ;; (list (local-file ".zshenv" "zshenv"))) - ;; (zshrc - ;; (list (local-file ".zshrc" "zshrc"))))) + (zshenv + (list (local-file "dotfiles/.config/zsh/.zshenv" "zshenv"))) + (zshrc + (list (local-file "dotfiles/.config/zsh/.zshrc" "zshrc"))))) #+END_SRC *** gnupg @@ -217,7 +220,7 @@ the zsh dotfiles are managed by =home-dotfiles-service= for now. #+END_SRC *** dotfiles - (see [[https://guix.gnu.org/manual/devel/en/html_node/Essential-Home-Services.html][guix docs]]) + (see [[https://guix.gnu.org/manual/devel/en/html_node/Essential-Home-Services.html][guix docs]] and note about zsh config) #+BEGIN_SRC scheme (service home-dotfiles-service-type @@ -225,7 +228,8 @@ the zsh dotfiles are managed by =home-dotfiles-service= for now. (layout 'plain) (directories (list "dotfiles")) (excluded - '(".*~" ".*\\.swp" "\\.git" "\\.gitignore" ".zshenv")))) + '(".*~" ".*\\.swp" "\\.git" "\\.gitignore" + ".zshenv" ".zshrc")))) #+END_SRC *** ssh & sundry diff --git a/config/home-configuration.scm b/config/home-configuration.scm index 9e3770e..9231451 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-03-19 23:04:17+01:00) +;; tangled from home-configuration.org on 2024-04-14 13:47:30+02:00) (use-modules (gnu) (gnu home) @@ -27,11 +27,12 @@ "libreoffice" "rsync" "gnupg" - "rbw" "crda" "htop" "tree" "password-store" + "tomb" + "rbw" "dolphin-plugins" "akonadi" @@ -53,6 +54,8 @@ "audacity" "qpwgraph" "patchage" + "aubio" + "ffmpeg" "guile" "sbcl" @@ -61,7 +64,7 @@ "gcc-toolchain" "git" "git:send-email" - "firefox" + "librewolf" ;; "nyxt" "nextcloud-client" "nmap" @@ -120,14 +123,14 @@ ;; configs in $XDG_CONFIG_HOME/zsh (xdg-flavor? #t) (environment-variables - '(("HISTFILE" . "$XDG_CONFIG_HOME/zsh/.history") + '(("HISTFILE" . "$HOME/.config/zsh/.history") ("HISTSIZE" . "800000") ("SAVEHIST" . "800000"))))) - ;; (zshenv - ;; (list (local-file ".zshenv" "zshenv"))) - ;; (zshrc - ;; (list (local-file ".zshrc" "zshrc"))))) + (zshenv + (list (local-file "dotfiles/.config/zsh/.zshenv" "zshenv"))) + (zshrc + (list (local-file "dotfiles/.config/zsh/.zshrc" "zshrc"))))) (service home-gpg-agent-service-type (home-gpg-agent-configuration @@ -140,7 +143,8 @@ (layout 'plain) (directories (list "dotfiles")) (excluded - '(".*~" ".*\\.swp" "\\.git" "\\.gitignore" ".zshenv")))) + '(".*~" ".*\\.swp" "\\.git" "\\.gitignore" + ".zshenv" ".zshrc")))) ;; ssh config in 'dotfiles'