diff --git a/nix/hardware/spaceship/base_config.nix b/nix/hardware/spaceship/base_config.nix index c970730..c0b0499 100644 --- a/nix/hardware/spaceship/base_config.nix +++ b/nix/hardware/spaceship/base_config.nix @@ -1,6 +1,7 @@ -{config, ...}:{ +{ config, ... }: { imports = [ ../../modules/ironbar_config.nix + ../../modules/hyprpaper_config.nix ]; wayland.windowManager.hyprland.settings.monitor = [ # default @@ -30,5 +31,17 @@ # monitor right "3,monitor:HDMI-A-1, default:true" ]; - programs.monitor = "DP-1"; + programs.ironbar.monitor = "DP-1"; + programs.hyprland.hyprpaper = '' + #load + preload = /home/dashie/Pictures/backgrounds/shinobu_2k.jpg + preload = /home/dashie/Pictures/backgrounds/shino_wide.png + preload = /home/dashie/Pictures/backgrounds/shinobu_1200.jpg + + #set + wallpaper = DP-2,/home/dashie/Pictures/backgrounds/shinobu_2k.jpg + wallpaper = DP-1,/home/dashie/Pictures/backgrounds/shino_wide.png + wallpaper = HDMI-A-1,/home/dashie/Pictures/backgrounds/shinobu_1200.jpg + splash = true + ''; } diff --git a/nix/hardware/spaceship/configuration.nix b/nix/hardware/spaceship/configuration.nix index 422235f..be04364 100644 --- a/nix/hardware/spaceship/configuration.nix +++ b/nix/hardware/spaceship/configuration.nix @@ -63,7 +63,7 @@ ]; # this password will only last for the first login # e.g. login, then change to whatever else, this also ensures no public hash is available - hashedPassword = "firstlogin"; + password = "firstlogin"; }; nix.settings = { diff --git a/nix/modules/hyprpaper_config.nix b/nix/modules/hyprpaper_config.nix new file mode 100644 index 0000000..5968847 --- /dev/null +++ b/nix/modules/hyprpaper_config.nix @@ -0,0 +1,14 @@ +{ lib, ... }: { + options.programs.hyprland = { + hyprpaper = lib.mkOption { + default = ''''; + example = '' + hyprpaper stuff + ''; + type = lib.types.lines; + description = '' + Extra settings for foo. + ''; + }; + }; +} diff --git a/nix/programs/hyprland/hyprpaper.nix b/nix/programs/hyprland/hyprpaper.nix index 652abf9..8b93285 100644 --- a/nix/programs/hyprland/hyprpaper.nix +++ b/nix/programs/hyprland/hyprpaper.nix @@ -1,18 +1,5 @@ -#{ -# xdg.configFile."hypr/hyprpaper.conf" = { -# text = -# '' -# #load -# preload = /home/dashie/Pictures/backgrounds/shinobu_2k.jpg -# preload = /home/dashie/Pictures/backgrounds/shino_wide.png -# preload = /home/dashie/Pictures/backgrounds/shinobu_1200.jpg -# -# #set -# wallpaper = DP-2,/home/dashie/Pictures/backgrounds/shinobu_2k.jpg -# wallpaper = DP-1,/home/dashie/Pictures/backgrounds/shino_wide.png -# wallpaper = HDMI-A-1,/home/dashie/Pictures/backgrounds/shinobu_1200.jpg -# splash = true -# ''; -# }; -#} -{} +{ config, ... }: { + xdg.configFile."hypr/hyprpaper.conf" = { + text = config.programs.hyprland.hyprpaper; + }; +}