use wallpapers from upstream flake (#13)

* initial commit

* source wallpapers from wallpaper flake and overlay over nixpkgs

* bump flake.lock

* nixos/desktop: install alyraffauf-wallpapers
This commit is contained in:
Aly Raffauf 2024-07-06 00:35:45 -04:00 committed by GitHub
parent c2eb69289a
commit c0ce74cad2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
12 changed files with 54 additions and 27 deletions

View file

@ -309,11 +309,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1720092067, "lastModified": 1720213509,
"narHash": "sha256-ebMlTz4wm+Md5BkCk6uGcRUvOvyjtc4bENvVSO5jrBI=", "narHash": "sha256-aPYf8Jnu1fMgMYMgQnH433/Fcqfky1Z5ZuzCkNKcR1U=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "0a6e83005f1910b5c1ec78476fcffc05af47833a", "rev": "cc98594c3aed0b542e03818371a4636f549f80e1",
"revCount": 4906, "revCount": 4908,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland" "url": "https://github.com/hyprwm/Hyprland"
@ -506,11 +506,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1719956923, "lastModified": 1720110830,
"narHash": "sha256-nNJHJ9kfPdzYsCOlHOnbiiyKjZUW5sWbwx3cakg3/C4=", "narHash": "sha256-E5dN9GDV4LwMEduhBLSkyEz51zM17XkWZ3/9luvNOPs=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "706eef542dec88cc0ed25b9075d3037564b2d164", "rev": "c0d0be00d4ecc4b51d2d6948e37466194c1e6c51",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -550,11 +550,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1720159001, "lastModified": 1720238698,
"narHash": "sha256-odlNfxYg1cQXYqGdJMNb6NFJp0wGwxbRl/rXqwWyatE=", "narHash": "sha256-9RhDCWVmR85eUWUWEJXUxGD/lVow9kQAghNkWEedbmk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "df5671c64b8c0978f6083e11f36b0d802d0c9aea", "rev": "f0636c1832d48659b0afff89a168cc1a76b871f4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -570,11 +570,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1720224769, "lastModified": 1720232163,
"narHash": "sha256-n2wxe8CDZCMRmA7PXN/+OAoqvoDu+hbqmVNKNMyDX8Q=", "narHash": "sha256-zcIC0qsSnr8xZIgdUm2bzfQOZaFYmaYU0vOFqpGhzXg=",
"owner": "alyraffauf", "owner": "alyraffauf",
"repo": "raffauflabs", "repo": "raffauflabs",
"rev": "912f73b0d0891ac272721c60ae2da43dbf06778b", "rev": "60074d939e3ad23ccca4082c052a2ece5cc60c8e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -594,7 +594,8 @@
"nixpkgsUnstable": "nixpkgsUnstable", "nixpkgsUnstable": "nixpkgsUnstable",
"nixvim": "nixvim", "nixvim": "nixvim",
"nur": "nur", "nur": "nur",
"raffauflabs": "raffauflabs" "raffauflabs": "raffauflabs",
"wallpapers": "wallpapers"
} }
}, },
"systems": { "systems": {
@ -678,6 +679,26 @@
"type": "github" "type": "github"
} }
}, },
"wallpapers": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1720239911,
"narHash": "sha256-5jo6v4d4y0dcxdBHqlSOKhvQszvLomANgE1rRYN9/D0=",
"owner": "alyraffauf",
"repo": "wallpapers",
"rev": "91b46bd86441e3c1c07c48b641a15b3203d6d971",
"type": "github"
},
"original": {
"owner": "alyraffauf",
"repo": "wallpapers",
"type": "github"
}
},
"xdph": { "xdph": {
"inputs": { "inputs": {
"hyprland-protocols": "hyprland-protocols", "hyprland-protocols": "hyprland-protocols",

View file

@ -43,6 +43,12 @@
}; };
nur.url = github:nix-community/NUR; nur.url = github:nix-community/NUR;
# My wallpapers
wallpapers = {
url = "github:alyraffauf/wallpapers";
inputs.nixpkgs.follows = "nixpkgs";
};
}; };
nixConfig = { nixConfig = {
@ -127,6 +133,7 @@
{ {
home-manager = { home-manager = {
backupFileExtension = "backup"; backupFileExtension = "backup";
extraSpecialArgs = {inherit inputs self;};
sharedModules = [ sharedModules = [
inputs.agenix.homeManagerModules.default inputs.agenix.homeManagerModules.default

View file

@ -49,12 +49,6 @@
) "file://${config.home.homeDirectory}/sync"; ) "file://${config.home.homeDirectory}/sync";
xdg = { xdg = {
dataFile."backgrounds".source = builtins.fetchGit {
url = "https://github.com/alyraffauf/wallpapers.git";
rev = "7603a8aa36b0d8d76bd9fd80d19e8b601e4839aa";
ref = "master";
};
userDirs = { userDirs = {
enable = true; enable = true;
createDirectories = true; createDirectories = true;

View file

@ -33,7 +33,7 @@
pkgs.writers.writeRuby "hyprland-randomWallpaper" {} '' pkgs.writers.writeRuby "hyprland-randomWallpaper" {} ''
require 'fileutils' require 'fileutils'
directory = "${config.xdg.dataHome}/backgrounds" directory = "${pkgs.alyraffauf-wallpapers}/share/backgrounds"
hyprctl = "${lib.getExe' config.wayland.windowManager.hyprland.package "hyprctl"}" hyprctl = "${lib.getExe' config.wayland.windowManager.hyprland.package "hyprctl"}"
old_pids = [] old_pids = []

View file

@ -8,7 +8,7 @@
kill `pidof swaybg` kill `pidof swaybg`
OLD_PIDS=() OLD_PIDS=()
directory=${config.home.homeDirectory}/.local/share/backgrounds directory=${pkgs.alyraffauf-wallpapers}/share/backgrounds
if [ -d "$directory" ]; then if [ -d "$directory" ]; then
while true; do while true; do

View file

@ -287,7 +287,7 @@
wallpaper = lib.mkOption { wallpaper = lib.mkOption {
description = "Default wallpaper."; description = "Default wallpaper.";
default = "${config.xdg.dataHome}/backgrounds/jr-korpa-9XngoIpxcEo-unsplash.jpg"; default = "${pkgs.alyraffauf-wallpapers}/share/backgrounds/jr-korpa-9XngoIpxcEo-unsplash.jpg";
type = lib.types.str; type = lib.types.str;
}; };
}; };

View file

@ -67,7 +67,7 @@
theme = { theme = {
enable = true; enable = true;
wallpaper = "${config.xdg.dataHome}/backgrounds/wallhaven-3led2d.jpg"; wallpaper = "${pkgs.alyraffauf-wallpapers}/share/backgrounds/wallhaven-3led2d.jpg";
}; };
}; };
} }

View file

@ -43,7 +43,7 @@
theme = { theme = {
enable = true; enable = true;
wallpaper = "${config.xdg.dataHome}/backgrounds/jr-korpa-9XngoIpxcEo-unsplash.jpg"; wallpaper = "${pkgs.alyraffauf-wallpapers}/share/backgrounds/jr-korpa-9XngoIpxcEo-unsplash.jpg";
}; };
}; };
} }

