From 0a58af6500284071ce6aad253749aed243385709 Mon Sep 17 00:00:00 2001
From: Aly Raffauf <aly@raffauflabs.com>
Date: Sun, 7 Jul 2024 23:54:00 -0400
Subject: [PATCH] moved and simplified overlays from baseModules

---
 baseModules/default.nix                       |  2 -
 baseModules/nixpkgs.nix                       | 43 -------------------
 .../desktop/sway/randomWallpaper.nix          |  7 +--
 homeManagerModules/options.nix                |  3 +-
 homeManagerModules/theme.nix                  |  2 +-
 homes/aly/default.nix                         |  2 +-
 homes/aly/firefox/default.nix                 |  4 +-
 homes/dustin/default.nix                      |  2 +-
 homes/morgan/default.nix                      |  2 +-
 hosts/common.nix                              | 12 ++++++
 hosts/petalburg/default.nix                   | 23 ++++++++++
 nixosModules/desktop/cinnamon/default.nix     |  4 +-
 nixosModules/desktop/default.nix              |  9 ++--
 nixosModules/desktop/hyprland/default.nix     |  7 ---
 14 files changed, 54 insertions(+), 68 deletions(-)
 delete mode 100644 baseModules/nixpkgs.nix

diff --git a/baseModules/default.nix b/baseModules/default.nix
index 801c36be..76ded136 100644
--- a/baseModules/default.nix
+++ b/baseModules/default.nix
@@ -4,8 +4,6 @@ inputs: {
   pkgs,
   ...
 }: {
-  imports = [./nixpkgs.nix];
-
   console.useXkbConfig = true;
 
   environment.systemPackages = with pkgs; [
diff --git a/baseModules/nixpkgs.nix b/baseModules/nixpkgs.nix
deleted file mode 100644
index 4c9ace66..00000000
--- a/baseModules/nixpkgs.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  config,
-  inputs,
-  lib,
-  pkgs,
-  ...
-}: {
-  nixpkgs = let
-    unstable = import inputs.nixpkgsUnstable {
-      system = pkgs.system;
-      config.allowUnfree = true; # Allow unfree packages
-    };
-  in {
-    config.allowUnfree = true; # Allow unfree packages
-
-    # Overlays over default packages.
-    overlays = [
-      inputs.nur.overlay
-      (final: prev: {
-        alyraffauf-wallpapers = inputs.wallpapers.packages.${pkgs.system}.default;
-        brave = prev.brave.override {commandLineArgs = "--gtk-version=4 --enable-wayland-ime";};
-        google-chrome = prev.google-chrome.override {commandLineArgs = "--gtk-version=4 --enable-wayland-ime";};
-        nerdfonts = prev.nerdfonts.override {fonts = ["Noto"];};
-
-        obsidian = prev.obsidian.overrideAttrs (old: {
-          installPhase =
-            builtins.replaceStrings ["--ozone-platform=wayland"]
-            ["--ozone-platform=wayland --enable-wayland-ime"]
-            old.installPhase;
-        });
-
-        vscodium = prev.vscodium.override {commandLineArgs = "--enable-wayland-ime";};
-
-        webcord = prev.webcord.overrideAttrs (old: {
-          installPhase =
-            builtins.replaceStrings ["--ozone-platform-hint=auto"]
-            ["--ozone-platform-hint=auto --enable-wayland-ime"]
-            old.installPhase;
-        });
-      })
-    ];
-  };
-}
diff --git a/homeManagerModules/desktop/sway/randomWallpaper.nix b/homeManagerModules/desktop/sway/randomWallpaper.nix
index 65f27a20..9ba7efb5 100644
--- a/homeManagerModules/desktop/sway/randomWallpaper.nix
+++ b/homeManagerModules/desktop/sway/randomWallpaper.nix
@@ -1,14 +1,15 @@
 {
-  pkgs,
-  lib,
   config,
+  inputs,
+  lib,
+  pkgs,
   ...
 }: let
   sway-randomWallpaper = pkgs.writeShellScriptBin "sway-randomWallpaper" ''
     kill `pidof swaybg`
 
     OLD_PIDS=()
-    directory=${pkgs.alyraffauf-wallpapers}/share/backgrounds
+    directory=${inputs.wallpapers.packages.${pkgs.system}.default}/share/backgrounds
 
     if [ -d "$directory" ]; then
         while true; do
diff --git a/homeManagerModules/options.nix b/homeManagerModules/options.nix
index 35518fa7..dcb8456c 100644
--- a/homeManagerModules/options.nix
+++ b/homeManagerModules/options.nix
@@ -1,5 +1,6 @@
 {
   config,
+  inputs,
   lib,
   osConfig,
   pkgs,
@@ -283,7 +284,7 @@ in {
 
       wallpaper = lib.mkOption {
         description = "Default wallpaper.";
-        default = "${pkgs.alyraffauf-wallpapers}/share/backgrounds/jr-korpa-9XngoIpxcEo-unsplash.jpg";
+        default = "${inputs.wallpapers.packages.${pkgs.system}.defaults}/share/backgrounds/jr-korpa-9XngoIpxcEo-unsplash.jpg";
         type = lib.types.str;
       };
     };
diff --git a/homeManagerModules/theme.nix b/homeManagerModules/theme.nix
index 252511c1..5dec8e02 100644
--- a/homeManagerModules/theme.nix
+++ b/homeManagerModules/theme.nix
@@ -54,7 +54,7 @@
 
         font = {
           name = "NotoSans Nerd Font";
-          package = pkgs.nerdfonts;
+          package = pkgs.nerdfonts.override {fonts = ["Noto"];};
           size = lib.mkDefault 11;
         };
 
diff --git a/homes/aly/default.nix b/homes/aly/default.nix
index ef531130..dad22791 100644
--- a/homes/aly/default.nix
+++ b/homes/aly/default.nix
@@ -66,7 +66,7 @@ inputs: self: {
 
     theme = {
       enable = true;
-      wallpaper = "${pkgs.alyraffauf-wallpapers}/share/backgrounds/wallhaven-3led2d.jpg";
+      wallpaper = "${inputs.wallpapers.packages.${pkgs.system}.default}/share/backgrounds/wallhaven-3led2d.jpg";
     };
   };
 }
diff --git a/homes/aly/firefox/default.nix b/homes/aly/firefox/default.nix
index 2d25359a..7860f094 100644
--- a/homes/aly/firefox/default.nix
+++ b/homes/aly/firefox/default.nix
@@ -20,7 +20,7 @@
 
     profiles = {
       default = {
-        extensions = with pkgs.nur.repos.rycee.firefox-addons; [
+        extensions = with config.nur.repos.rycee.firefox-addons; [
           augmented-steam
           decentraleyes
           keepassxc-browser
@@ -161,7 +161,7 @@
       };
 
       work = {
-        extensions = with pkgs.nur.repos.rycee.firefox-addons; [
+        extensions = with config.nur.repos.rycee.firefox-addons; [
           clearurls
           consent-o-matic
           decentraleyes
diff --git a/homes/dustin/default.nix b/homes/dustin/default.nix
index 74e235bc..33fecb2c 100644
--- a/homes/dustin/default.nix
+++ b/homes/dustin/default.nix
@@ -41,7 +41,7 @@ inputs: self: {
 
     theme = {
       enable = true;
-      wallpaper = "${pkgs.alyraffauf-wallpapers}/share/backgrounds/jr-korpa-9XngoIpxcEo-unsplash.jpg";
+      wallpaper = "${inputs.wallpapers.packages.${pkgs.system}.default}/share/backgrounds/jr-korpa-9XngoIpxcEo-unsplash.jpg";
     };
   };
 }
diff --git a/homes/morgan/default.nix b/homes/morgan/default.nix
index 848feefe..8d2bcbdd 100644
--- a/homes/morgan/default.nix
+++ b/homes/morgan/default.nix
@@ -38,7 +38,7 @@ inputs: self: {
 
     theme = {
       enable = true;
-      wallpaper = "${pkgs.alyraffauf-wallpapers}/share//backgrounds/jr-korpa-9XngoIpxcEo-unsplash.jpg";
+      wallpaper = "${inputs.wallpapers.packages.${pkgs.system}.default}/share//backgrounds/jr-korpa-9XngoIpxcEo-unsplash.jpg";
     };
   };
 }
diff --git a/hosts/common.nix b/hosts/common.nix
index df934752..cf89a2e8 100644
--- a/hosts/common.nix
+++ b/hosts/common.nix
@@ -1,5 +1,6 @@
 {
   config,
+  inputs,
   lib,
   pkgs,
   ...
@@ -58,6 +59,17 @@
 
   nix.settings.trusted-users = ["aly"];
 
+  nixpkgs = {
+    config.allowUnfree = true; # Allow unfree packages
+
+    overlays = [
+      (final: prev: {
+        hyprland = inputs.hyprland.packages.${pkgs.system}.hyprland;
+        xdg-desktop-portal-hyprland = inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland;
+      })
+    ];
+  };
+
   networking.networkmanager = {
     enable = true;
 
diff --git a/hosts/petalburg/default.nix b/hosts/petalburg/default.nix
index 2badce09..88a83f85 100644
--- a/hosts/petalburg/default.nix
+++ b/hosts/petalburg/default.nix
@@ -20,6 +20,29 @@
 
   environment.variables.GDK_SCALE = "2";
   networking.hostName = "petalburg";
+
+  nixpkgs.overlays = [
+    (final: prev: {
+      brave = prev.brave.override {commandLineArgs = "--gtk-version=4 --enable-wayland-ime";};
+
+      obsidian = prev.obsidian.overrideAttrs (old: {
+        installPhase =
+          builtins.replaceStrings ["--ozone-platform=wayland"]
+          ["--ozone-platform=wayland --enable-wayland-ime"]
+          old.installPhase;
+      });
+
+      vscodium = prev.vscodium.override {commandLineArgs = "--enable-wayland-ime";};
+
+      webcord = prev.webcord.overrideAttrs (old: {
+        installPhase =
+          builtins.replaceStrings ["--ozone-platform-hint=auto"]
+          ["--ozone-platform-hint=auto --enable-wayland-ime"]
+          old.installPhase;
+      });
+    })
+  ];
+
   system.stateVersion = "24.05";
 
   ar = {
diff --git a/nixosModules/desktop/cinnamon/default.nix b/nixosModules/desktop/cinnamon/default.nix
index bbe27550..40ee402d 100644
--- a/nixosModules/desktop/cinnamon/default.nix
+++ b/nixosModules/desktop/cinnamon/default.nix
@@ -28,8 +28,8 @@
             };
 
             font = {
-              name = "NotoSans Nerd Font Regular";
-              package = pkgs.nerdfonts;
+              name = "NotoSans Nerd Font";
+              package = pkgs.nerdfonts.override {fonts = ["Noto"];};
             };
 
             iconTheme = {
diff --git a/nixosModules/desktop/default.nix b/nixosModules/desktop/default.nix
index 1e8824ef..dc7d06b2 100644
--- a/nixosModules/desktop/default.nix
+++ b/nixosModules/desktop/default.nix
@@ -1,7 +1,8 @@
 {
-  pkgs,
-  lib,
   config,
+  inputs,
+  lib,
+  pkgs,
   ...
 }: {
   imports = [
@@ -23,12 +24,10 @@
     ) {
       environment = {
         sessionVariables.NIXOS_OZONE_WL = "1";
-        systemPackages = [pkgs.alyraffauf-wallpapers];
       };
 
       fonts.packages = with pkgs; [
         liberation_ttf
-        nerdfonts
       ];
 
       hardware.logitech.wireless = {
@@ -55,10 +54,12 @@
 
         xserver = {
           enable = true;
+
           xkb = {
             layout = "us";
             variant = "altgr-intl";
           };
+
           excludePackages = with pkgs; [xterm];
         };
       };
diff --git a/nixosModules/desktop/hyprland/default.nix b/nixosModules/desktop/hyprland/default.nix
index 4b74ea10..b3bcea96 100644
--- a/nixosModules/desktop/hyprland/default.nix
+++ b/nixosModules/desktop/hyprland/default.nix
@@ -19,13 +19,6 @@
       ];
     };
 
-    nixpkgs.overlays = [
-      (final: prev: {
-        hyprland = inputs.hyprland.packages.${pkgs.system}.hyprland;
-        xdg-desktop-portal-hyprland = inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland;
-      })
-    ];
-
     programs = {
       hyprland = {
         enable = true;