diff options
author | Marek Paśnikowski <marekpasnikowski@protonmail.com> | 2022-11-22 12:35:43 +0100 |
---|---|---|
committer | Marek Paśnikowski <marek@marekpasnikowski.pl> | 2022-11-22 12:35:43 +0100 |
commit | 356f0df3986a805d5621f36617761ca78e65d4d3 (patch) | |
tree | 93198368567124042f84749b764771a924b8ff86 /home-configuration.scm | |
parent | 7873461b94dd1af575760d874d840464560294a4 (diff) |
Reintegrate Guix Home
Diffstat (limited to 'home-configuration.scm')
-rw-r--r-- | home-configuration.scm | 175 |
1 files changed, 58 insertions, 117 deletions
diff --git a/home-configuration.scm b/home-configuration.scm index 5f98cf6..6752968 100644 --- a/home-configuration.scm +++ b/home-configuration.scm @@ -6,53 +6,12 @@ #:use-module (gnu services) #:use-module (guix gexp)) -(define list-to-package-output - (compose list - specification->package+output)) - -(define home-packages - '("cpupower" - "dconf-editor" - "emacs" - "emacs-aggressive-indent" - "emacs-guix" - "emacs-iedit" - "emacs-multiple-cursors" - "font-google-noto" - "git" - "git-lfs" - "gnome-shell-extension-forge" - "gnome-tweaks" - "gnupg" - "guile" - "guile-spec" - "icecat" - "icedove" - "jami" - "libreoffice" - "newsboat" - "pwgen" - "seahorse" - "sicp" - "trezor-agent" - "unzip" - "zip")) - -(define packages - (map list-to-package-output - home-packages)) +(define allow-downgrades + "--allow-downgrades ") (define config-prefix "/home/marek/src/guix-config/") -(define home-env-vars - '(("EDITOR" . "emacs") - ("NVM_DIR" . "$HOME/src/nvm") - ("GUILE_AUTO_COMPILE" . "0"))) - -(define allow-downgrades - "--allow-downgrades ") - (define pull-guix "guix pull ") @@ -108,77 +67,59 @@ and reconfigure-home-)) -(define home-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-))) - -(define bash-profile-target - (string-append config-prefix - ".bash_profile")) - -(define bash-profile - (local-file bash-profile-target - "bash_profile")) - -(define home-bash-profile - `(,bash-profile)) - -(define bashrc-target - (string-append config-prefix - ".bashrc")) - -(define bashrc - (local-file bashrc-target - "bashrc")) - -(define home-bashrc - `(,bashrc)) - -(define bash-configuration - (home-bash-configuration (environment-variables home-env-vars) - (aliases home-aliases) - (bash-profile home-bash-profile) - (bashrc home-bashrc))) - -(define home-bash-service - (service home-bash-service-type - bash-configuration)) - -(define emacs-init - (local-file "emacs.el")) - -(define git-config - (local-file "git.config")) - -(define gsad-source - (local-file "guix-shell-authorized-directories")) - -(define ssh-config - (local-file "ssh.config")) - -(define home-files - `((".config/git/config" ,git-config) - (".config/guix/shell-authorized-directories" ,gsad-source) - (".emacs" ,emacs-init) - (".ssh/config" ,ssh-config))) - -(define configuration-files-service - (simple-service 'configuration-files - home-files-service-type - home-files)) - -(define services - `(,home-bash-service - ,configuration-files-service)) - -(home-environment (packages packages) - (services services)) +(home-environment + (packages (map (compose list + specification->package+output) + '("cpupower" + "dconf-editor" + "emacs" + "emacs-aggressive-indent" + "font-google-noto" + "git" + "git-lfs" + "gnome-shell-extension-forge" + "gnome-tweaks" + "gnupg" + "guile" + "guile-spec" + "icecat" + "icedove" + "jami" + "libreoffice" + "newsboat" + "pwgen" + "seahorse" + "sicp" + "trezor-agent" + "unzip" + "zip"))) + (services + `(,(service home-bash-service-type + (home-bash-configuration + (environment-variables '(("EDITOR" . "emacs") + ("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 (string-append config-prefix + ".bash_profile") + "bash_profile"))) + (bashrc `(,(local-file (string-append config-prefix + ".bashrc") + "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")) + (".ssh/config" ,(local-file "ssh.config"))))))) |