From 81d9552f732eae92a60317aa0a9ba9db3b43c186 Mon Sep 17 00:00:00 2001 From: Erwin Boskma Date: Wed, 10 Jan 2024 21:56:44 +0100 Subject: [PATCH] home: Handle wallpapers differently --- users/erwin/home.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/users/erwin/home.nix b/users/erwin/home.nix index d63e651..3c8ca9e 100644 --- a/users/erwin/home.nix +++ b/users/erwin/home.nix @@ -1,6 +1,7 @@ { pkgs, config, lib, inputs, ... }: with lib; let cfg = config.eboskma.users.erwin; + homeCfg = config.home-manager.users.erwin; bt = config.eboskma.bluetooth; ewwDaemon = @@ -10,7 +11,7 @@ with lib; let pkgs.writeShellScript "eww-daemon" '' export PATH=${path}:''${PATH} - ${config.home-manager.users.erwin.eboskma.programs.eww.package}/bin/eww $@ + ${homeCfg.eboskma.programs.eww.package}/bin/eww $@ ''; in { @@ -94,7 +95,7 @@ in rofi = { enable = true; package = pkgs.rofi-wayland; - terminal = config.home-manager.users.erwin.wayland.windowManager.sway.config.terminal; + terminal = homeCfg.wayland.windowManager.sway.config.terminal; }; vscode.enable = true; solvespace.enable = true; @@ -102,10 +103,10 @@ in starship.enable = true; sway = { enable = true; - lock-wallpaper = ../../wallpapers/river-2560.png; + lock-wallpaper = "${homeCfg.home.homeDirectory}/.wallpapers/river-2560.png"; output = { "DP-2" = { - bg = "${../../wallpapers/jwst-saturn-nircam-2560.png} fill"; + bg = "${homeCfg.home.homeDirectory}/.wallpapers/river-2560.png fill"; mode = "2560x1440@165Hz"; adaptive_sync = "on"; max_render_time = "2"; @@ -200,7 +201,6 @@ in ripgrep scid-vs-pc signal-desktop - solo2-cli steam steamcmd steam-tui @@ -221,6 +221,15 @@ in gtk.enable = true; x11.enable = true; }; + + + file = { + wallpapers = { + source = ../../wallpapers; + target = ".wallpapers"; + recursive = true; + }; + }; }; xdg = {