diff --git a/flake.lock b/flake.lock index 59474b70..af3579ec 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1687473300, - "narHash": "sha256-4LflQpktYFiub8xVhEN9EZf1cYsr09md01rBJZRCGCc=", + "lastModified": 1687506590, + "narHash": "sha256-CSou9mrG9h/WVRjCptfTrATVxvhmtdQXElmWV/ZkrAs=", "owner": "nix-community", "repo": "home-manager", - "rev": "70ac18872a5f1a57a4546ff58888bf67a8bbb5b3", + "rev": "d2b6f2d154bf6b27a93ed895392f80c503df7cfa", "type": "github" }, "original": { @@ -39,7 +39,23 @@ "root": { "inputs": { "home-manager": "home-manager", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "wallpapers": "wallpapers" + } + }, + "wallpapers": { + "locked": { + "lastModified": 1687523055, + "narHash": "sha256-cxHi2WKSLqWMnIVD048InXrazy1/Jz7T+8Oo5uOiqS0=", + "ref": "refs/heads/main", + "rev": "1cd9f378d2989919fcb9e65ea944bfdae31b1a98", + "revCount": 2, + "type": "git", + "url": "https://git.xenia.me.uk/xenia/wallpapers.git" + }, + "original": { + "type": "git", + "url": "https://git.xenia.me.uk/xenia/wallpapers.git" } } }, diff --git a/flake.nix b/flake.nix index 04e326ee..73410a31 100644 --- a/flake.nix +++ b/flake.nix @@ -7,12 +7,13 @@ url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; + wallpapers.url = "git+https://git.xenia.me.uk/xenia/wallpapers.git"; }; - outputs = { - self, + outputs = inputs @ { nixpkgs, home-manager, + ... }: let common = {lib, ...}: { nix = { @@ -88,6 +89,7 @@ }; N0245 = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; + specialArgs = inputs; modules = [ home-manager.nixosModules.home-manager common diff --git a/home/desktop/sway.nix b/home/desktop/sway.nix index fb093ae5..b5a6513e 100644 --- a/home/desktop/sway.nix +++ b/home/desktop/sway.nix @@ -58,7 +58,6 @@ in { export QT_WAYLAND_DISABLE_WINDOWDECORATION="1"''; config = { input."*".xkb_layout = "gb"; - output."*".bg = "~/nixos/wallpaper.jpg fill"; fonts = { names = ["FiraCode Nerd Font" "FiraCode Nerd Font Mono"]; size = 12.0; diff --git a/hosts/N0245/configuration.nix b/hosts/N0245/configuration.nix index afe5a515..0845052b 100644 --- a/hosts/N0245/configuration.nix +++ b/hosts/N0245/configuration.nix @@ -1,7 +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, ...}: { +{pkgs, wallpapers, ...}: { imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix @@ -90,7 +90,10 @@ programs.firefox.package = pkgs.firefox-wayland; wayland.windowManager.sway.config = { - output = {"Dell Inc. DELL U2417H 5K9YD872FY1L".transform = "270";}; + output = { + "*".bg = "${wallpapers.outputs.default} fill"; + "Dell Inc. DELL U2417H 5K9YD872FY1L".transform = "270"; + }; startup = [{command = "firefox";} {command = "teams-for-linux";}]; workspaceOutputAssign = [ { diff --git a/wallpaper.jpg b/wallpaper.jpg deleted file mode 100644 index 871a29af..00000000 Binary files a/wallpaper.jpg and /dev/null differ