colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

programs: services: no need to fully-qualify paths anymore (s6 doesn't require)

Browse Source
This commit is contained in:
Colin 2024-03-21 05:23:38 +00:00
parent 1417497001
commit 9b793ef4b8
19 changed files with 25 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hosts/common/programs/abaddon.nix
View File

@ -88,7 +88,7 @@ in
services.abaddon = {
description = "unofficial Discord chat client";
wantedBy = lib.mkIf cfg.config.autostart [ "graphical-session.target" ];
serviceConfig.ExecStart = "${cfg.package}/bin/abaddon";
serviceConfig.ExecStart = "abaddon";
};
};
}

2
hosts/common/programs/bonsai.nix
View File

@ -123,7 +123,7 @@ in
script = ''
${pkgs.coreutils}/bin/rm -f $XDG_RUNTIME_DIR/bonsai
exec ${cfg.package}/bin/bonsaid -t ${cfg.config.configFile}
exec bonsaid -t ${cfg.config.configFile}
'';
};
};

2
hosts/common/programs/calls.nix
View File

@ -46,7 +46,7 @@ in
description = "gnome-calls daemon to monitor incoming SIP calls";
wantedBy = lib.mkIf cfg.config.autostart [ "graphical-session.target" ];
# add --verbose for more debugging
serviceConfig.ExecStart = "env G_MESSAGES_DEBUG=all ${cfg.package}/bin/gnome-calls --daemon";
serviceConfig.ExecStart = "env G_MESSAGES_DEBUG=all gnome-calls --daemon";
};
};
programs.calls = lib.mkIf cfg.enabled {

2
hosts/common/programs/dino.nix
View File

@ -80,7 +80,7 @@ in
#
# note that debug logging during calls produces so much journal spam that it pegs the CPU and causes dropped audio
# env G_MESSAGES_DEBUG = "all";
serviceConfig.ExecStart = "env PULSE_LATENCY_MSEC=20 ${cfg.package}/bin/dino";
serviceConfig.ExecStart = "env PULSE_LATENCY_MSEC=20 dino";
};
};
}

2
hosts/common/programs/dissent.nix
View File

@ -60,7 +60,7 @@ in
after = [ "graphical-session.target" ];
wantedBy = lib.mkIf cfg.config.autostart [ "graphical-session.target" ];
serviceConfig.ExecStart = "${cfg.package}/bin/dissent";
serviceConfig.ExecStart = "dissent";
};
};
}

7
hosts/common/programs/fcitx5.nix
View File

@ -24,10 +24,7 @@
# - nixpkgs has a few themes: `fcitx5-{material-color,nord,rose-pine}`
# - NUR has a few themes
# - <https://github.com/catppuccin/fcitx5>
{ config, lib, pkgs, ... }:
let
cfg = config.sane.programs.fcitx5;
in
{ lib, pkgs, ... }:
{
sane.programs.fcitx5 = {
packageUnwrapped = pkgs.fcitx5-with-addons.override {
@ -103,7 +100,7 @@ in
after = [ "graphical-session.target" ];
wantedBy = [ "graphical-session.target" ];
serviceConfig.ExecStart = "${cfg.package}/bin/fcitx5";
serviceConfig.ExecStart = "fcitx5";
};
env.XMODIFIERS = "@im=fcitx";

2
hosts/common/programs/fractal.nix
View File

@ -73,7 +73,7 @@ in
wantedBy = lib.mkIf cfg.config.autostart [ "graphical-session.target" ];
# env "G_MESSAGES_DEBUG=all"
serviceConfig.ExecStart = "${cfg.package}/bin/fractal";
serviceConfig.ExecStart = "fractal";
};
};
}

2
hosts/common/programs/geary.nix
View File

@ -91,7 +91,7 @@ in
# partOf = [ "graphical-session.target" ];
wantedBy = lib.mkIf cfg.config.autostart [ "graphical-session.target" ];
serviceConfig.ExecStart = "${cfg.package}/bin/geary";
serviceConfig.ExecStart = "geary";
};
};

9
hosts/common/programs/gnome-keyring/default.nix
View File

@ -1,7 +1,4 @@
{ config, lib, pkgs, ... }:
let
cfg = config.sane.programs.gnome-keyring;
in
{ lib, pkgs, ... }:
{
sane.programs.gnome-keyring = {
packageUnwrapped = pkgs.rmDbusServices pkgs.gnome.gnome-keyring;
@ -54,8 +51,8 @@ in
after = [ "graphical-session.target" ];
wantedBy = [ "graphical-session.target" ];
serviceConfig = {
ExecStart = "${cfg.package}/bin/gnome-keyring-daemon --start --foreground --components=secrets";
ExecStartPre = "${pkgs.coreutils}/bin/mkdir -m 0700 -p %t/keyring";
ExecStart = "gnome-keyring-daemon --start --foreground --components=secrets";
ExecStartPre = "mkdir -m 0700 -p %t/keyring";
};
};
};

4
hosts/common/programs/pipewire.nix
View File

