summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bragi.nix8
-rw-r--r--bragi/bar/default.nix2
-rw-r--r--custom/trivmix-service.nix8
3 files changed, 11 insertions, 7 deletions
diff --git a/bragi.nix b/bragi.nix
index b5c0d82a..59bcbd1e 100644
--- a/bragi.nix
+++ b/bragi.nix
@@ -89,7 +89,6 @@ in rec {
89 encoding = haskell.lib.overrideCabal encoding ( oldAttrs: { 89 encoding = haskell.lib.overrideCabal encoding ( oldAttrs: {
90 src = fetchFromGitHub { owner = "pngwjpgh"; repo = "encoding"; rev = "extended-version-bounds"; sha256 = "0pzxixp384a1ywzj56pl7xc4ln7i9x6mq8spqjwcs80y0pgfpp9s"; }; 90 src = fetchFromGitHub { owner = "pngwjpgh"; repo = "encoding"; rev = "extended-version-bounds"; sha256 = "0pzxixp384a1ywzj56pl7xc4ln7i9x6mq8spqjwcs80y0pgfpp9s"; };
91 }); 91 });
92 trivmix = self.callPackage ./custom/trivmix/trivmix.nix {};
93 inherit 92 inherit
94 (lib.mapAttrs (name: haskell.lib.dontCheck) super) 93 (lib.mapAttrs (name: haskell.lib.dontCheck) super)
95 Glob filelock hedgehog; 94 Glob filelock hedgehog;
@@ -103,7 +102,7 @@ in rec {
103 102
104 mpd = mpd.override { gmeSupport = false; pulseaudioSupport = false; }; 103 mpd = mpd.override { gmeSupport = false; pulseaudioSupport = false; };
105 104
106 inherit (pkgs.haskellPackages) trivmix thermoprint-server thermoprint-webgui tprint; 105 inherit (pkgs.haskellPackages) thermoprint-server thermoprint-webgui tprint;
107 }; 106 };
108 107
109 allowUnfree = true; 108 allowUnfree = true;
@@ -116,7 +115,6 @@ in rec {
116 tmux 115 tmux
117 nfs-utils 116 nfs-utils
118 jack2Full 117 jack2Full
119 trivmix
120 zsh 118 zsh
121 tprint 119 tprint
122 samba 120 samba
@@ -311,13 +309,13 @@ in rec {
311 systemd.services."thermoprint" = { 309 systemd.services."thermoprint" = {
312 environment = { 310 environment = {
313 THERMOPRINT_CONFIG = ./bragi/thermoprint-server; 311 THERMOPRINT_CONFIG = ./bragi/thermoprint-server;
314 THERMOPRINT_CACHE = ''${users.extraUsers."thermoprint".home}/dyre''; 312 THERMOPRINT_CACHE = "${users.extraUsers."thermoprint".home}/dyre";
315 }; 313 };
316 requires = [ "postgresql.service" ]; 314 requires = [ "postgresql.service" ];
317 wantedBy = [ "default.target" ]; 315 wantedBy = [ "default.target" ];
318 serviceConfig = { 316 serviceConfig = {
319 Type = "simple"; 317 Type = "simple";
320 ExecStart = ''${pkgs.thermoprint-server}/bin/thermoprint-server --force-reconf''; 318 ExecStart = "${pkgs.thermoprint-server}/bin/thermoprint-server --force-reconf";
321 User = users.extraUsers."thermoprint".name; 319 User = users.extraUsers."thermoprint".name;
322 Group = users.extraUsers."thermoprint".group; 320 Group = users.extraUsers."thermoprint".group;
323 WorkingDirectory = "~"; 321 WorkingDirectory = "~";
diff --git a/bragi/bar/default.nix b/bragi/bar/default.nix
index 69d89edd..98b36901 100644
--- a/bragi/bar/default.nix
+++ b/bragi/bar/default.nix
@@ -6,7 +6,7 @@
6}: 6}:
7 7
8let 8let
9 pkg = haskell.lib.doJailbreak (haskellPackages.callPackage ./generated.nix {}); 9 pkg = haskellPackages.callPackage ./generated.nix {};
10 webshim = stdenv.mkDerivation rec { 10 webshim = stdenv.mkDerivation rec {
11 name = "webshim-${version}"; 11 name = "webshim-${version}";
12 version = "1.16.0"; 12 version = "1.16.0";
diff --git a/custom/trivmix-service.nix b/custom/trivmix-service.nix
index 14f2e3c8..1c1403ec 100644
--- a/custom/trivmix-service.nix
+++ b/custom/trivmix-service.nix
@@ -5,6 +5,8 @@ with lib;
5let 5let
6 cfg = config.services.trivmix; 6 cfg = config.services.trivmix;
7 7
8 trivmix = pkgs.haskellPackages.callPackage ./trivmix {};
9
8 mixerModule = { 10 mixerModule = {
9 options = { 11 options = {
10 connectIn = mkOption { 12 connectIn = mkOption {
@@ -85,5 +87,9 @@ in {
85 description = "Definition of mixers"; 87 description = "Definition of mixers";
86 }; 88 };
87 89
88 config.systemd.services = mapAttrs service cfg; 90 config = mkIf (cfg != {}) {
91 environment.systemPackages = [ trivmix ];
92
93 systemd.services = mapAttrs service cfg;
94 };
89} 95}