matt1432/nixos-configs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(desktop): wpaperd -> hyprpaper
All checks were successful
Discord / discord commits (push) Has been skipped
Details

Browse source
This commit is contained in:
matt1432 2024-07-06 03:07:47 -04:00
parent 79c293f29f
commit 35645b93a6
7 changed files with 32 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
flake.lock
View file

@ -2197,8 +2197,7 @@
"subsync": "subsync",
"trash-d-src": "trash-d-src",
"vimplugin-easytables-src": "vimplugin-easytables-src",
"vimplugin-ts-error-translator-src": "vimplugin-ts-error-translator-src",
"wpaperd": "wpaperd"
"vimplugin-ts-error-translator-src": "vimplugin-ts-error-translator-src"
}
},
"scss-reset": {
@ -2509,21 +2508,6 @@
"type": "github"
}
},
"systems_8": {
"locked": {
"lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
"owner": "nix-systems",
"repo": "default-linux",
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default-linux",
"type": "github"
}
},
"trash-d-src": {
"flake": false,
"locked": {
@ -2657,28 +2641,6 @@
"type": "github"
}
},
"wpaperd": {
"inputs": {
"nixpkgs": [
"nixpkgs"
],
"systems": "systems_8"
},
"locked": {
"lastModified": 1718794850,
"narHash": "sha256-HJX49FVqbRWa3HwN5fVbPVLZ7lvrtni0nuiY2SRwhP4=",
"owner": "danyspin97",
"repo": "wpaperd",
"rev": "d4a9cd8b751bed47bf57a93a7ee63054ba43e63b",
"type": "github"
},
"original": {
"owner": "danyspin97",
"repo": "wpaperd",
"rev": "d4a9cd8b751bed47bf57a93a7ee63054ba43e63b",
"type": "github"
}
},
"xdph": {
"inputs": {
"hyprland-protocols": "hyprland-protocols",

10
flake.nix
View file

@ -1,4 +1,5 @@
# Do not modify! This file is generated.
{
inputs = {
Hyprspace = {
@ -350,13 +351,6 @@
repo = "ts-error-translator.nvim";
type = "github";
};
wpaperd = {
inputs.nixpkgs.follows = "nixpkgs";
owner = "danyspin97";
repo = "wpaperd";
rev = "d4a9cd8b751bed47bf57a93a7ee63054ba43e63b";
type = "github";
};
};
outputs = inputs: inputs.flakegen ./flake.in.nix inputs;
}
}

8
inputs.nix
View file

@ -161,14 +161,6 @@ let
repo = "grim-hyprland";
};
wpaperd = mkDep {
owner = "danyspin97";
repo = "wpaperd";
# FIXME: latest breaks
rev = "d4a9cd8b751bed47bf57a93a7ee63054ba43e63b";
};
discord-overlay = mkDep {
owner = "matt1432";
repo = "discord-nightly-overlay";

4
modules/desktop/desktop-environment/home/style.nix
View file

@ -3,7 +3,7 @@
in {
imports = [
../../home/theme
../../home/wpaperd.nix
../../home/hyprpaper.nix
];
wayland.windowManager.hyprland = {
@ -12,7 +12,7 @@ in {
exec-once = [
"hyprctl setcursor Dracula-cursors 24"
"wpaperd -d"
"hyprpaper"
];
windowrule = [

4
modules/desktop/display-manager/astal.nix
View file

@ -26,7 +26,7 @@ in {
imports = [
astal.homeManagerModules.default
../home/theme
../home/wpaperd.nix
../home/hyprpaper.nix
];
programs.astal.enable = true;
@ -50,7 +50,7 @@ in {
''
import { transpileTypeScript } from './js/utils.js';
Utils.execAsync('wpaperd -d');
Utils.execAsync('hyprpaper');
export default (await transpileTypeScript('greeter')).default;
'';

25
modules/desktop/home/hyprpaper.nix Normal file
View file

@ -0,0 +1,25 @@
{
lib,
pkgs,
self,
...
}: let
wallpaper = toString self.legacyPackages.${pkgs.system}.dracula.wallpaper;
in {
home.packages = with pkgs; [hyprpaper];
xdg.configFile."hypr/hyprpaper.conf" = {
text = lib.hm.generators.toHyprconf {
attrs = {
ipc = "on";
splash = false;
preload = [wallpaper];
wallpaper = [
",${wallpaper}"
];
};
};
};
}

18
modules/desktop/home/wpaperd.nix
View file

@ -1,18 +0,0 @@
{
pkgs,
self,
wpaperd,
...
}: let
inherit (pkgs.writers) writeTOML;
wpaperdPkg = wpaperd.packages.${pkgs.system}.default;
in {
home.packages = [wpaperdPkg];
xdg.configFile."wpaperd/config.toml".source = writeTOML "config.toml" {
default = {
path = toString self.legacyPackages.${pkgs.system}.dracula.wallpaper;
mode = "stretch";
};
};
}