From b69d9d3c23311ce8b8512a7032600a5f8d1595ca Mon Sep 17 00:00:00 2001 From: Jules Aguillon Date: Sat, 30 Oct 2021 21:32:58 +0200 Subject: xmonad: Don't add ghc to the closure when 'config' is set When 'services.xserver.windowManager.xmonad.config' is not null, the restart feature won't work by default and is not desirable unless specific care is made, as explained by the documentation. I think it's reasonable to not include the haskell dependencies in the environment by default. That reduces the size of my system by 2GB. --- nixos/modules/services/x11/window-managers/xmonad.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'nixos/modules') diff --git a/nixos/modules/services/x11/window-managers/xmonad.nix b/nixos/modules/services/x11/window-managers/xmonad.nix index 6aa0d5f76f26..a8f38046137a 100644 --- a/nixos/modules/services/x11/window-managers/xmonad.nix +++ b/nixos/modules/services/x11/window-managers/xmonad.nix @@ -29,7 +29,6 @@ let } '' install -D ${xmonadEnv}/share/man/man1/xmonad.1.gz $out/share/man/man1/xmonad.1.gz makeWrapper ${configured}/bin/xmonad $out/bin/xmonad \ - --set NIX_GHC "${xmonadEnv}/bin/ghc" \ --set XMONAD_XMESSAGE "${pkgs.xorg.xmessage}/bin/xmessage" ''; @@ -93,6 +92,8 @@ in { (restart "xmonad" True) instead, which will just restart xmonad from PATH. This allows e.g. switching to the new xmonad binary after rebuilding your system with nixos-rebuild. + For the same reason, ghc is not added to the environment when this + option is set. If you actually want to run xmonad with a config specified here, but also be able to recompile and restart it from a copy of that source in -- cgit 1.4.1 From 6c8e827c239577ab00b2a29db49afb9aac70dd66 Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Sun, 31 Oct 2021 13:37:00 +0100 Subject: nixos/gollum: Specify systemd WorkingDirectory --- nixos/modules/services/misc/gollum.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'nixos/modules') diff --git a/nixos/modules/services/misc/gollum.nix b/nixos/modules/services/misc/gollum.nix index 4053afa69be5..cad73a871ba6 100644 --- a/nixos/modules/services/misc/gollum.nix +++ b/nixos/modules/services/misc/gollum.nix @@ -100,6 +100,7 @@ in serviceConfig = { User = config.users.users.gollum.name; Group = config.users.groups.gollum.name; + WorkingDirectory = cfg.stateDir; ExecStart = '' ${pkgs.gollum}/bin/gollum \ --port ${toString cfg.port} \ -- cgit 1.4.1 From 8d3b180052a7dc8fcab93a8402154816f2c8a51f Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Sun, 31 Oct 2021 13:39:18 +0100 Subject: nixos/radicale: specify systemd WorkingDirectory --- nixos/modules/services/networking/radicale.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'nixos/modules') diff --git a/nixos/modules/services/networking/radicale.nix b/nixos/modules/services/networking/radicale.nix index c121008d5294..c6c40777ed7c 100644 --- a/nixos/modules/services/networking/radicale.nix +++ b/nixos/modules/services/networking/radicale.nix @@ -195,6 +195,7 @@ in { SystemCallArchitectures = "native"; SystemCallFilter = [ "@system-service" "~@privileged" "~@resources" ]; UMask = "0027"; + WorkingDirectory = "/var/lib/radicale"; }; }; }; -- cgit 1.4.1 From 62ab77a322514cfcd24d7cfd41c7e00c9a20f0b8 Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Sun, 31 Oct 2021 13:39:46 +0100 Subject: nixos/borgbackup: specify systemd WorkingDirectory --- nixos/modules/services/backup/borgbackup.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'nixos/modules') diff --git a/nixos/modules/services/backup/borgbackup.nix b/nixos/modules/services/backup/borgbackup.nix index 220c571b927e..b2147c1bbfc9 100644 --- a/nixos/modules/services/backup/borgbackup.nix +++ b/nixos/modules/services/backup/borgbackup.nix @@ -152,6 +152,7 @@ let serviceConfig = { # The service's only task is to ensure that the specified path exists Type = "oneshot"; + WorkingDirectory = cfg.path; }; wantedBy = [ "multi-user.target" ]; }; -- cgit 1.4.1 From 4fe305186d8be5995b60b9cee3581a4995a14175 Mon Sep 17 00:00:00 2001 From: fernsehmuell Date: Mon, 8 Nov 2021 10:29:16 +0100 Subject: add opcache to list of php packages opcache is used later, but was never added to phpExt. --- nixos/modules/services/web-apps/moodle.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nixos/modules') diff --git a/nixos/modules/services/web-apps/moodle.nix b/nixos/modules/services/web-apps/moodle.nix index 6f5cfa2e3481..19f3e754691e 100644 --- a/nixos/modules/services/web-apps/moodle.nix +++ b/nixos/modules/services/web-apps/moodle.nix @@ -57,7 +57,7 @@ let pgsqlLocal = cfg.database.createLocally && cfg.database.type == "pgsql"; phpExt = pkgs.php74.withExtensions - ({ enabled, all }: with all; [ iconv mbstring curl openssl tokenizer xmlrpc soap ctype zip gd simplexml dom intl json sqlite3 pgsql pdo_sqlite pdo_pgsql pdo_odbc pdo_mysql pdo mysqli session zlib xmlreader fileinfo filter ]); + ({ enabled, all }: with all; [ iconv mbstring curl openssl tokenizer xmlrpc soap ctype zip gd simplexml dom intl json sqlite3 pgsql pdo_sqlite pdo_pgsql pdo_odbc pdo_mysql pdo mysqli session zlib xmlreader fileinfo filter opcache ]); in { # interface -- cgit 1.4.1 From 7f24a5ff35a7b9eac0c3454c71cbd32dbe52a1a9 Mon Sep 17 00:00:00 2001 From: Artturin Date: Mon, 22 Nov 2021 05:59:05 +0200 Subject: nixos/systemd: readd dbus-org.freedesktop.login1.service to upstreamSystemUnits it was removed in https://github.com/NixOS/nixpkgs/commit/eb862c48ddc288243c5447e8decc623b10ef165c#diff-5ea4693beb4bdd8f7efcdd3204ceea67c86f59b3d1c28cde063ddf03e1d20fbfL66 without this change i get Failed to list users: Unit dbus-org.freedesktop.login1.service not found. when i update and rebuild --- nixos/modules/system/boot/systemd.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'nixos/modules') diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 8fcf62d7fbff..6e0ee437d915 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -67,6 +67,7 @@ let "systemd-user-sessions.service" "dbus-org.freedesktop.import1.service" "dbus-org.freedesktop.machine1.service" + "dbus-org.freedesktop.login1.service" "user@.service" "user-runtime-dir@.service" -- cgit 1.4.1