diff --git a/flake.lock b/flake.lock index a302828..7a6db2c 100644 --- a/flake.lock +++ b/flake.lock @@ -189,7 +189,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems" + "systems": "systems_2" }, "locked": { "lastModified": 1694529238, @@ -493,6 +493,7 @@ "lanzaboote": "lanzaboote", "nix-cachyos-kernel": "nix-cachyos-kernel", "nixpkgs": "nixpkgs_2", + "simple-wallpaper-engine": "simple-wallpaper-engine", "snowfall-lib": "snowfall-lib", "sops-nix": "sops-nix", "wallpaperengine": "wallpaperengine", @@ -541,6 +542,27 @@ "type": "github" } }, + "simple-wallpaper-engine": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "utils": "utils" + }, + "locked": { + "lastModified": 1772136897, + "narHash": "sha256-2RBgZWq80zXVWyOswUlDaoRZtaeT6pBkbNCLdAzLYoY=", + "owner": "Maxnights", + "repo": "simple-linux-wallpaperengine-gui", + "rev": "43ae644754a0a5e96c8ddb9077843643b74f9acc", + "type": "github" + }, + "original": { + "owner": "Maxnights", + "repo": "simple-linux-wallpaperengine-gui", + "type": "github" + } + }, "snowfall-lib": { "inputs": { "flake-compat": "flake-compat_4", @@ -615,6 +637,39 @@ "type": "github" } }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "wallpaperengine": { "inputs": { "Catch2": "Catch2", @@ -629,8 +684,8 @@ "stb": "stb" }, "locked": { - "lastModified": 1789783126, - "narHash": "sha256-z6rSxx9Hz68EEJ1suug52MO/PQhMGPamSwX0FmMDgx4=", + "lastModified": 1790172262, + "narHash": "sha256-gTnF4besYxSEFx0GTA35+/k81nE7WwvTIyJbIs1p20k=", "path": "/home/andreas/Projects/linwallpaap/linux-wallpaperengine", "type": "path" }, diff --git a/flake.nix b/flake.nix index 82b8984..c8d6073 100644 --- a/flake.nix +++ b/flake.nix @@ -48,6 +48,10 @@ }; nix-cachyos-kernel.url = "github:xddxdd/nix-cachyos-kernel/release"; wallpaperengine.url = "path:/home/andreas/Projects/linwallpaap/linux-wallpaperengine"; + simple-wallpaper-engine = { + url = "github:Maxnights/simple-linux-wallpaperengine-gui"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = inputs: diff --git a/homes/x86_64-linux/andreas@drivebystation-nix/default.nix b/homes/x86_64-linux/andreas@drivebystation-nix/default.nix index bdfa6d3..0ea8779 100644 --- a/homes/x86_64-linux/andreas@drivebystation-nix/default.nix +++ b/homes/x86_64-linux/andreas@drivebystation-nix/default.nix @@ -6,6 +6,15 @@ }: let inherit (lib.my-namespace) enabled; + system = pkgs.stdenv.hostPlatform.system; + simpleWallpaperEngine = + inputs.simple-wallpaper-engine.packages.${system}.default.override { + # The upstream GUI package otherwise puts nixpkgs' unmodified + # linux-wallpaperengine in its wrapped PATH. + pkgs = pkgs // { + linux-wallpaperengine = inputs.wallpaperengine.packages.${system}.default; + }; + }; in { imports = [ @@ -29,13 +38,19 @@ in pkgs.hyfetch pkgs.libreoffice pkgs.localsend + simpleWallpaperEngine # pkgs.vesktop pkgs.obsidian inputs.zen-browser.packages.x86_64-linux.default # inputs.kwin-effects-forceblur.packages.${pkgs.stdenv.hostPlatform.system}.default # Archived. ]; }; - + xdg.autostart = { + enable = true; + entries = [ + "${simpleWallpaperEngine}/share/applications/simple-wallpaper-engine-autostart.desktop" + ]; + }; # Auto-start linux-wallpaperengine for dual monitors via XDG autostart # xdg.configFile."autostart/linux-wallpaperengine.desktop".text = '' # [Desktop Entry] @@ -45,4 +60,4 @@ in # X-KDE-autostart-after=panel # X-KDE-StartupNotify=false # ''; -} \ No newline at end of file +}