fix eval
This commit is contained in:
parent
7ce91a6a61
commit
b1aa89de0a
5 changed files with 13 additions and 16 deletions
|
@ -115,7 +115,7 @@ in {
|
||||||
enabled = "ibus";
|
enabled = "ibus";
|
||||||
ibus.engines = with pkgs.ibus-engines; [anthy];
|
ibus.engines = with pkgs.ibus-engines; [anthy];
|
||||||
};
|
};
|
||||||
services.polkit.enable = true;
|
security.polkit.enable = true;
|
||||||
security.pam.services.kwallet = {
|
security.pam.services.kwallet = {
|
||||||
name = "kwallet";
|
name = "kwallet";
|
||||||
enableKwallet = true;
|
enableKwallet = true;
|
||||||
|
|
|
@ -158,7 +158,6 @@ in {
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
exec ${configure-gtk}/bin/configure-gtk
|
exec ${configure-gtk}/bin/configure-gtk
|
||||||
exec ${pkgs.systemd}/bin/systemctl --user import-environment
|
exec ${pkgs.systemd}/bin/systemctl --user import-environment
|
||||||
exec ${start-extra-services}/bin/start-extra-services
|
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -41,7 +41,7 @@ in {
|
||||||
{
|
{
|
||||||
timeout = 305;
|
timeout = 305;
|
||||||
command = "${screen-off-script}";
|
command = "${screen-off-script}";
|
||||||
resume = "${resume-script}";
|
resumeCommand = "${resume-script}";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
timeout = 900;
|
timeout = 900;
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{pkgs, ...}: let
|
{pkgs, config, ...}: let
|
||||||
theme = import ../../extra/theme.nix;
|
theme = import ../../extra/theme.nix;
|
||||||
inherit (config.lib.formats.rasi) mkLiteral;
|
inherit (config.lib.formats.rasi) mkLiteral;
|
||||||
rasiColor = c: mkLiteral (cssColor c);
|
rasiColor = c: mkLiteral (theme.cssColor c);
|
||||||
in {
|
in {
|
||||||
gtk = {
|
gtk = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
@ -216,14 +216,12 @@ in {
|
||||||
width = 600;
|
width = 600;
|
||||||
};
|
};
|
||||||
element-text = element;
|
element-text = element;
|
||||||
element-icon = element;
|
|
||||||
mode-switcher = element;
|
|
||||||
window = {
|
window = {
|
||||||
height = mkLiteral "360px";
|
height = mkLiteral "360px";
|
||||||
border = mkLiteral "3px";
|
border = mkLiteral "3px";
|
||||||
border-color = mkLiteral "@border-col";
|
border-color = mkLiteral "@border-col";
|
||||||
background-color = mkLiteral "@bg-col";
|
background-color = mkLiteral "@bg-col";
|
||||||
opacity = 0.9;
|
opacity = mkLiteral "0.9";
|
||||||
};
|
};
|
||||||
mainbox = {
|
mainbox = {
|
||||||
background-color = mkLiteral "@bg-col";
|
background-color = mkLiteral "@bg-col";
|
||||||
|
@ -269,7 +267,7 @@ in {
|
||||||
text-color = mkLiteral "@fg-col";
|
text-color = mkLiteral "@fg-col";
|
||||||
};
|
};
|
||||||
|
|
||||||
element-icon = {
|
element-icon = element // {
|
||||||
size = mkLiteral "25px";
|
size = mkLiteral "25px";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -278,7 +276,7 @@ in {
|
||||||
text-color = mkLiteral "@fg-col2";
|
text-color = mkLiteral "@fg-col2";
|
||||||
};
|
};
|
||||||
|
|
||||||
mode-switcher = {
|
mode-switcher = element // {
|
||||||
spacing = 0;
|
spacing = 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -286,8 +284,8 @@ in {
|
||||||
padding = mkLiteral "10px";
|
padding = mkLiteral "10px";
|
||||||
background-color = mkLiteral "@bg-col-light";
|
background-color = mkLiteral "@bg-col-light";
|
||||||
text-color = mkLiteral "@grey";
|
text-color = mkLiteral "@grey";
|
||||||
vertical-align = 0.5;
|
vertical-align = mkLiteral "0.5";
|
||||||
horizontal-align = 0.5;
|
horizontal-align = mkLiteral "0.5";
|
||||||
};
|
};
|
||||||
|
|
||||||
"button selected" = {
|
"button selected" = {
|
||||||
|
|
|
@ -60,11 +60,11 @@
|
||||||
};
|
};
|
||||||
tooltip-format = "MPD (connected)";
|
tooltip-format = "MPD (connected)";
|
||||||
tooltip-format-disconnected = "MPD (disconnected)";
|
tooltip-format-disconnected = "MPD (disconnected)";
|
||||||
on-click = "${pkgs.mpc}/bin/mpc toggle";
|
on-click = "${pkgs.mpc-cli}/bin/mpc toggle";
|
||||||
on-click-middle = "${pkgs.foot}/bin/foot ${pkgs.ncmpcpp}/bin/ncmpcpp";
|
on-click-middle = "${pkgs.foot}/bin/foot ${pkgs.ncmpcpp}/bin/ncmpcpp";
|
||||||
on-click-right = "${pkgs.mpc}/bin/mpc stop";
|
on-click-right = "${pkgs.mpc-cli}/bin/mpc stop";
|
||||||
on-scroll-up = "${pkgs.mpc}/bin/seekthrough +00:00:10";
|
on-scroll-up = "${pkgs.mpc-cli}/bin/mpc seekthrough +00:00:10";
|
||||||
on-scroll-down = "${pkgs.mpc}/bin/seekthrough -00:00:10";
|
on-scroll-down = "${pkgs.mpc-cli}/bin/mpc seekthrough -00:00:10";
|
||||||
};
|
};
|
||||||
idle_inhibitor = {
|
idle_inhibitor = {
|
||||||
format = "{icon}";
|
format = "{icon}";
|
||||||
|
|
Loading…
Reference in a new issue