diff --git a/flake.lock b/flake.lock index 39b79e66..ad53255f 100644 --- a/flake.lock +++ b/flake.lock @@ -514,11 +514,11 @@ "systems": "systems_6" }, "locked": { - "lastModified": 1692792214, - "narHash": "sha256-voZDQOvqHsaReipVd3zTKSBwN7LZcUwi3/ThMxRZToU=", + "lastModified": 1692799911, + "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=", "owner": "numtide", "repo": "flake-utils", - "rev": "1721b3e7c882f75f2301b00d48a2884af8c448ae", + "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44", "type": "github" }, "original": { @@ -829,11 +829,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1692792553, - "narHash": "sha256-PfrWnEX0nfBtjnS6qI9sBnlSFmLnjKrqEWB5GVeGSmc=", + "lastModified": 1692878963, + "narHash": "sha256-/pv2E36Su112vPMk5dgUED0j2v7n/Mh0p99sXdJ9cH4=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "2a00587b2fc5291691ca73f3b4a01ae49dd3361c", + "rev": "e74fab6aff10cd2f4241c4bf646e53f5b3203349", "type": "github" }, "original": { @@ -906,11 +906,11 @@ "pre-commit-hooks": "pre-commit-hooks_2" }, "locked": { - "lastModified": 1691603203, - "narHash": "sha256-+p/gabBVnurM6TF0HN8vBIbd9eDFMGpfjXauH3+6hi0=", + "lastModified": 1692930615, + "narHash": "sha256-mBqTA0GryMm9CFhEJQgiUjZ0esYynKVBNIR3V4RZU1o=", "owner": "jmbaur", "repo": "nixos-router", - "rev": "feb41b35c023bc8ab7c562db2996e952fcd636de", + "rev": "20af5e31c84db0bb73b0c7b68638364cf5dd7c81", "type": "github" }, "original": { @@ -1105,11 +1105,11 @@ "nixpkgs_sirula": "nixpkgs_sirula" }, "locked": { - "lastModified": 1692857992, - "narHash": "sha256-FjHZTHq9Tc1VmL8XW1d62gogQ/KGhD8jrL5+/m1XU4M=", + "lastModified": 1692908158, + "narHash": "sha256-KombsHdZJLP2dHHmV4eKpbr3rClJk1AChCfembsO5Ao=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "541c9731c7fcb227400fadf60b441ce5d16fba34", + "rev": "b9a9cca28083c6e756fa89ef25306fe7ffdd637e", "type": "github" }, "original": { @@ -1294,11 +1294,11 @@ "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { - "lastModified": 1691397944, - "narHash": "sha256-4fa4bX3kPYKpEssgrFRxRCPVXczidArDeSWaUMSzQAU=", + "lastModified": 1692274144, + "narHash": "sha256-BxTQuRUANQ81u8DJznQyPmRsg63t4Yc+0kcyq6OLz8s=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "e5588ddffd4c3578547a86ef40ec9a6fbdae2986", + "rev": "7e3517c03d46159fdbf8c0e5c97f82d5d4b0c8fa", "type": "github" }, "original": { diff --git a/nixos-modules/jared/data.nix b/nixos-modules/jared/data.nix index c4d0a448..6a5fce8a 100644 --- a/nixos-modules/jared/data.nix +++ b/nixos-modules/jared/data.nix @@ -3,6 +3,7 @@ rec { cursorTheme = "Adwaita"; gtkIconTheme = cursorTheme; gtkTheme = "${gtkIconTheme}-dark"; + backgroundColor = "#222222"; colors = { modus-vivendi = { background = "000000"; diff --git a/nixos-modules/jared/default.nix b/nixos-modules/jared/default.nix index e13aeb55..9429a916 100644 --- a/nixos-modules/jared/default.nix +++ b/nixos-modules/jared/default.nix @@ -268,11 +268,7 @@ in name = "sway.config"; src = ./sway.config.in; inherit (config.services.xserver) xkbModel xkbOptions; - # public domain monet paintings: https://commons.wikimedia.org/wiki/Claude_Monet_Paintings_in_Public_Domain - wallpaper = pkgs.fetchurl { - url = "https://upload.wikimedia.org/wikipedia/commons/7/70/Los_nen%C3%BAfares_%28Monet%29.jpg"; - sha256 = "sha256-VQdogXH5yXU/icTHfVVcJWubYmFNGzpCNsKGqeXPh0s="; - }; + inherit (guiData) backgroundColor; }; } { diff --git a/nixos-modules/jared/sway.config.in b/nixos-modules/jared/sway.config.in index e3f7cd13..243deb0e 100644 --- a/nixos-modules/jared/sway.config.in +++ b/nixos-modules/jared/sway.config.in @@ -124,7 +124,7 @@ input "10900:43012:GTCH7503:00_2A94:A804" { } output "*" { - background @wallpaper@ fill + background @backgroundColor@ solid_color } seat "*" {