diff options
| -rw-r--r-- | doc/install.xml | 10 | ||||
| -rw-r--r-- | machines/default.nix | 3 | ||||
| -rw-r--r-- | machines/openlab/buffer.patch | 13 | ||||
| -rw-r--r-- | machines/openlab/hannswurscht.nix | 70 | ||||
| -rw-r--r-- | machines/profpatsch/shiki.nix | 1 |
5 files changed, 5 insertions, 92 deletions
diff --git a/doc/install.xml b/doc/install.xml index c66a365e..88a0838f 100644 --- a/doc/install.xml +++ b/doc/install.xml @@ -21,8 +21,8 @@ </para> <para> - So let's say you want to install the machine <literal>hannswurscht</literal> which - has the channel attribute <literal>channels.machines.openlab.hannswurscht</literal> + So let's say you want to install the machine <literal>schnurrkadse</literal> which + has the channel attribute <literal>channels.machines.sternenseemann.schnurrkadse</literal> </para> <para> @@ -33,7 +33,7 @@ <command> <screen> nix-channel --add <link - xlink:href="&hydra.channelbase;/channels.machines.openlab.hannswurscht"/> vuizvui + xlink:href="&hydra.channelbase;/channels.machines.sternenseemann.schnurrkadse"/> vuizvui nix-channel --remove nixos # otherwise it will interfere with the rebuild nix-channel --update </screen> @@ -55,10 +55,10 @@ nix-channel --update <filename>/etc/nixos/configuration.nix</filename>: </para> - <screen><code language="nix">(import <vuizvui/machines>).openlab.hannswurscht.config</code></screen> + <screen><code language="nix">(import <vuizvui/machines>).sternenseemann.schnurrkadse.config</code></screen> <para> - Of course you need to replace <literal>openlab.hannswurscht</literal> with the + Of course you need to replace <literal>sternenseemann.schnurrkadse</literal> with the attribute of your machine. </para> diff --git a/machines/default.nix b/machines/default.nix index 236d2a5d..23a8234d 100644 --- a/machines/default.nix +++ b/machines/default.nix @@ -17,9 +17,6 @@ with import ../lib; hildr = callMachine devhell/hildr.nix {}; gunnr = callMachine devhell/gunnr.nix {}; }; - openlab = { - hannswurscht = callMachine ./openlab/hannswurscht.nix {}; - }; profpatsch = { shiki = callMachine ./profpatsch/shiki.nix {}; haku = callMachine ./profpatsch/haku.nix {}; diff --git a/machines/openlab/buffer.patch b/machines/openlab/buffer.patch deleted file mode 100644 index 379b3174..00000000 --- a/machines/openlab/buffer.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/modules/alsa/alsa-sink.c b/src/modules/alsa/alsa-sink.c -index 2fdebe0..7042ccc 100644 ---- a/src/modules/alsa/alsa-sink.c -+++ b/src/modules/alsa/alsa-sink.c -@@ -63,7 +63,7 @@ - #define DEFAULT_DEVICE "default" - - #define DEFAULT_TSCHED_BUFFER_USEC (2*PA_USEC_PER_SEC) /* 2s -- Overall buffer size */ --#define DEFAULT_TSCHED_WATERMARK_USEC (20*PA_USEC_PER_MSEC) /* 20ms -- Fill up when only this much is left in the buffer */ -+#define DEFAULT_TSCHED_WATERMARK_USEC (500*PA_USEC_PER_MSEC) /* 500ms -- Fill up when only this much is left in the buffer */ - - #define TSCHED_WATERMARK_INC_STEP_USEC (10*PA_USEC_PER_MSEC) /* 10ms -- On underrun, increase watermark by this */ - #define TSCHED_WATERMARK_DEC_STEP_USEC (5*PA_USEC_PER_MSEC) /* 5ms -- When everything's great, decrease watermark by this */ diff --git a/machines/openlab/hannswurscht.nix b/machines/openlab/hannswurscht.nix deleted file mode 100644 index 4ef21bac..00000000 --- a/machines/openlab/hannswurscht.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ pkgs, ... }: - -let - musicDir = "/data/music"; - webserverRootDir = "/var/www"; - -in { - vuizvui.user.openlab.base.enable = true; - - nixpkgs.system = "i686-linux"; - - users.users.openlab.extraGroups = [ "audio" ]; - services.mingetty.autologinUser = "openlab"; - - hardware.pulseaudio = { - enable = true; - systemWide = true; - package = pkgs.pulseaudioFull; - zeroconf.discovery.enable = false; - zeroconf.publish.enable = true; - tcp.enable = true; - tcp.anonymousClients.allowedIpRanges = [ "172.16.0.0/16" "127.0.0.1" ]; - }; - - hardware.bluetooth = { - enable = true; - extraConfig = '' - [General] - Enable=Source,Sink,Media,Socket - ''; - }; - - hardware.sane.enable = true; - services.saned = { - enable = true; - extraConfig = '' - 172.16.0.0/16 - ''; - }; - - # TODO: haskell module broken - # vuizvui.user.openlab.stackenblocken = { - # enable = true; - # volume = 35; - # }; - vuizvui.user.openlab.speedtest = { - enable = true; - outputPath = "${webserverRootDir}/speedtest.yaml"; - }; - - services.nginx = { - enable = true; - virtualHosts."hannswurscht.openlab.lan" = { - default = true; - root = webserverRootDir; - }; - }; - - # machine mostly runs headless with the screen shut - services.logind.extraConfig = "HandleLidSwitch=ignore"; - - fileSystems = { - "${musicDir}" = { - device = "ftp.openlab.lan:/data/upload/music"; - fsType = "nfs"; - label = "lab-ftp"; - options = [ "nolock" "x-systemd.automount"]; - }; - }; -} diff --git a/machines/profpatsch/shiki.nix b/machines/profpatsch/shiki.nix index d9348ad9..c51bab2c 100644 --- a/machines/profpatsch/shiki.nix +++ b/machines/profpatsch/shiki.nix @@ -300,7 +300,6 @@ in { vuizvui.user.profpatsch.programs.scanning = { enable = true; #remoteScanners = '' - # hannswurscht.lab # hippie.lab #''; }; |