From cb0c88043193875da451d7cf21c0adbb9ccd69fc Mon Sep 17 00:00:00 2001
From: Christoph Urlacher <christoph.urlacher@protonmail.com>
Date: Mon, 14 Oct 2024 15:25:54 +0200
Subject: [PATCH] Home: Fix remaining name qualifications after module update

---
 home/modules/chromium/default.nix | 2 +-
 home/modules/firefox/default.nix  | 4 ++--
 home/modules/fish/default.nix     | 2 +-
 home/modules/neovim/default.nix   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/home/modules/chromium/default.nix b/home/modules/chromium/default.nix
index 0dff78e3..c1baf37f 100644
--- a/home/modules/chromium/default.nix
+++ b/home/modules/chromium/default.nix
@@ -12,7 +12,7 @@ in {
   config = lib.mkIf chromium.enable {
     home.packages = with pkgs;
       builtins.concatLists [
-        (optionals cfg.google [
+        (lib.optionals chromium.google [
           google-chrome # Trash, but required for decker pdf export
 
           # Required for some flatpak compatibility
diff --git a/home/modules/firefox/default.nix b/home/modules/firefox/default.nix
index 771943ef..25d1067c 100644
--- a/home/modules/firefox/default.nix
+++ b/home/modules/firefox/default.nix
@@ -15,14 +15,14 @@ in {
     home.packages = with pkgs;
       builtins.concatLists [
         # TODO: I don't think vaapi works yet
-        (optionals cfg.vaapi [
+        (lib.optionals firefox.vaapi [
           # NOTE: I put these into hardware.opengl.extrapackages, don't know if they belong there...
           # libva
           # libvdpau
         ])
 
         # TODO: Derivation borked on standalone HM
-        # (optionals cfg.gnomeTheme [firefox-gnome-theme])
+        # (lib.optionals firefox.gnomeTheme [firefox-gnome-theme])
       ];
 
     home.sessionVariables = lib.mkMerge [
diff --git a/home/modules/fish/default.nix b/home/modules/fish/default.nix
index cb266b85..f1339dd9 100644
--- a/home/modules/fish/default.nix
+++ b/home/modules/fish/default.nix
@@ -114,7 +114,7 @@ in {
 
         # These can be used for my config.modules and for HM config.programs,
         # as both of these add the package to home.packages
-        hasHomePackage = package: (mylib.contains config.home.packages package);
+        hasHomePackage = package: (mylib.modules.contains config.home.packages package);
 
         # Only add fish abbr if package is installed
         abbrify = package: abbr: (lib.optionalAttrs (hasHomePackage package) abbr);
diff --git a/home/modules/neovim/default.nix b/home/modules/neovim/default.nix
index aa37cb7d..7eb82dc2 100644
--- a/home/modules/neovim/default.nix
+++ b/home/modules/neovim/default.nix
@@ -23,7 +23,7 @@ in {
 
       packages = with pkgs;
         builtins.concatLists [
-          (optionals cfg.neovide [neovide])
+          (lib.optionals neovim.neovide [neovide])
 
           [
             (pkgs.ripgrep.override {withPCRE2 = true;})