diff options
Diffstat (limited to 'host/Rory-desktop')
-rw-r--r-- | host/Rory-desktop/configuration.nix | 3 | ||||
-rw-r--r-- | host/Rory-desktop/optional/gui/wayland.nix | 14 |
2 files changed, 10 insertions, 7 deletions
diff --git a/host/Rory-desktop/configuration.nix b/host/Rory-desktop/configuration.nix index fddff11..28a3b7f 100644 --- a/host/Rory-desktop/configuration.nix +++ b/host/Rory-desktop/configuration.nix @@ -1,10 +1,11 @@ -{ config, pkgs, lib, nhekoSrc, mtxclientSrc, ... }: +args@{ config, pkgs, lib, nhekoSrc, mtxclientSrc, ... }: { imports = [ # base imports ../../modules/base-client.nix + # (import ../../modules/base-secrets.nix { path = "/home/rory/.config/sops/config.yaml"; }) ../../modules/packages/vim.nix # ../../modules/environments/home.nix ../../modules/software-templates/profilers.nix diff --git a/host/Rory-desktop/optional/gui/wayland.nix b/host/Rory-desktop/optional/gui/wayland.nix index e0394d3..c923007 100644 --- a/host/Rory-desktop/optional/gui/wayland.nix +++ b/host/Rory-desktop/optional/gui/wayland.nix @@ -15,14 +15,16 @@ # Fix for some Java AWT applications (e.g. Android Studio), # use this if they aren't displayed properly: export _JAVA_AWT_WM_NONREPARENTING=1 - ( - sleep 5 - ${pkgs.swaybg}/bin/swaybg -i ${../../../../modules/users/Rory/wallpaper.webp} + cp ${../../../../modules/users/Rory/wallpaper.webp} ~/.cache/wallpaper.webp + + ''; + #( + #sleep 5 + #${pkgs.swaybg}/bin/swaybg -i ${../../../../modules/users/Rory/wallpaper.webp} #$ {pkgs.swayidle}/bin/swayidle -w timeout 300 'swaylock -f -i ${../../../../modules/users/Rory/wallpaper.webp}' 'swaymsg "output * dpms off"' #$ {pkgs.swaylock}/bin/swaylock -f -i ${../../../../modules/users/Rory/wallpaper.webp} - ${pkgs.waybar}/bin/waybar - ) & - ''; + #${pkgs.waybar}/bin/waybar + #) & extraPackages = with pkgs; [ swaybg |