Merge remote-tracking branch 'gum/master'

5 files changed, 61 insertions, 2 deletions

diff --git a/makefu/1systems/snake/config.nix b/makefu/1systems/snake/config.nix
index 1c6068e98..69e347d71 100644
--- a/makefu/1systems/snake/config.nix
+++ b/makefu/1systems/snake/config.nix
@@ -10,7 +10,7 @@ in {
     <stockholm/makefu/2configs/binary-cache/nixos.nix>
 
     <stockholm/makefu/2configs/home/rhasspy>
-    <stockholm/makefu/2configs/home/rhasspy/led-control.nix>
+    # <stockholm/makefu/2configs/hw/pseyecam.nix>
   ];
   krebs = {
     enable = true;
diff --git a/makefu/1systems/snake/hardware-config.nix b/makefu/1systems/snake/hardware-config.nix
index 827c1d3eb..88124f659 100644
--- a/makefu/1systems/snake/hardware-config.nix
+++ b/makefu/1systems/snake/hardware-config.nix
@@ -2,6 +2,8 @@
 {
   imports = [ 
     <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
+    ./wifi.nix
+    ./sound.nix
   ];
   boot.loader.grub.enable = true;
   boot.loader.grub.version = 2;
@@ -18,4 +20,5 @@
 
   boot.kernelParams = [ "net.ifnames=0" ];
   networking.hostId = "0123AABB";
+
 }
diff --git a/makefu/1systems/snake/sound.nix b/makefu/1systems/snake/sound.nix
new file mode 100644
index 000000000..452f4b4b1
--- /dev/null
+++ b/makefu/1systems/snake/sound.nix
@@ -0,0 +1,51 @@
+{ lib, ... }: {
+  imports = [ 
+    <stockholm/makefu/2configs/gui/snake-kiosk.nix> 
+  ];
+  nixpkgs.config.allowUnfree = true;
+  networking.networkmanager.enable = lib.mkForce false;
+  # sound.enable = true;
+  #hardware.pulseaudio = {
+  #  enable = true;
+  #  systemWide = true;
+  #  tcp = {
+  #    enable = true;
+  #    anonymousClients.allowAll = true;
+  #  };
+  #};
+
+  #users.users.makefu = {
+  #  extraGroups = [ "pipewire" "audio" ];
+  #};
+
+
+  #services.xserver = {
+  #  enable = true;
+  #  # desktopManager.xterm.enable = true;
+  #  desktopManager.xfce = {
+  #    enable = true;
+  #    noDesktop = true;
+  #  };
+
+  #  displayManager.autoLogin = {
+  #    enable = true;
+  #    user = "makefu";
+  #  };
+  #};    
+  hardware.pulseaudio.enable = lib.mkForce false;
+  security.rtkit.enable = true;
+  #services.pipewire = {
+  #  enable = true;
+  #  systemWide = true;
+  #  socketActivation = false;
+  #  alsa.enable = true;
+  #  alsa.support32Bit = true;
+  #  pulse.enable = true;
+  #  config.pipewire-pulse = {
+  #    "pulse.properties"."server.address" = [ "unix:native" "tcp:4713" ];
+  #  };
+
+  #};
+
+
+}
diff --git a/makefu/1systems/snake/source.nix b/makefu/1systems/snake/source.nix
index b9a32a2c4..8fc2fff2d 100644
--- a/makefu/1systems/snake/source.nix
+++ b/makefu/1systems/snake/source.nix
@@ -3,5 +3,4 @@
   full = true;
   home-manager = true;
   hw = true;
-  disko = true;
 }
diff --git a/makefu/1systems/snake/wifi.nix b/makefu/1systems/snake/wifi.nix
new file mode 100644
index 000000000..7e1569010
--- /dev/null
+++ b/makefu/1systems/snake/wifi.nix
@@ -0,0 +1,6 @@
+{
+  networking.wireless = {
+    enable = true;
+    networks = import <secrets/wifi.nix>;
+  };
+}