user/hyprlock: scale based on new hidpi option
This commit is contained in:
parent
78c578b7ca
commit
cdae556af4
3 changed files with 41 additions and 21 deletions
|
|
@ -39,6 +39,7 @@
|
||||||
batteryDevice = "BATT";
|
batteryDevice = "BATT";
|
||||||
kbBacklightDevice = "asus::kbd_backlight";
|
kbBacklightDevice = "asus::kbd_backlight";
|
||||||
hasFingerprint = true;
|
hasFingerprint = true;
|
||||||
|
hidpi = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
# For steam fhs-env
|
# For steam fhs-env
|
||||||
|
|
|
||||||
|
|
@ -39,5 +39,10 @@ in {
|
||||||
type = types.bool;
|
type = types.bool;
|
||||||
default = config.me.environment == "laptop";
|
default = config.me.environment == "laptop";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
hidpi = mkOption {
|
||||||
|
type = types.bool;
|
||||||
|
default = false;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,17 @@
|
||||||
{ config, lib, ... }: {
|
{ config, lib, ... }:
|
||||||
|
let
|
||||||
|
scaling = if config.me.hidpi then 1 else 0.5;
|
||||||
|
s = value: if builtins.isInt value || builtins.isFloat value
|
||||||
|
then
|
||||||
|
builtins.floor (value * scaling)
|
||||||
|
else if builtins.isList value
|
||||||
|
then
|
||||||
|
lib.strings.concatMapStringsSep "," (v: builtins.toString (scaling * v)) value
|
||||||
|
else
|
||||||
|
builtins.throw "invalid scaled value type ${builtins.typeOf value} for ${value}";
|
||||||
|
sn = value: s (builtins.map (v: (-v)) value);
|
||||||
|
in
|
||||||
|
{
|
||||||
programs.hyprlock = {
|
programs.hyprlock = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings = {
|
settings = {
|
||||||
|
|
@ -16,26 +29,27 @@
|
||||||
monitor = "";
|
monitor = "";
|
||||||
color = "$base";
|
color = "$base";
|
||||||
};
|
};
|
||||||
shape = [
|
shape = lib.optionals (config.me.batteryDevice != null) [
|
||||||
# Battery pill
|
# Battery pill
|
||||||
{
|
{
|
||||||
monitor = "";
|
monitor = "";
|
||||||
size = "165, 65";
|
size = s [165 65];
|
||||||
color = "$crust";
|
color = "$crust";
|
||||||
rounding = -1;
|
rounding = -1;
|
||||||
halign = "right";
|
halign = "right";
|
||||||
valign = "top";
|
valign = "top";
|
||||||
position = "-595,-10";
|
position = sn [595 10];
|
||||||
}
|
}
|
||||||
|
] ++ [
|
||||||
# Time pill
|
# Time pill
|
||||||
{
|
{
|
||||||
monitor = "";
|
monitor = "";
|
||||||
size = "545, 65";
|
size = s [545 65];
|
||||||
color = "$crust";
|
color = "$crust";
|
||||||
rounding = -1;
|
rounding = -1;
|
||||||
halign = "right";
|
halign = "right";
|
||||||
valign = "top";
|
valign = "top";
|
||||||
position = "-40,-10";
|
position = sn [40 10];
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
label = lib.optionals config.me.hasFingerprint [
|
label = lib.optionals config.me.hasFingerprint [
|
||||||
|
|
@ -44,10 +58,10 @@
|
||||||
monitor = "";
|
monitor = "";
|
||||||
color = "$text";
|
color = "$text";
|
||||||
font_family = "Material Symbols Outlined";
|
font_family = "Material Symbols Outlined";
|
||||||
font_size = 64;
|
font_size = s 64;
|
||||||
halign = "center";
|
halign = "center";
|
||||||
valign = "top";
|
valign = "top";
|
||||||
position = "0, -100";
|
position = sn [0 100];
|
||||||
text = "";
|
text = "";
|
||||||
}
|
}
|
||||||
# Fingerprint text
|
# Fingerprint text
|
||||||
|
|
@ -55,9 +69,9 @@
|
||||||
monitor = "";
|
monitor = "";
|
||||||
color = "$text";
|
color = "$text";
|
||||||
text = "$FPRINTPROMPT";
|
text = "$FPRINTPROMPT";
|
||||||
font_size = 25;
|
font_size = s 25;
|
||||||
font_family = "Open Sans";
|
font_family = "Open Sans";
|
||||||
position = "0, -235";
|
position = sn [0 235];
|
||||||
halign = "center";
|
halign = "center";
|
||||||
valign = "top";
|
valign = "top";
|
||||||
}
|
}
|
||||||
|
|
@ -68,8 +82,8 @@
|
||||||
text = "";
|
text = "";
|
||||||
color = "$accent";
|
color = "$accent";
|
||||||
font_family = "Material Symbols Outlined";
|
font_family = "Material Symbols Outlined";
|
||||||
font_size = 27;
|
font_size = s 27;
|
||||||
position = "-695, -20";
|
position = sn [695 20];
|
||||||
halign = "right";
|
halign = "right";
|
||||||
valign = "top";
|
valign = "top";
|
||||||
}
|
}
|
||||||
|
|
@ -78,9 +92,9 @@
|
||||||
monitor = "";
|
monitor = "";
|
||||||
text = ''cmd[update:60000] echo "<span weight='700'>$(cat /sys/class/power_supply/${config.me.batteryDevice}/capacity)%</span>"'';
|
text = ''cmd[update:60000] echo "<span weight='700'>$(cat /sys/class/power_supply/${config.me.batteryDevice}/capacity)%</span>"'';
|
||||||
color = "$text";
|
color = "$text";
|
||||||
font_size = 23;
|
font_size = s 23;
|
||||||
font_family = "Open Sans";
|
font_family = "Open Sans";
|
||||||
position = "-625, -20";
|
position = sn [625 20];
|
||||||
halign = "right";
|
halign = "right";
|
||||||
valign = "top";
|
valign = "top";
|
||||||
}
|
}
|
||||||
|
|
@ -90,10 +104,10 @@
|
||||||
monitor = "";
|
monitor = "";
|
||||||
color = "$text";
|
color = "$text";
|
||||||
font_family = "Open Sans";
|
font_family = "Open Sans";
|
||||||
font_size = 23;
|
font_size = s 23;
|
||||||
halign = "right";
|
halign = "right";
|
||||||
valign = "top";
|
valign = "top";
|
||||||
position = "-70, -20";
|
position = sn [70 20];
|
||||||
text = ''cmd[update:1000] echo "<span alpha='70%' weight='550'>$(date '+%A, %d %B %Y')</span> <span weight='700'>$(date +%H:%M)</span><span alpha='70%' weight='550'>$(date +:%S)</span>"'';
|
text = ''cmd[update:1000] echo "<span alpha='70%' weight='550'>$(date '+%A, %d %B %Y')</span> <span weight='700'>$(date +%H:%M)</span><span alpha='70%' weight='550'>$(date +:%S)</span>"'';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -102,17 +116,17 @@
|
||||||
monitor = "";
|
monitor = "";
|
||||||
color = "$red";
|
color = "$red";
|
||||||
font_family = "Open Sans";
|
font_family = "Open Sans";
|
||||||
font_size = 25;
|
font_size = s 25;
|
||||||
text = "$FAIL $ATTEMPTS[]";
|
text = "$FAIL $ATTEMPTS[]";
|
||||||
position = "0, -200";
|
position = sn [0 200];
|
||||||
halign = "center";
|
halign = "center";
|
||||||
valign = "center";
|
valign = "center";
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
input-field = {
|
input-field = {
|
||||||
monitor = "";
|
monitor = "";
|
||||||
size = "600, 120";
|
size = s [600 120];
|
||||||
outline_thickness = 4;
|
outline_thickness = s 4;
|
||||||
check_color = "$peach";
|
check_color = "$peach";
|
||||||
dots_size = 0.2;
|
dots_size = 0.2;
|
||||||
dots_spacing = 0.2;
|
dots_spacing = 0.2;
|
||||||
|
|
@ -125,7 +139,7 @@
|
||||||
fade_on_empty = false;
|
fade_on_empty = false;
|
||||||
hide_input = false;
|
hide_input = false;
|
||||||
capslock_color = "$yellow";
|
capslock_color = "$yellow";
|
||||||
position = "0, -47";
|
position = sn [0 47];
|
||||||
halign = "center";
|
halign = "center";
|
||||||
valign = "center";
|
valign = "center";
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue