From a40b8d38d82821a1803e0615ee81bf4a521d28a2 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Sat, 24 Jun 2023 09:10:26 +0100
Subject: [PATCH] Move wallpaper setting into flake.nix to make it easier and
 drop requirement for specialArgs

---
 flake.nix                     | 12 +++++++++---
 hosts/N0245/configuration.nix |  7 +------
 hosts/Northstar/home.nix      |  7 +------
 3 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/flake.nix b/flake.nix
index 73410a31..e754bc79 100644
--- a/flake.nix
+++ b/flake.nix
@@ -10,9 +10,10 @@
     wallpapers.url = "git+https://git.xenia.me.uk/xenia/wallpapers.git";
   };
 
-  outputs = inputs @ {
+  outputs = {
     nixpkgs,
     home-manager,
+    wallpapers,
     ...
   }: let
     common = {lib, ...}: {
@@ -64,6 +65,7 @@
         powerOnBoot = true;
       };
     };
+    wallpaper = {wayland.windowManager.sway.config.output."*".bg = "${wallpapers.outputs.default} fill";};
   in {
     nixosConfigurations = {
       Legion = nixpkgs.lib.nixosSystem {
@@ -83,13 +85,13 @@
           hardware-audio
           hardware-bluetooth
           ./hosts/Vanguard/configuration.nix
+          {home.users.xenia = {imports = [wallpaper];};}
           ./wm/sway.nix
           ./services/sshd
         ];
       };
       N0245 = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
-        specialArgs = inputs;
         modules = [
           home-manager.nixosModules.home-manager
           common
@@ -97,6 +99,7 @@
           hardware-bluetooth
           ./hosts/N0245/configuration.nix
           ./wm/sway.nix
+          {home.users.elitherl = {imports = [wallpaper];};}
           ./services/syncthing/N0245.nix
         ];
       };
@@ -108,7 +111,10 @@
       };
       "xenia" = home-manager.lib.homeManagerConfiguration {
         pkgs = nixpkgs.legacyPackages."aarch64-linux";
-        modules = [./hosts/Northstar/home.nix];
+        modules = [
+          ./hosts/Northstar/home.nix
+          wallpaper
+        ];
       };
     };
   };
diff --git a/hosts/N0245/configuration.nix b/hosts/N0245/configuration.nix
index 3b2dd3e1..94c11faf 100644
--- a/hosts/N0245/configuration.nix
+++ b/hosts/N0245/configuration.nix
@@ -1,11 +1,7 @@
 # Edit this configuration file to define what should be installed on
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
-{
-  pkgs,
-  wallpapers,
-  ...
-}: {
+{pkgs, ...}: {
   imports = [
     # Include the results of the hardware scan.
     ./hardware-configuration.nix
@@ -95,7 +91,6 @@
 
     wayland.windowManager.sway.config = {
       output = {
-        "*".bg = "${wallpapers.outputs.default} fill";
         "Dell Inc. DELL U2417H 5K9YD872FY1L".transform = "270";
       };
       startup = [{command = "firefox";} {command = "teams-for-linux";}];
diff --git a/hosts/Northstar/home.nix b/hosts/Northstar/home.nix
index ad3b5c6e..a0bcece7 100644
--- a/hosts/Northstar/home.nix
+++ b/hosts/Northstar/home.nix
@@ -1,8 +1,4 @@
-{
-  pkgs,
-  wallpapers,
-  ...
-}: {
+{pkgs, ...}: {
   imports = [
     ../../home/personal.nix
     ../../home/gui/firefox.nix
@@ -22,7 +18,6 @@
 
   wayland.windowManager.sway = {
     config = {
-      output."*".bg = "${wallpapers.outputs.default} fill";
       input = {
         "touch" = {map_to_output = "DSI-1";};
         "touchpad" = {click_method = "clickfinger";};