fix(hyprland): adjusted to reflect changes to new hyprland version

This commit is contained in:
ooks-io 2024-05-14 23:18:52 +12:00
parent aff274cdb6
commit c5739925e9
5 changed files with 179 additions and 318 deletions

View file

@ -8,81 +8,70 @@ in
{
imports = [
inputs.hyprlock.homeManagerModules.default
# inputs.hyprlock.homeManagerModules.default
# inputs.hypridle.homeManagerModules.default
];
config = lib.mkIf cfg.enable {
home.sessionVariables.LOCKER = "hyprlock";
programs.hyprlock = {
enable = true;
general = {
hide_cursor = true;
no_fade_in = true;
settings = {
enable = true;
general = {
hide_cursor = true;
no_fade_in = true;
};
backgrounds = [
{
monitor = "";
path = "";
color = "0xff${colors.base01}";
}
];
input-fields = [
{
size = {
width = 300;
height = 40;
};
position = {
x = 0;
y = 0;
};
outline_thickness = 2;
dots_spacing = 0.2;
fade_on_empty = false;
placeholder_text = "";
outer_color = "0xff${colors.base02}";
inner_color = "0xff${colors.base00}";
font_color = "0xff${colors.base05}";
}
];
labels = [
{
monitor = "";
text = " ";
position = {
x = 0;
y = 80;
};
color = "0xff${colors.base08}";
font_size = 30;
font_family = "${fonts.monospace.family}";
}
{
monitor = "";
text = "$TIME";
position = {
x = 0;
y = -80;
};
color = "0xff${colors.base0B}";
font_size = 20;
font_family = "${fonts.monospace.family}";
}
];
};
backgrounds = [
{
monitor = "";
path = "";
color = "0xff${colors.base01}";
}
];
input-fields = [
{
size = {
width = 300;
height = 40;
};
position = {
x = 0;
y = 0;
};
outline_thickness = 2;
dots_spacing = 0.2;
fade_on_empty = false;
placeholder_text = "";
outer_color = "0xff${colors.base02}";
inner_color = "0xff${colors.base00}";
font_color = "0xff${colors.base05}";
}
];
labels = [
{
monitor = "";
text = " ";
position = {
x = 0;
y = 80;
};
color = "0xff${colors.base08}";
font_size = 30;
font_family = "${fonts.monospace.family}";
}
{
monitor = "";
text = "$TIME";
position = {
x = 0;
y = -80;
};
color = "0xff${colors.base0B}";
font_size = 20;
font_family = "${fonts.monospace.family}";
}
];
};
# services.hypridle = {
# enable = true;
# package = pkgs.hypridle;
# beforeSleepCmd = "${pkgs.systemd}/bin/loginctl lock-session";
# lockCmd = lib.getExe config.programs.hyprlock.package;
# listeners = [
# {
# timeout = 500;
# onTimeout = lib.getExe config.programs.hyprlock.package;
# }
# ];
# };
};
}

View file

@ -9,12 +9,13 @@ in
config = lib.mkIf cfg.enable {
wayland.windowManager.hyprland = {
settings = {
cursor = {
inactive_timeout = 4;
};
general = {
gaps_in = 10;
gaps_out = 10;
border_size = 2;
cursor_inactive_timeout = 4;
"col.active_border" = "0xff${config.colorscheme.colors.base05}";
"col.inactive_border" = "0xff${config.colorscheme.colors.base02}";
};

View file

@ -6,14 +6,13 @@ let
in
{
imports = [ inputs.hyprpaper.homeManagerModules.hyprpaper ];
config = lib.mkIf cfg.enable {
services.hyprpaper = {
enable = true;
preloads = ["${wallpaperPath}"];
wallpapers = [", ${wallpaperPath}"];
ipc = false;
};
xdg.configFile."hypr/hyprpaper.conf".text = ''
preload = ${wallpaperPath}
wallpaper = , ${wallpaperPath}
'';
};
}