diff options
Diffstat (limited to 'oni/home/config/pop-os.scm')
| -rw-r--r-- | oni/home/config/pop-os.scm | 133 |
1 files changed, 43 insertions, 90 deletions
diff --git a/oni/home/config/pop-os.scm b/oni/home/config/pop-os.scm index 734ae67..fd9a8b8 100644 --- a/oni/home/config/pop-os.scm +++ b/oni/home/config/pop-os.scm @@ -24,11 +24,7 @@ #:use-module ((guix gexp) #:select (local-file mixed-text-file)) - #:use-module ((oni home config common) - #:select (home-channels-service - home-zsh-service - home-kitty-service - foreign-distro-compatibility-packages)) + #:use-module (oni home config common) #:use-module ((oni home services dunst) #:select (home-dunst-default-service)) #:use-module ((oni home services emacs) @@ -63,7 +59,6 @@ ;; home-stumpwm-pamixer-service-type ;; home-stumpwm-pamixer-configuration)) #:use-module (oni home services xdisorg) - #:use-module (oni home services zsh) #:use-module (oni packages emacs) #:use-module ((oni packages emacs-config) #:select (emacs-oni-bookmark @@ -112,49 +107,6 @@ (services home-module-services (default '()))) -(define oni-home-zsh-configuration - (home-module - (services (list home-zsh-service - ;; This has to be the first extension because it needs to be added to the - ;; configuration last. - (service home-zsh-syntax-highlighting-service-type) - (service home-zsh-autosuggestions-service-type) - (service home-zsh-contextual-abbrevs-service-type) - (service home-zsh-atuin-service-type - (home-zsh-atuin-configuration - (inline-height 20) - (filter-mode 'directory) - (history-filter - '("^ +")) - (enter-accept #t) - (common-subcommands - '("guix" - "guix home" - "nala" - "apt" - "cargo" - "composer" - "dnf" - "docker" - "docker-compose" - "docker compose" - "git" - "go" - "ip" - "kubectl" - "nix" - "nmcli" - "npm" - "pecl" - "pnpm" - "podman" - "port" - "systemctl" - "tmux" - "yarn")) - (sync-address "http://phoenix.fold-kanyu.ts.net:8888") - (search-mode "skim"))))))) - (define oni-home-herbstluftwm-configuration (home-module (packages (list hlwm-run-or-raise)) @@ -259,7 +211,6 @@ (apply append (map home-module-services modules))))) (home-modules->home-environment - oni-home-zsh-configuration oni-home-herbstluftwm-configuration (home-module (packages (append @@ -320,48 +271,50 @@ emacs-rainbow-identifiers emacs-vundo))) - (services (list home-channels-service - home-dunst-default-service - home-environment-service - home-kitty-service - home-rofi-default-service + (services (append + oni-home-zsh-services + (list home-channels-service + home-dunst-default-service + home-environment-service + home-kitty-service + home-rofi-default-service - (service home-emacs-service-type - (home-emacs-configuration - (helpful-configuration - (home-emacs-helpful-configuration - (configurations - (list - (local-file "../services/emacs/oni-helpful.el"))))) - (yasnippet-capf - (home-emacs-yasnippet-capf-configuration)) - (envrc - (home-emacs-envrc-configuration)) - (configurations - (list - (local-file "../services/emacs/init.el") - (local-file "pop-os/emacs.el") - (mixed-text-file - "init.el" - "(with-eval-after-load 'project (require 'oni-project))\n" - "(require 'oni-gui)\n" - "(provide 'oni-gnus)\n" - "(add-to-list 'auto-mode-alist '(\"\\.vue$\" . web-mode))\n"))))) - (service home-emacs-org-journal-service-type) - (service home-wakatime-service-type - (home-wakatime-configuration - (api-url "https://waka.ryuslash.org/api") - (exclude '("^COMMIT_EDITMSG$" - "^TAG_EDITMSG$")))) - (service home-emacs-vterm-service-type - (home-emacs-vterm-configuration - (buffer-name-string "*vterm* %s"))) + (service home-emacs-service-type + (home-emacs-configuration + (helpful-configuration + (home-emacs-helpful-configuration + (configurations + (list + (local-file "../services/emacs/oni-helpful.el"))))) + (yasnippet-capf + (home-emacs-yasnippet-capf-configuration)) + (envrc + (home-emacs-envrc-configuration)) + (configurations + (list + (local-file "../services/emacs/init.el") + (local-file "pop-os/emacs.el") + (mixed-text-file + "init.el" + "(with-eval-after-load 'project (require 'oni-project))\n" + "(require 'oni-gui)\n" + "(provide 'oni-gnus)\n" + "(add-to-list 'auto-mode-alist '(\"\\.vue$\" . web-mode))\n"))))) + (service home-emacs-org-journal-service-type) + (service home-wakatime-service-type + (home-wakatime-configuration + (api-url "https://waka.ryuslash.org/api") + (exclude '("^COMMIT_EDITMSG$" + "^TAG_EDITMSG$")))) + (service home-emacs-vterm-service-type + (home-emacs-vterm-configuration + (buffer-name-string "*vterm* %s"))) - (service home-flameshot-service-type) - (service home-mbsync-service-type) + (service home-flameshot-service-type) + (service home-mbsync-service-type) - (service home-gpg-agent-service-type - (home-gpg-agent-configuration + (service home-gpg-agent-service-type + (home-gpg-agent-configuration (ssh-support? #t) (extra-content - "allow-emacs-pinentry\n"))))))) + "allow-emacs-pinentry\n")))))))) |