From bb38c513d577c8444d2bd76c9f334c0cc03609fb Mon Sep 17 00:00:00 2001 From: nik gaffney Date: Thu, 8 Feb 2024 11:13:13 +0100 Subject: [PATCH] Put in earplugs --- config/framework13-system.org | 7 ++- config/framework13-system.scm | 5 +-- config/home-configuration.org | 28 ++++++------ config/home-configuration.scm | 80 ++++++++++++++++++----------------- 4 files changed, 59 insertions(+), 61 deletions(-) diff --git a/config/framework13-system.org b/config/framework13-system.org index 28ccef2..aad5680 100644 --- a/config/framework13-system.org +++ b/config/framework13-system.org @@ -34,7 +34,7 @@ echo ";; -*- mode: scheme; coding: utf-8; -*- (gnu packages emacs-xyz)) #+end_src -Include non-free linux kernel, modules and firmware from the [[https://gitlab.com/nonguix/nonguix/][nonguix channel]] (aka “the guix channel that shall not be named”) +Include non-free linux kernel, modules and firmware from the [[https://gitlab.com/nonguix/nonguix/][nonguix channel]] (aka “The GUIX Channel That Shall Not Be Named”) #+begin_src scheme (use-modules (nongnu packages linux) (nongnu system linux-initrd)) @@ -85,7 +85,7 @@ The =operating-system= declaration (timezone "Europe/Amsterdam") #+end_src -hosts file for local & LAN name resolving and persistent =/etc/hosts= (Note: 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")) @@ -168,7 +168,7 @@ Using =linux-6.7= from nonguix which includes =CONFIG_MT7921E= by default as of #+end_src ** system-wide packages -Packages installed system-wide. Users can also install packages under their own account: use 'guix search KEYWORD' to search for packages and 'guix install PACKAGE' to install a package. +Packages installed system-wide. Users can also install packages under their own account: use =guix search KEYWORD= to search for packages and =guix install PACKAGE= to install a package. #+begin_src scheme (packages @@ -180,7 +180,6 @@ Packages installed system-wide. Users can also install packages under their own "nss-certs" ;; xfce "xfce4-power-manager" - "xfce4-screensaver" "xfce4-settings" "xfce4-session" "xfce4-panel" diff --git a/config/framework13-system.scm b/config/framework13-system.scm index bf2f9ba..75543da 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-02-07 18:15:15+01:00) +;; tangled from framework13-system.org on 2024-02-08 11:11:49+01:00) (use-modules (gnu) (gnu packages) @@ -69,7 +69,7 @@ "audio" "video" "www-data" - "realtime" + "realtime" "lp"))) (user-account (name "www-data") @@ -98,7 +98,6 @@ "nss-certs" ;; xfce "xfce4-power-manager" - "xfce4-screensaver" "xfce4-settings" "xfce4-session" "xfce4-panel" diff --git a/config/home-configuration.org b/config/home-configuration.org index 2833c28..39d7ac8 100644 --- a/config/home-configuration.org +++ b/config/home-configuration.org @@ -24,25 +24,23 @@ echo ";; -*- mode: scheme; coding: utf-8; -*- #+BEGIN_SRC scheme (use-modules (gnu) - (gnu home) - (gnu packages) (gnu services) + (gnu packages) (gnu packages gnupg) (gnu packages shells) - (guix channels) - (guix gexp) + (gnu home) (gnu home services) (gnu home services guix) (gnu home services shells) (gnu home services dotfiles) (gnu home services desktop) (gnu home services sound) - (gnu home services gnupg)) + (gnu home services gnupg) + (guix channels) + (guix gexp)) #+END_SRC -getmail? → (use-service-modules mail) - -Packages that will show up in your Home profile under =~/.guix-home/profile= +Packages that will show up in the home profile under =~/.guix-home/profile= #+BEGIN_SRC scheme (home-environment @@ -84,14 +82,14 @@ Packages that will show up in your Home profile under =~/.guix-home/profile= ))) #+END_SRC -The list of Home services. To search for available services, run 'guix home search KEYWORD' in a terminal. +The list of home services. To search for available services run =guix home search KEYWORD= in a terminal. #+BEGIN_SRC scheme (services (list #+END_SRC -additional channels → nonguix & zzkt +Additional channels → nonguix (aka “The GUIX Channel That Shall Not Be Named”) & zzkt (local particulars) #+BEGIN_SRC scheme (simple-service 'variant-packages-service @@ -101,8 +99,6 @@ additional channels → nonguix & zzkt (name 'nonguix) (url "https://gitlab.com/nonguix/nonguix") (branch "master") - (commit - "fe2fcf125cfc5f7284b24cfac50f37feaf74f7b5") (introduction (make-channel-introduction "897c1a470da759236cc11798f4e0a5f7d4d59fbc" @@ -121,12 +117,14 @@ additional channels → nonguix & zzkt "24A7 4604 91E6 A60F 5BB4 A00F 989F 5E6E DB47 8160")))))) #+END_SRC +#+RESULTS: + environment / variables #+BEGIN_SRC scheme (simple-service 'variant-env-vars-service home-environment-variables-service-type - `(("NOTMUCH_PROFILE" . "$HOME/.config/notmuch/notmuch.conf") + `(("NOTMUCH_PROFILE" . "$XDG_CONFIG_HOME/notmuch/notmuch.conf") ("LD_LIBRARY_PATH" . "$HOME/.guix-profile/lib") ("SHELL" . ,(file-append zsh "/bin/zsh")))) #+END_SRC @@ -140,7 +138,7 @@ 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" . "$HOME/.config/zsh/.history") + '(("HISTFILE" . "$XDG_CONFIG_HOME/zsh/.history") ("HISTSIZE" . "800000") ("SAVEHIST" . "800000"))) (zshenv @@ -170,7 +168,7 @@ dotfiles (see [[https://guix.gnu.org/manual/devel/en/html_node/Essential-Home-Se ssh & sundry (see also [[https://guix.gnu.org/manual/devel/en/html_node/Secure-Shell.html][guix manual]]) #+BEGIN_SRC scheme - + ;; ssh config in 'dotfiles' #+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]]) diff --git a/config/home-configuration.scm b/config/home-configuration.scm index 338c4bb..afc4e43 100644 --- a/config/home-configuration.scm +++ b/config/home-configuration.scm @@ -1,22 +1,22 @@ ;; -*- mode: scheme; coding: utf-8; -*- ;; -;; tangled from home-configuration.org on 2024-02-07 18:41:00+01:00) +;; tangled from home-configuration.org on 2024-02-08 11:12:05+01:00) (use-modules (gnu) - (gnu home) - (gnu packages) (gnu services) + (gnu packages) (gnu packages gnupg) (gnu packages shells) - (guix channels) - (guix gexp) + (gnu home) (gnu home services) (gnu home services guix) (gnu home services shells) (gnu home services dotfiles) (gnu home services desktop) (gnu home services sound) - (gnu home services gnupg)) + (gnu home services gnupg) + (guix channels) + (guix gexp)) (home-environment (packages (specifications->packages @@ -57,46 +57,44 @@ ))) (services - (list + (list - (simple-service 'variant-packages-service - home-channels-service-type - (list - (channel - (name 'nonguix) - (url "https://gitlab.com/nonguix/nonguix") - (branch "master") - (commit - "fe2fcf125cfc5f7284b24cfac50f37feaf74f7b5") - (introduction - (make-channel-introduction - "897c1a470da759236cc11798f4e0a5f7d4d59fbc" - (openpgp-fingerprint - "2A39 3FFF 68F4 EF7A 3D29 12AF 6F51 20A0 22FB B2D5")))) - (channel - (name 'zzkt) - (url "https://gitlab.com/zzkt/guix") - (branch "endless") - (commit - "ef1868ed9bdcf1a49771442e405bd88207b3ab0c") - (introduction - (make-channel-introduction - "fc0ada85de1980e1fc9ee50672d827c0c17c3e7d" - (openpgp-fingerprint - "24A7 4604 91E6 A60F 5BB4 A00F 989F 5E6E DB47 8160")))))) + (simple-service 'variant-packages-service + home-channels-service-type + (list + (channel + (name 'nonguix) + (url "https://gitlab.com/nonguix/nonguix") + (branch "master") + (introduction + (make-channel-introduction + "897c1a470da759236cc11798f4e0a5f7d4d59fbc" + (openpgp-fingerprint + "2A39 3FFF 68F4 EF7A 3D29 12AF 6F51 20A0 22FB B2D5")))) + (channel + (name 'zzkt) + (url "https://gitlab.com/zzkt/guix") + (branch "endless") + (commit + "ef1868ed9bdcf1a49771442e405bd88207b3ab0c") + (introduction + (make-channel-introduction + "fc0ada85de1980e1fc9ee50672d827c0c17c3e7d" + (openpgp-fingerprint + "24A7 4604 91E6 A60F 5BB4 A00F 989F 5E6E DB47 8160")))))) - (simple-service 'variant-env-vars-service - home-environment-variables-service-type - `(("NOTMUCH_PROFILE" . "$HOME/.config/notmuch/notmuch.conf") - ("LD_LIBRARY_PATH" . "$HOME/.guix-profile/lib") - ("SHELL" . ,(file-append zsh "/bin/zsh")))) + (simple-service 'variant-env-vars-service + home-environment-variables-service-type + `(("NOTMUCH_PROFILE" . "$XDG_CONFIG_HOME/notmuch/notmuch.conf") + ("LD_LIBRARY_PATH" . "$HOME/.guix-profile/lib") + ("SHELL" . ,(file-append zsh "/bin/zsh")))) (service home-zsh-service-type (home-zsh-configuration ;; configs in $XDG_CONFIG_HOME/zsh (xdg-flavor? #t) (environment-variables - '(("HISTFILE" . "$HOME/.config/zsh/.history") + '(("HISTFILE" . "$XDG_CONFIG_HOME/zsh/.history") ("HISTSIZE" . "800000") ("SAVEHIST" . "800000"))) (zshenv @@ -114,10 +112,14 @@ (home-dotfiles-configuration (directories (list "dotfiles")))) + ;; ssh config in 'dotfiles' + (service home-dbus-service-type) (service home-pipewire-service-type (home-pipewire-configuration (enable-pulseaudio? #t))) - ))) ;; end home-environment + + + ))) ;; end home-environment