View file

@ -40,7 +40,7 @@
theme = { theme = {
enable = true; enable = true;
wallpaper = "${config.xdg.dataHome}/backgrounds/jr-korpa-9XngoIpxcEo-unsplash.jpg"; wallpaper = "${pkgs.alyraffauf-wallpapers}/share//backgrounds/jr-korpa-9XngoIpxcEo-unsplash.jpg";
}; };
}; };
} }

View file

@ -1,5 +1,6 @@
{ {
pkgs, pkgs,
inputs,
lib, lib,
config, config,
... ...

View file

@ -46,6 +46,7 @@
}); });
xdg-desktop-portal-hyprland = inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland; xdg-desktop-portal-hyprland = inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland;
alyraffauf-wallpapers = inputs.wallpapers.packages.${pkgs.system}.default;
}) })
]; ];
}; };

View file

@ -24,7 +24,10 @@
|| config.ar.desktop.steam.enable || config.ar.desktop.steam.enable
|| config.ar.desktop.sway.enable || config.ar.desktop.sway.enable
) { ) {
environment.sessionVariables.NIXOS_OZONE_WL = "1"; environment = {
sessionVariables.NIXOS_OZONE_WL = "1";
systemPackages = [pkgs.alyraffauf-wallpapers];
};
fonts.packages = with pkgs; [ fonts.packages = with pkgs; [
liberation_ttf liberation_ttf