@ -35,7 +35,7 @@ in
serviceConfig = {
# env PIPEWIRE_LOG_SYSTEMD=false"
# env PIPEWIRE_DEBUG"*:3,mod.raop*:5,pw.rtsp-client*:5"
ExecStart = "${cfg.package}/bin/pipewire";
ExecStart = "pipewire";
ExecStartPost = pkgs.writeShellScript "pipewire-wait-started" ''
waitFor() {
while [ ! -e "$1" ]; do
@ -53,7 +53,7 @@ in
after = [ "pipewire.service" ];
wantedBy = [ "pipewire.service" ];
serviceConfig = {
ExecStart = "${cfg.package}/bin/pipewire-pulse";
ExecStart = "pipewire-pulse";
ExecStartPost = pkgs.writeShellScript "pipewire-pulse-wait-started" ''
waitFor() {
while [ ! -e "$1" ]; do

2
hosts/common/programs/signal-desktop.nix
View File

@ -51,7 +51,7 @@ in
wantedBy = lib.mkIf cfg.config.autostart [ "graphical-session.target" ];
# for some reason the --ozone-platform-hint=auto flag fails when signal-desktop is launched from a service
serviceConfig.ExecStart = "env NIXOS_OZONE_WL=1 ${cfg.package}/bin/signal-desktop";
serviceConfig.ExecStart = "env NIXOS_OZONE_WL=1 signal-desktop";
};
};
}

2
hosts/common/programs/sway-autoscaler/default.nix
View File

@ -35,7 +35,7 @@ in
serviceConfig.ExecStart = lib.escapeShellArgs [
"env"
"SWAY_DEFAULT_SCALE=${builtins.toString cfg.config.defaultScale}"
"${cfg.package}/bin/sway-autoscaler"
"sway-autoscaler"
"--loop-sec"
(builtins.toString cfg.config.interval)
];

2
hosts/common/programs/sway/default.nix
View File

@ -254,7 +254,7 @@ in
services.sway = {
description = "sway: tiling wayland desktop environment";
wantedBy = [ "default.target" ];
serviceConfig.ExecStart = "${cfg.package}/bin/sway";
serviceConfig.ExecStart = "sway";
};
};

2
hosts/common/programs/swayidle.nix
View File

@ -59,7 +59,7 @@ in
serviceConfig.ExecStart = lib.escapeShellArgs (
[
"${cfg.package}/bin/swayidle"
"swayidle"
"-w"
] ++ lib.flatten (
lib.mapAttrsToList

2
hosts/common/programs/swaynotificationcenter/default.nix
View File

@ -478,7 +478,7 @@ in
# partOf = [ "graphical-session.target" ];
wantedBy = [ "graphical-session.target" ];
serviceConfig.ExecStart = "env G_MESSAGES_DEBUG=all ${cfg.package}/bin/swaync";
serviceConfig.ExecStart = "env G_MESSAGES_DEBUG=all swaync";
# serviceConfig.BusName = "org.freedesktop.Notifications";
};
};

2
hosts/common/programs/sysvol.nix
View File

@ -76,7 +76,7 @@ in
# -{H,W} N to set the height/width of the notifier, in px.
# -i N to set the size of the volume icon
# -P to hide percentage text
serviceConfig.ExecStart = "${cfg.package}/bin/sysvol -p 0 -t 1 -m 22 -H 39 -W 256 -i 32 -P";
serviceConfig.ExecStart = "sysvol -p 0 -t 1 -m 22 -H 39 -W 256 -i 32 -P";
};
};
}

2
hosts/common/programs/waybar/default.nix
View File

@ -120,7 +120,7 @@ in
wantedBy = [ "graphical-session.target" ];
# env G_MESSAGES_DEBUG=all
serviceConfig.ExecStart = "${cfg.package}/bin/waybar";
serviceConfig.ExecStart = "waybar";
};
};
}

7
hosts/common/programs/wireplumber.nix
View File

@ -1,7 +1,4 @@
{ config, ... }:
let
cfg = config.sane.programs.wireplumber;
in
{ ... }:
{
sane.programs.wireplumber = {
sandbox.method = "bwrap";
@ -37,7 +34,7 @@ in
after = [ "pipewire.service" ];
bindsTo = [ "pipewire.service" ];
wantedBy = [ "pipewire.service" ];
serviceConfig.ExecStart = "${cfg.package}/bin/wireplumber";
serviceConfig.ExecStart = "wireplumber";
};
};
}

7
hosts/common/programs/wvkbd.nix
View File

@ -1,7 +1,4 @@
{ config, lib, pkgs, ... }:
let
cfg = config.sane.programs.wvkbd;
in
{ lib, pkgs, ... }:
{
sane.programs.wvkbd = {
packageUnwrapped = pkgs.wvkbd.overrideAttrs (base: {
@ -43,7 +40,7 @@ in
# "WVKBD_LANDSCAPE_HEIGHT=??" #< default: 120 (pixels)
# more settings tunable inside config.h when compiling:
# - KBD_KEY_BORDER = 2
"${cfg.package}/bin/wvkbd-mobintl"
"wvkbd-mobintl"
"--hidden"
];
};