From 3084d6586919cf4129548cd59321553e3faffb04 Mon Sep 17 00:00:00 2001 From: Renken Date: Fri, 9 Sep 2022 17:57:30 +0200 Subject: home: custom packages list for foreign distros Running on GNU/Linux Debian testing for example allows me to have access to more up-to-date and better maintained software compared to Guix when needed. For now, certain software will be installed through apt instead of Guix itself such as mpd, mpv and neovim. The user will have to manually check if Guix-installed packages are compatible with the apt-installed ones. --- nichijou/home/mpd.scm | 9 ++++++--- nichijou/home/mpv.scm | 9 ++++++--- nichijou/home/nvim.scm | 10 +++++++--- nichijou/home/zsh.scm | 6 +++++- 4 files changed, 24 insertions(+), 10 deletions(-) (limited to 'nichijou') diff --git a/nichijou/home/mpd.scm b/nichijou/home/mpd.scm index e935ed7..1585a1b 100644 --- a/nichijou/home/mpd.scm +++ b/nichijou/home/mpd.scm @@ -2,10 +2,13 @@ #:use-module (gnu home services) #:use-module (gnu packages mpd) #:use-module (gnu services) - #:use-module (guix gexp)) + #:use-module (guix gexp) + #:use-module (ice-9 optargs)) -(define-public packages - (list mpd)) +(define*-public (get-packages #:key (foreign-distro? #f)) + (if foreign-distro? + (list) + (list mpd))) ;; TODO: Write MPD home service? (define-public services diff --git a/nichijou/home/mpv.scm b/nichijou/home/mpv.scm index 9df9d9b..ca6a82c 100644 --- a/nichijou/home/mpv.scm +++ b/nichijou/home/mpv.scm @@ -2,10 +2,13 @@ #:use-module (gnu home services) #:use-module (gnu packages video) #:use-module (gnu services) - #:use-module (guix gexp)) + #:use-module (guix gexp) + #:use-module (ice-9 optargs)) -(define-public packages - (list mpv mpv-mpris)) +(define*-public (get-packages #:key (foreign-distro? #f)) + (if foreign-distro? + (list) + (list mpv mpv-mpris))) ;; TODO: Implement mpv home service? (define-public services diff --git a/nichijou/home/nvim.scm b/nichijou/home/nvim.scm index 27c8608..6daa7ac 100644 --- a/nichijou/home/nvim.scm +++ b/nichijou/home/nvim.scm @@ -3,11 +3,11 @@ #:use-module (gnu packages vim) #:use-module (gnu services) #:use-module (guix gexp) + #:use-module (ice-9 optargs) #:use-module (nichijou packages vim)) -(define-public packages - (list neovim - vim-airline +(define plugins + (list vim-airline vim-airline-themes vim-bbye vim-ctrlp @@ -21,6 +21,10 @@ vim-syntastic vim-tagbar)) +(define*-public (get-packages #:key (foreign-distro? #f)) + (if foreign-distro? plugins + (const neovim plugins))) + (define-public services (list (simple-service 'nichijou-nvim-config home-files-service-type `((".config/nvim/init.vim" ,(local-file diff --git a/nichijou/home/zsh.scm b/nichijou/home/zsh.scm index 11f973c..fc15186 100644 --- a/nichijou/home/zsh.scm +++ b/nichijou/home/zsh.scm @@ -6,9 +6,13 @@ #:use-module (guix gexp) #:use-module (ice-9 optargs)) -(define-public packages +(define packages (list zsh-syntax-highlighting zsh-autosuggestions fzf)) +(define*-public (get-packages #:key (foreign-distro? #f)) + (if foreign-distro? + (list) packages)) + (define-public services (list (service home-zsh-service-type (home-zsh-configuration (xdg-flavor? #t) -- cgit v1.2.3