replace programs.mako with services.mako

This commit is contained in:
notgne2 2023-03-13 04:59:30 -07:00
parent 6a7b8b55b7
commit 527a6bc246
Signed by: notgne2
SSH Key Fingerprint: SHA256:qlFCAimT/PvNIG3u+aYT9pIqFCWgu6sNsWjpV1vHLIE
4 changed files with 13 additions and 12 deletions

View File

@ -269,7 +269,7 @@ in {
xdg.configFile."Element/theme.json".text = builtins.toJSON elementTheme; xdg.configFile."Element/theme.json".text = builtins.toJSON elementTheme;
# Mako # Mako
programs.mako = { services.mako = {
backgroundColor = "#${cfg.base16.base00}"; backgroundColor = "#${cfg.base16.base00}";
textColor = "#${cfg.base16.base07}"; textColor = "#${cfg.base16.base07}";
borderColor = "#${cfg.base16.base08}"; borderColor = "#${cfg.base16.base08}";

View File

@ -491,7 +491,7 @@ in {
''; '';
}; };
programs.mako = { services.mako = {
enable = lib.mkDefault true; enable = lib.mkDefault true;
maxVisible = lib.mkDefault 6; maxVisible = lib.mkDefault 6;
extraConfig = lib.generators.toKeyValue {} { extraConfig = lib.generators.toKeyValue {} {

View File

@ -62,7 +62,7 @@ in {
programs.rofi.font = "${cfg.font.name} ${toString cfg.font.size}"; programs.rofi.font = "${cfg.font.name} ${toString cfg.font.size}";
programs.mako.font = "${cfg.font.name} ${toString cfg.font.size}"; services.mako.font = "${cfg.font.name} ${toString cfg.font.size}";
wayland.windowManager.sway.config.fonts = { wayland.windowManager.sway.config.fonts = {
names = [cfg.font.name]; names = [cfg.font.name];

View File

@ -15,15 +15,16 @@ in {
}; };
config = lib.mkIf (cfg.sock != null) { config = lib.mkIf (cfg.sock != null) {
systemd.services.ssh-agent-nix-proxy = { # systemd.services.ssh-agent-nix-proxy = {
wantedBy = [ "nix-daemon.service" ]; # wantedBy = [ "nix-daemon.service" ];
partOf = [ "nix-daemon.service" ]; # partOf = [ "nix-daemon.service" ];
serviceConfig = { # serviceConfig = {
ExecStart = "${pkgs.socat}/bin/socat UNIX-LISTEN:/run/nix-ssh-agent,mode=770,group=nixbld,user=root,reuseaddr,fork UNIX-CONNECT:${cfg.sock}"; # ExecStart = "${pkgs.socat}/bin/socat UNIX-LISTEN:/run/nix-ssh-agent,mode=770,group=nixbld,user=root,reuseaddr,fork UNIX-CONNECT:${cfg.sock}";
Restart = "always"; # Restart = "always";
}; # };
}; # };
systemd.services.nix-daemon.environment.SSH_AUTH_SOCK = "/run/nix-ssh-agent"; # systemd.services.nix-daemon.environment.SSH_AUTH_SOCK = "/run/nix-ssh-agent";
systemd.services.nix-daemon.environment.SSH_AUTH_SOCK = cfg.sock;
}; };
} }