summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <pngwjpgh@users.noreply.github.com>2016-08-02 19:12:04 +0200
committerGregor Kleen <pngwjpgh@users.noreply.github.com>2016-08-02 19:12:04 +0200
commit3444c75af94a4a42ba20ec54dc4410762f27558d (patch)
tree020ad87315e5c4f65993545a11215ab50d8b4753
parent43aa08a44aa9a88bf6db676dc452c5d1db404479 (diff)
downloadnixos-3444c75af94a4a42ba20ec54dc4410762f27558d.tar
nixos-3444c75af94a4a42ba20ec54dc4410762f27558d.tar.gz
nixos-3444c75af94a4a42ba20ec54dc4410762f27558d.tar.bz2
nixos-3444c75af94a4a42ba20ec54dc4410762f27558d.tar.xz
nixos-3444c75af94a4a42ba20ec54dc4410762f27558d.zip
musnix on bragi
-rw-r--r--.gitmodules3
-rw-r--r--bragi.nix11
m---------musnix0
3 files changed, 13 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules
index b7d9fb6e..f6ccf931 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -16,3 +16,6 @@
16[submodule "custom/thermoprint"] 16[submodule "custom/thermoprint"]
17 path = custom/thermoprint 17 path = custom/thermoprint
18 url = git://git.yggdrasil.li/thermoprint 18 url = git://git.yggdrasil.li/thermoprint
19[submodule "musnix"]
20 path = musnix
21 url = https://github.com/musnix/musnix.git
diff --git a/bragi.nix b/bragi.nix
index be34aa61..a4a8e283 100644
--- a/bragi.nix
+++ b/bragi.nix
@@ -5,7 +5,7 @@ let
5 thermoprint-servant = (pkgs.callPackage ./custom/thermoprint {}).thermoprint-servant; 5 thermoprint-servant = (pkgs.callPackage ./custom/thermoprint {}).thermoprint-servant;
6in rec { 6in rec {
7 imports = 7 imports =
8 [ 8 [ ./musnix
9 ./bragi-hw.nix 9 ./bragi-hw.nix
10 ./custom/zsh.nix 10 ./custom/zsh.nix
11 ./users.nix 11 ./users.nix
@@ -99,6 +99,15 @@ in rec {
99 JACK_PROMISCUOUS_SERVER = "1"; 99 JACK_PROMISCUOUS_SERVER = "1";
100 }; 100 };
101 101
102 musnix = {
103 enable = true;
104 alsaSeq.enable = false;
105 kernel = {
106 optimize = true;
107 realtime = true;
108 };
109 };
110
102 systemd.services.jack = { 111 systemd.services.jack = {
103 wantedBy = [ "sound.target" ]; 112 wantedBy = [ "sound.target" ];
104 serviceConfig = { 113 serviceConfig = {
diff --git a/musnix b/musnix
new file mode 160000
Subproject 1b64078cb0e1fc40e85ee80c5f2dd7e3c3624ef