feat(hypr): swww -> wpaperd
All checks were successful
Discord / discord commits (push) Has been skipped

This commit is contained in:
matt1432 2024-04-21 14:57:38 -04:00
parent a1400a2335
commit 2af97f6b5a
6 changed files with 93 additions and 40 deletions

View file

@ -1534,6 +1534,7 @@
"trash-d-src": "trash-d-src", "trash-d-src": "trash-d-src",
"vimplugin-easytables-src": "vimplugin-easytables-src", "vimplugin-easytables-src": "vimplugin-easytables-src",
"vimplugin-riscv-src": "vimplugin-riscv-src", "vimplugin-riscv-src": "vimplugin-riscv-src",
"wpaperd": "wpaperd",
"xresources-theme-src": "xresources-theme-src" "xresources-theme-src": "xresources-theme-src"
} }
}, },
@ -1744,6 +1745,21 @@
"type": "github" "type": "github"
} }
}, },
"systems_7": {
"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"
}
},
"touch-gestures-src": { "touch-gestures-src": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -1847,6 +1863,27 @@
"type": "github" "type": "github"
} }
}, },
"wpaperd": {
"inputs": {
"nixpkgs": [
"nixpkgs"
],
"systems": "systems_7"
},
"locked": {
"lastModified": 1713427743,
"narHash": "sha256-5riZ/6yjgsW++SUIyJP5rFG65tkjJKgtvDLIGaoiHN0=",
"owner": "danyspin97",
"repo": "wpaperd",
"rev": "ee109b08066ed9893cf898b24e16354f547475a4",
"type": "github"
},
"original": {
"owner": "danyspin97",
"repo": "wpaperd",
"type": "github"
}
},
"xdph": { "xdph": {
"inputs": { "inputs": {
"hyprland-protocols": [ "hyprland-protocols": [

View file

@ -252,6 +252,14 @@
inputs.hyprland.follows = "hyprland"; inputs.hyprland.follows = "hyprland";
}; };
wpaperd = {
type = "github";
owner = "danyspin97";
repo = "wpaperd";
inputs.nixpkgs.follows = "nixpkgs";
};
solaar = { solaar = {
type = "github"; type = "github";
owner = "Svenum"; owner = "Svenum";

17
home/wpaperd.nix Normal file
View file

@ -0,0 +1,17 @@
{
pkgs,
wpaperd,
...
}: let
inherit (pkgs.writers) writeTOML;
wpaperdPkg = wpaperd.packages.${pkgs.system}.default;
wallpaper = "${pkgs.dracula-theme}/wallpapers/waves.png";
in {
home.packages = [wpaperdPkg];
xdg.configFile."wpaperd/config.toml".source = writeTOML "config.toml" {
default = {
path = wallpaper;
};
};
}

View file

@ -1,5 +1,5 @@
const { Box, Entry, Label, Window } = Widget; const { Box, Entry, Label, Window } = Widget;
const { execAsync, idle, readFileAsync } = Utils; const { idle, readFileAsync } = Utils;
const greetd = await Service.import('greetd'); const greetd = await Service.import('greetd');
@ -11,10 +11,6 @@ const DEFAULT_NAME = 'matt';
import { StringObject } from 'types/@girs/gtk-4.0/gtk-4.0.cjs'; import { StringObject } from 'types/@girs/gtk-4.0/gtk-4.0.cjs';
// Run Wallpaper daemon here to not cause issues at startup
execAsync(['bash', '-c',
`swww init --no-cache && swww img -t none ${App.configDir}/.wallpaper`]).catch(print);
const parsePasswd = (fileContent: string) => { const parsePasswd = (fileContent: string) => {
const splitUsers = fileContent.split('\n'); const splitUsers = fileContent.split('\n');
const parsedUsers = splitUsers.map((u) => { const parsedUsers = splitUsers.map((u) => {

View file

@ -17,38 +17,36 @@ in {
imports = [ imports = [
astal.homeManagerModules.default astal.homeManagerModules.default
../../home/theme ../../home/theme
../../home/wpaperd.nix
]; ];
programs.astal.enable = true; programs.astal.enable = true;
home = { home.packages = [
packages = [ hyprland
hyprland pkgs.bun
pkgs.bun pkgs.dart-sass
pkgs.dart-sass pkgs.gtk3
pkgs.swww pkgs.glib
pkgs.gtk3 ];
pkgs.glib
];
file = { xdg.configFile = {
".config/astal/.wallpaper".source = "${pkgs.dracula-theme}/wallpapers/waves.png"; "astal" = {
source = ../ags/astal;
".config/astal" = { recursive = true;
source = ../ags/astal;
recursive = true;
};
".config/astal/config.js".text =
/*
javascript
*/
''
import { transpileTypeScript } from './js/utils.js';
export default (await transpileTypeScript('greeter')).default;
'';
}; };
"astal/config.js".text =
/*
javascript
*/
''
import { transpileTypeScript } from './js/utils.js';
Utils.execAsync('wpaperd -d');
export default (await transpileTypeScript('greeter')).default;
'';
}; };
}; };
} }

View file

@ -1,13 +1,10 @@
{ {config, ...}: let
config,
pkgs,
...
}: let
inherit (config.vars) configDir; inherit (config.vars) configDir;
in { in {
imports = [../../home/theme]; imports = [
../../home/theme
home.packages = with pkgs; [swww]; ../../home/wpaperd.nix
];
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
settings = { settings = {
@ -15,7 +12,7 @@ in {
exec-once = [ exec-once = [
"hyprctl setcursor Dracula-cursors 24" "hyprctl setcursor Dracula-cursors 24"
"sleep 0.1 && swww init --no-cache && swww img -t none ${pkgs.dracula-theme}/wallpapers/waves.png" "wpaperd -d"
]; ];
windowrule = [ windowrule = [