From b54a13223c10f583aa2f17c9db7ee26588dad7d0 Mon Sep 17 00:00:00 2001 From: Kenny Ballou Date: Tue, 23 Feb 2021 07:51:20 -0700 Subject: overlays: use `with self` syntax Signed-off-by: Kenny Ballou --- overlays/00-gnome-applications.nix | 24 ++++++------ overlays/00-kde-applications.nix | 78 +++++++++++++++++++------------------- overlays/00-linux.nix | 4 +- overlays/10-virtualization.nix | 8 ++-- overlays/20-nix.nix | 16 ++++---- 5 files changed, 65 insertions(+), 65 deletions(-) diff --git a/overlays/00-gnome-applications.nix b/overlays/00-gnome-applications.nix index e51f066..9c4e611 100644 --- a/overlays/00-gnome-applications.nix +++ b/overlays/00-gnome-applications.nix @@ -3,18 +3,18 @@ self: super: gnome-applications = self.buildEnv { name = "gnome-applications"; ignoreCollisions = true; - paths = [ - self.gnome3.gnome-autoar - self.gnome3.gnome-boxes - self.gnome3.gnome-dictionary - self.gnome3.evolution-data-server - self.gnome3.evolution - self.gnome3.gnome-shell-extensions - self.gnome3.gnome-tweak-tool - self.gnome3.gnome-themes-extra - self.gnome3.gnome-themes-standard - self.gnome3.gucharmap - self.gnomeExtensions.sound-output-device-chooser + paths = with self; [ + gnome3.gnome-autoar + gnome3.gnome-boxes + gnome3.gnome-dictionary + gnome3.evolution-data-server + gnome3.evolution + gnome3.gnome-shell-extensions + gnome3.gnome-tweak-tool + gnome3.gnome-themes-extra + gnome3.gnome-themes-standard + gnome3.gucharmap + gnomeExtensions.sound-output-device-chooser ]; }; } diff --git a/overlays/00-kde-applications.nix b/overlays/00-kde-applications.nix index a2e2619..7785637 100644 --- a/overlays/00-kde-applications.nix +++ b/overlays/00-kde-applications.nix @@ -3,45 +3,45 @@ self: super: kde-applications = self.buildEnv { name = "kde-applications"; ignoreCollisions = true; - paths = [ - self.kde-gtk-config - self.kdeplasma-addons - self.kdeApplications.akonadi - self.kdeApplications.akonadi-calendar - self.kdeApplications.akonadi-contacts - self.kdeApplications.akonadi-mime - self.kdeApplications.akonadi-notes - self.kdeApplications.akonadi-search - self.kdeApplications.akonadiconsole - self.kdeApplications.ark - self.kdeApplications.dolphin - self.kdeApplications.dolphin-plugins - self.kdeApplications.gwenview - self.kdeApplications.kaddressbook - self.kdeApplications.kalarm - self.kdeApplications.kalarmcal - self.kdeApplications.kcachegrind - self.kdeFrameworks.kcontacts - self.kdeApplications.kcharselect - self.kdeApplications.kdav - self.kdeApplications.kdenetwork-filesharing - self.kdeApplications.kdepim-apps-libs - self.kdeApplications.kdepim-runtime - self.kdeApplications.kidentitymanagement - self.kdeApplications.kimap - self.kdeApplications.kio-extras - self.kdeApplications.kmbox - self.kdeApplications.kmime - self.kdeApplications.kmplot - self.kdeApplications.korganizer - self.kdeApplications.kompare - self.kdeApplications.libkdepim - self.kdeApplications.okular - self.kdeApplications.pimcommon - self.kdeApplications.ksmtp - self.kdeApplications.spectacle - self.plasma5.plasma-browser-integration - self.plasma5.user-manager + paths = with self; [ + kde-gtk-config + kdeplasma-addons + kdeApplications.akonadi + kdeApplications.akonadi-calendar + kdeApplications.akonadi-contacts + kdeApplications.akonadi-mime + kdeApplications.akonadi-notes + kdeApplications.akonadi-search + kdeApplications.akonadiconsole + kdeApplications.ark + kdeApplications.dolphin + kdeApplications.dolphin-plugins + kdeApplications.gwenview + kdeApplications.kaddressbook + kdeApplications.kalarm + kdeApplications.kalarmcal + kdeApplications.kcachegrind + kdeFrameworks.kcontacts + kdeApplications.kcharselect + kdeApplications.kdav + kdeApplications.kdenetwork-filesharing + kdeApplications.kdepim-apps-libs + kdeApplications.kdepim-runtime + kdeApplications.kidentitymanagement + kdeApplications.kimap + kdeApplications.kio-extras + kdeApplications.kmbox + kdeApplications.kmime + kdeApplications.kmplot + kdeApplications.korganizer + kdeApplications.kompare + kdeApplications.libkdepim + kdeApplications.okular + kdeApplications.pimcommon + kdeApplications.ksmtp + kdeApplications.spectacle + plasma5.plasma-browser-integration + plasma5.user-manager ]; }; } diff --git a/overlays/00-linux.nix b/overlays/00-linux.nix index 709689b..2a51bde 100644 --- a/overlays/00-linux.nix +++ b/overlays/00-linux.nix @@ -3,8 +3,8 @@ self: super: linux-overlay = self.buildEnv { name = "linux-overlay"; ignoreCollisions = true; - paths = [ - self.linuxPackages.perf + paths = with self;[ + linuxPackages.perf ]; }; } diff --git a/overlays/10-virtualization.nix b/overlays/10-virtualization.nix index 63ad2cd..c137f42 100644 --- a/overlays/10-virtualization.nix +++ b/overlays/10-virtualization.nix @@ -3,10 +3,10 @@ self: super: virtualizationOverlay = super.buildEnv { name = "virtualizationOverlay"; ignoreCollisions = true; - paths = [ - self.docker - self.docker-compose - self.qemu + paths = with self; [ + docker + docker-compose + qemu ]; }; } diff --git a/overlays/20-nix.nix b/overlays/20-nix.nix index 79927a3..1ffaeef 100644 --- a/overlays/20-nix.nix +++ b/overlays/20-nix.nix @@ -3,14 +3,14 @@ self: super: nixOverlay = super.buildEnv { name = "nixOverlay"; ignoreCollisions = true; - paths = [ - self.nix-bash-completions - self.nix-index - self.nix-prefetch-git - self.nix-prefetch-github - self.nix-review - self.nix-top - self.nix-zsh-completions + paths = with self; [ + nix-bash-completions + nix-index + nix-prefetch-git + nix-prefetch-github + nix-review + nix-top + nix-zsh-completions ]; }; } -- cgit v1.2.1