From 67e911d42f748d5ebfa8a74c820f309f8a368c0b Mon Sep 17 00:00:00 2001 From: Marek Paśnikowski Date: Fri, 3 Feb 2023 22:10:39 +0100 Subject: Reindent Home Configuration --- aisaka.org | 280 ++++++++++++++++++++++++------------------------- home-configuration.scm | 26 ++--- 2 files changed, 153 insertions(+), 153 deletions(-) diff --git a/aisaka.org b/aisaka.org index 511c4a2..167cefc 100644 --- a/aisaka.org +++ b/aisaka.org @@ -90,146 +90,146 @@ https://guix.gnu.org/en/manual/devel/en/html_node/System-Configuration.html https://guix.gnu.org/en/manual/devel/en/html_node/Home-Configuration.html #+begin_src scheme :noweb-ref home-dump :tangle home-configuration.scm -(add-to-load-path "./services") - -(define-module (aisaka-home-configuration) - #:use-module (gnu home) - #:use-module (gnu home services) - #:use-module (gnu home services shells) - #:use-module (gnu packages) - #:use-module (gnu services) - #:use-module (guix gexp) - #:use-module (ssh-server)) - -(define allow-downgrades - "--allow-downgrades ") - -(define config-prefix - "/home/marek/src/guix-config/") - -(define pull-guix - "guix pull ") - -(define pull-guix- - (string-append pull-guix - allow-downgrades - "--disable-authentication ")) - -(define guix-home - "guix home reconfigure ") - -(define home-configuration - "home-configuration.scm ") - -(define reconfigure-home - (string-append guix-home - config-prefix - home-configuration)) - -(define reconfigure-home- - (string-append reconfigure-home - allow-downgrades)) - -(define guix-system - "sudo guix system reconfigure ") - -(define system-configuration - "system-configuration.scm ") - -(define reconfigure-system - (string-append guix-system - config-prefix - system-configuration)) - -(define reconfigure-system- - (string-append reconfigure-system - allow-downgrades)) - -(define and - "&& ") - -(define system-update - (string-append pull-guix - and - reconfigure-system - and - reconfigure-home)) - -(define system-update- - (string-append pull-guix- - and - reconfigure-system- - and - reconfigure-home-)) - -(home-environment - (packages - (map - <> - '("adwaita-icon-theme" - "alacritty" - "clamav" - "cpupower" - "dconf-editor" - "dmenu" - "emacs" - "emacs-aggressive-indent" - "emacs-eldoc" - "emacs-geiser" - "emacs-geiser-guile" - "emacs-nov-el" - "emacs-org-auto-tangle" - "emacs-org-contacts" - "emacs-org-contrib" - "font-google-noto" - "git" - "git-lfs" - "gnome-tweaks" - "gnupg" - "guile" - "guile-spec" - "hicolor-icon-theme" - "icecat" - "jami" - "libadwaita" - "libreoffice" - "nm-tray" - "pwgen" - "seahorse" - "sicp" - "strace" - "trezor-agent" - "unzip" - "zip"))) - (services - (list - <> - ssh-configuration - (service home-bash-service-type - (home-bash-configuration - (environment-variables '(("EDITOR" . "emacs -nw") - ("LIBGL_ALWAYS_SOFTWARE" . "1") - ("NVM_DIR" . "$HOME/src/nvm") - ("GUILE_AUTO_COMPILE" . "0"))) - (aliases `(("grep" . "grep --color=auto ") - ("ll" . "ls -l ") - ("ls" . "ls -p --color=auto ") - ("pull-guix" . ,pull-guix) - ("pull-guix-" . ,pull-guix-) - ("reconfigure-home" . ,reconfigure-home) - ("reconfigure-home-" . ,reconfigure-home-) - ("reconfigure-system" . ,reconfigure-system) - ("reconfigure-system-" . ,reconfigure-system-) - ("system-update" . ,system-update) - ("system-update-" . ,system-update-))) - (bash-profile `(,(local-file "bash_profile"))) - (bashrc `(,(local-file "bashrc"))))) - (simple-service 'configuration-files - home-files-service-type - `((".config/git/config" ,(local-file "git.config")) - (".config/guix/shell-authorized-directories" - ,(local-file "guix-shell-authorized-directories")) - (".emacs" ,(local-file "emacs.el"))))))) + (add-to-load-path "./services") + + (define-module (aisaka-home-configuration) + #:use-module (gnu home) + #:use-module (gnu home services) + #:use-module (gnu home services shells) + #:use-module (gnu packages) + #:use-module (gnu services) + #:use-module (guix gexp) + #:use-module (ssh-server)) + + (define allow-downgrades + "--allow-downgrades ") + + (define config-prefix + "/home/marek/src/guix-config/") + + (define pull-guix + "guix pull ") + + (define pull-guix- + (string-append pull-guix + allow-downgrades + "--disable-authentication ")) + + (define guix-home + "guix home reconfigure ") + + (define home-configuration + "home-configuration.scm ") + + (define reconfigure-home + (string-append guix-home + config-prefix + home-configuration)) + + (define reconfigure-home- + (string-append reconfigure-home + allow-downgrades)) + + (define guix-system + "sudo guix system reconfigure ") + + (define system-configuration + "system-configuration.scm ") + + (define reconfigure-system + (string-append guix-system + config-prefix + system-configuration)) + + (define reconfigure-system- + (string-append reconfigure-system + allow-downgrades)) + + (define and + "&& ") + + (define system-update + (string-append pull-guix + and + reconfigure-system + and + reconfigure-home)) + + (define system-update- + (string-append pull-guix- + and + reconfigure-system- + and + reconfigure-home-)) + + (home-environment + (packages + (map + <> + '("adwaita-icon-theme" + "alacritty" + "clamav" + "cpupower" + "dconf-editor" + "dmenu" + "emacs" + "emacs-aggressive-indent" + "emacs-eldoc" + "emacs-geiser" + "emacs-geiser-guile" + "emacs-nov-el" + "emacs-org-auto-tangle" + "emacs-org-contacts" + "emacs-org-contrib" + "font-google-noto" + "git" + "git-lfs" + "gnome-tweaks" + "gnupg" + "guile" + "guile-spec" + "hicolor-icon-theme" + "icecat" + "jami" + "libadwaita" + "libreoffice" + "nm-tray" + "pwgen" + "seahorse" + "sicp" + "strace" + "trezor-agent" + "unzip" + "zip"))) + (services + (list + <> + ssh-configuration + (service home-bash-service-type + (home-bash-configuration + (environment-variables '(("EDITOR" . "emacs -nw") + ("LIBGL_ALWAYS_SOFTWARE" . "1") + ("NVM_DIR" . "$HOME/src/nvm") + ("GUILE_AUTO_COMPILE" . "0"))) + (aliases `(("grep" . "grep --color=auto ") + ("ll" . "ls -l ") + ("ls" . "ls -p --color=auto ") + ("pull-guix" . ,pull-guix) + ("pull-guix-" . ,pull-guix-) + ("reconfigure-home" . ,reconfigure-home) + ("reconfigure-home-" . ,reconfigure-home-) + ("reconfigure-system" . ,reconfigure-system) + ("reconfigure-system-" . ,reconfigure-system-) + ("system-update" . ,system-update) + ("system-update-" . ,system-update-))) + (bash-profile `(,(local-file "bash_profile"))) + (bashrc `(,(local-file "bashrc"))))) + (simple-service 'configuration-files + home-files-service-type + `((".config/git/config" ,(local-file "git.config")) + (".config/guix/shell-authorized-directories" + ,(local-file "guix-shell-authorized-directories")) + (".emacs" ,(local-file "emacs.el"))))))) #+end_src * TODO LIBREBOOT diff --git a/home-configuration.scm b/home-configuration.scm index c30a7c9..02a3713 100644 --- a/home-configuration.scm +++ b/home-configuration.scm @@ -124,12 +124,12 @@ (default-value #f))) ssh-configuration (service home-bash-service-type - (home-bash-configuration - (environment-variables '(("EDITOR" . "emacs -nw") - ("LIBGL_ALWAYS_SOFTWARE" . "1") - ("NVM_DIR" . "$HOME/src/nvm") - ("GUILE_AUTO_COMPILE" . "0"))) - (aliases `(("grep" . "grep --color=auto ") + (home-bash-configuration + (environment-variables '(("EDITOR" . "emacs -nw") + ("LIBGL_ALWAYS_SOFTWARE" . "1") + ("NVM_DIR" . "$HOME/src/nvm") + ("GUILE_AUTO_COMPILE" . "0"))) + (aliases `(("grep" . "grep --color=auto ") ("ll" . "ls -l ") ("ls" . "ls -p --color=auto ") ("pull-guix" . ,pull-guix) @@ -140,11 +140,11 @@ ("reconfigure-system-" . ,reconfigure-system-) ("system-update" . ,system-update) ("system-update-" . ,system-update-))) - (bash-profile `(,(local-file "bash_profile"))) - (bashrc `(,(local-file "bashrc"))))) + (bash-profile `(,(local-file "bash_profile"))) + (bashrc `(,(local-file "bashrc"))))) (simple-service 'configuration-files - home-files-service-type - `((".config/git/config" ,(local-file "git.config")) - (".config/guix/shell-authorized-directories" - ,(local-file "guix-shell-authorized-directories")) - (".emacs" ,(local-file "emacs.el"))))))) + home-files-service-type + `((".config/git/config" ,(local-file "git.config")) + (".config/guix/shell-authorized-directories" + ,(local-file "guix-shell-authorized-directories")) + (".emacs" ,(local-file "emacs.el"))))))) -- cgit v1.2.3