From 02cdb798288a79e77e2b42f712c64b758de22499 Mon Sep 17 00:00:00 2001 From: nik gaffney Date: Tue, 19 Mar 2024 15:14:46 +0100 Subject: [PATCH] Put in earplugs --- config/home-configuration.org | 38 ++++++++++++++++++++--------------- config/home-configuration.scm | 35 +++++++++++++++++--------------- 2 files changed, 41 insertions(+), 32 deletions(-) diff --git a/config/home-configuration.org b/config/home-configuration.org index 6787b96..455fee5 100644 --- a/config/home-configuration.org +++ b/config/home-configuration.org @@ -24,11 +24,11 @@ echo ";; -*- mode: scheme; coding: utf-8; -*- #+BEGIN_SRC scheme (use-modules (gnu) + (gnu home) (gnu services) (gnu packages) (gnu packages gnupg) (gnu packages shells) - (gnu home) (gnu home services) (gnu home services guix) (gnu home services shells) @@ -67,18 +67,18 @@ Packages that will show up in the home profile under =~/.guix-home/profile= #+END_SRC *** KDE packages #+BEGIN_SRC scheme - "kmail" - "krunner" - "akonadi" + ;; "kmail" + ;; "krunner" + ;; "akonadi" #+END_SRC *** terminal kitty config is in =dotfiles/kitty/kitty.conf= #+BEGIN_SRC scheme - ;; "kitty-next" "kitty" #+END_SRC *** Mail #+BEGIN_SRC scheme + "icedove" ;; aka thunderbird "getmail6" "notmuch" #+END_SRC @@ -176,7 +176,7 @@ Additional channels → nonguix (aka “The GUIX Channel That Shall Not Be Named (simple-service 'variant-env-vars-service home-environment-variables-service-type `(("GUIX_LOCPATH" . "$HOME/.guix-profile/lib/locale") - ("NOTMUCH_PROFILE" . "$XDG_CONFIG_HOME/notmuch/notmuch.conf") + ("NOTMUCH_CONFIG" . "$XDG_CONFIG_HOME/notmuch/notmuch.conf") ("LD_LIBRARY_PATH" . "$HOME/.guix-profile/lib") ("GPG_TTY" . "$TTY") ("SHELL" . ,(file-append zsh "/bin/zsh")))) @@ -194,11 +194,14 @@ zsh (and/or completions and/or [[https://lists.gnu.org/archive/html/help-guix/20 (environment-variables '(("HISTFILE" . "$XDG_CONFIG_HOME/zsh/.history") ("HISTSIZE" . "800000") - ("SAVEHIST" . "800000"))) - (zshenv - (list (local-file ".zshenv" "zshenv"))) - (zshrc - (list (local-file ".zshrc" "zshrc"))))) + ("SAVEHIST" . "800000"))))) + #+END_SRC +the zsh dotfiles are managed by =home-dotfiles-service= for now. +#+BEGIN_SRC scheme + ;; (zshenv + ;; (list (local-file ".zshenv" "zshenv"))) + ;; (zshrc + ;; (list (local-file ".zshrc" "zshrc"))))) #+END_SRC *** gnupg @@ -212,16 +215,19 @@ zsh (and/or completions and/or [[https://lists.gnu.org/archive/html/help-guix/20 #+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]]) #+BEGIN_SRC scheme - (service home-dotfiles-service-type - (home-dotfiles-configuration - (directories (list "dotfiles")))) + (service home-dotfiles-service-type + (home-dotfiles-configuration + (layout 'plain) + (directories (list "dotfiles")) + (excluded + '(".*~" ".*\\.swp" "\\.git" "\\.gitignore" ".zshenv")))) #+END_SRC *** ssh & sundry -(see also [[https://guix.gnu.org/manual/devel/en/html_node/Secure-Shell.html][guix manual]]) + (see also [[https://guix.gnu.org/manual/devel/en/html_node/Secure-Shell.html][guix manual]]) #+BEGIN_SRC scheme ;; ssh config in 'dotfiles' diff --git a/config/home-configuration.scm b/config/home-configuration.scm index b254804..a839fcf 100644 --- a/config/home-configuration.scm +++ b/config/home-configuration.scm @@ -1,13 +1,13 @@ ;; -*- mode: scheme; coding: utf-8; -*- ;; -;; tangled from home-configuration.org on 2024-03-07 15:41:27+01:00) +;; tangled from home-configuration.org on 2024-03-19 15:08:39+01:00) (use-modules (gnu) + (gnu home) (gnu services) (gnu packages) (gnu packages gnupg) (gnu packages shells) - (gnu home) (gnu home services) (gnu home services guix) (gnu home services shells) @@ -21,7 +21,6 @@ (home-environment (packages (specifications->packages (list - "nordic-theme" "firefox" "emacs-guix" @@ -35,13 +34,13 @@ "tree" "password-store" - "kmail" - "krunner" - "akonadi" + ;; "kmail" + ;; "krunner" + ;; "akonadi" - ;; "kitty-next" "kitty" + "icedove" ;; aka thunderbird "getmail6" "notmuch" @@ -109,7 +108,7 @@ (simple-service 'variant-env-vars-service home-environment-variables-service-type `(("GUIX_LOCPATH" . "$HOME/.guix-profile/lib/locale") - ("NOTMUCH_PROFILE" . "$XDG_CONFIG_HOME/notmuch/notmuch.conf") + ("NOTMUCH_CONFIG" . "$XDG_CONFIG_HOME/notmuch/notmuch.conf") ("LD_LIBRARY_PATH" . "$HOME/.guix-profile/lib") ("GPG_TTY" . "$TTY") ("SHELL" . ,(file-append zsh "/bin/zsh")))) @@ -121,11 +120,12 @@ (environment-variables '(("HISTFILE" . "$XDG_CONFIG_HOME/zsh/.history") ("HISTSIZE" . "800000") - ("SAVEHIST" . "800000"))) - (zshenv - (list (local-file ".zshenv" "zshenv"))) - (zshrc - (list (local-file ".zshrc" "zshrc"))))) + ("SAVEHIST" . "800000"))))) + + ;; (zshenv + ;; (list (local-file ".zshenv" "zshenv"))) + ;; (zshrc + ;; (list (local-file ".zshrc" "zshrc"))))) (service home-gpg-agent-service-type (home-gpg-agent-configuration @@ -133,9 +133,12 @@ (file-append pinentry-qt "/bin/pinentry-qt")) (ssh-support? #t))) - (service home-dotfiles-service-type - (home-dotfiles-configuration - (directories (list "dotfiles")))) + (service home-dotfiles-service-type + (home-dotfiles-configuration + (layout 'plain) + (directories (list "dotfiles")) + (excluded + '(".*~" ".*\\.swp" "\\.git" "\\.gitignore" ".zshenv")))) ;; ssh config in 'dotfiles'