diff options
author | Timo Wilken | 2024-06-05 09:58:16 +0200 |
---|---|---|
committer | Timo Wilken | 2024-06-05 13:03:34 +0200 |
commit | b3a722f52a0be3f6d8b4f3fa6ba7b8848cc3a34d (patch) | |
tree | 6bf06f81d772bf87fb45cc2143584c08590a4f88 /tw/system | |
parent | 947800dda8e1a6f72c963a1f12c8e06d9c5e68f9 (diff) |
Install system packages using profile-service-type
Diffstat (limited to 'tw/system')
-rw-r--r-- | tw/system/btl.scm | 3 | ||||
-rw-r--r-- | tw/system/cern.scm | 3 | ||||
-rw-r--r-- | tw/system/frm.scm | 3 | ||||
-rw-r--r-- | tw/system/lap.scm | 5 | ||||
-rw-r--r-- | tw/system/lud.scm | 6 | ||||
-rw-r--r-- | tw/system/vin.scm | 5 |
6 files changed, 5 insertions, 20 deletions
diff --git a/tw/system/btl.scm b/tw/system/btl.scm index 2e3daca5..a7389de9 100644 --- a/tw/system/btl.scm +++ b/tw/system/btl.scm @@ -122,9 +122,6 @@ "/run/current-system/profile/sbin/reboot, " "/run/current-system/profile/sbin/shutdown\n"))) - ;; This is where we specify system-wide packages. - (packages %enduser-system-packages) - ;; Use the "desktop" services, which include the X11 ;; log-in service, networking with NetworkManager, and more. ;; See info '(guix)Services' for useful services. diff --git a/tw/system/cern.scm b/tw/system/cern.scm index c519bbe9..362ff9e0 100644 --- a/tw/system/cern.scm +++ b/tw/system/cern.scm @@ -110,9 +110,6 @@ "/run/current-system/profile/sbin/reboot, " "/run/current-system/profile/sbin/shutdown\n"))) - ;; This is where we specify system-wide packages. - (packages %enduser-system-packages) - ;; Use the "desktop" services, which include the X11 ;; log-in service, networking with NetworkManager, and more. ;; See info '(guix)Services' for useful services. diff --git a/tw/system/frm.scm b/tw/system/frm.scm index 76d8c492..c05b7180 100644 --- a/tw/system/frm.scm +++ b/tw/system/frm.scm @@ -122,9 +122,6 @@ "/run/current-system/profile/sbin/reboot, " "/run/current-system/profile/sbin/shutdown\n"))) - ;; This is where we specify system-wide packages. - (packages %enduser-system-packages) - ;; Use the "desktop" services, which include the X11 ;; log-in service, networking with NetworkManager, and more. ;; See info '(guix)Services' for useful services. diff --git a/tw/system/lap.scm b/tw/system/lap.scm index fd503dc9..0cf76d72 100644 --- a/tw/system/lap.scm +++ b/tw/system/lap.scm @@ -163,9 +163,8 @@ "/run/current-system/profile/sbin/shutdown\n"))) ;; This is where we specify system-wide packages. - (packages - ;; Proprietary NVIDIA driver. See its description for more required setup steps. - (cons* nongnu:nvidia-driver %enduser-system-packages)) + ;; Proprietary NVIDIA driver. See its description for more required setup steps. + (packages (list nongnu:nvidia-driver)) ;; Use the "desktop" services, which include the X11 ;; log-in service, networking with NetworkManager, and more. diff --git a/tw/system/lud.scm b/tw/system/lud.scm index fc9e85c6..44bd4293 100644 --- a/tw/system/lud.scm +++ b/tw/system/lud.scm @@ -54,12 +54,12 @@ ;; under their own account: use 'guix search KEYWORD' to search ;; for packages and 'guix install PACKAGE' to install a package. (packages - (cons* + (list ffmpeg tor ; for video downloader ;; For Nextcloud. PHP modules must be installed in system ;; profile, as that's referred to in Nextcloud's php.ini. - php php-apcu php-imagick openssl ; curl is in `%base-system-packages' - %base-system-packages)) + ;; curl is already installed by `server-base-services'. + php php-apcu php-imagick openssl)) ;; Below is the list of system services. To search for available ;; services, run 'guix system search KEYWORD' in a terminal. diff --git a/tw/system/vin.scm b/tw/system/vin.scm index 02a4bbcb..b7c30b18 100644 --- a/tw/system/vin.scm +++ b/tw/system/vin.scm @@ -49,11 +49,6 @@ ;; Choose UK English console keyboard layout. (keyboard-layout %british-keyboard) - ;; Packages installed system-wide. Users can also install packages - ;; under their own account: use 'guix search KEYWORD' to search - ;; for packages and 'guix install PACKAGE' to install a package. - (packages %base-system-packages) - ;; Below is the list of system services. To search for available ;; services, run 'guix system search KEYWORD' in a terminal. (services |