From 5c96b6fa027e3ae77af4a38b3239f565a95874bf Mon Sep 17 00:00:00 2001
From: ediblerope <fredrik@nordhammer.it>
Date: Sat, 28 Mar 2026 15:28:37 +0000
Subject: [PATCH]

---
 common.nix                            |  2 -
 hosts/FredOS-Gaming.nix               |  2 +
 hosts/FredOS-Macbook.nix              | 65 ++++++++++++++-------------
 hosts/hardware/FredOS-Mediaserver.nix | 32 +++++++++++++
 4 files changed, 67 insertions(+), 34 deletions(-)
 create mode 100644 hosts/hardware/FredOS-Mediaserver.nix

diff --git a/common.nix b/common.nix
index f6fac9b..9d1e139 100644
--- a/common.nix
+++ b/common.nix
@@ -44,7 +44,6 @@
 #############################################################################
   # Make boot time quicker
   boot.loader.timeout = 5;
-  boot.loader.systemd-boot.configurationLimit = 5;
   systemd.services.NetworkManager-wait-online.enable = false;
   systemd.services.systemd-udev-settle.enable = false;
   systemd.services.firewall = {
@@ -52,7 +51,6 @@
     after = [ "multi-user.target" ];
   };
 
-  boot.initrd.systemd.enable = true;
   boot.initrd.verbose = false;
 #############################################################################
 
diff --git a/hosts/FredOS-Gaming.nix b/hosts/FredOS-Gaming.nix
index cc6f8bc..93849e1 100644
--- a/hosts/FredOS-Gaming.nix
+++ b/hosts/FredOS-Gaming.nix
@@ -47,6 +47,8 @@
     # Bootloader
     boot.loader.systemd-boot.enable = true;
     boot.loader.efi.canTouchEfiVariables = true;
+    boot.loader.systemd-boot.configurationLimit = 5;
+    boot.initrd.systemd.enable = true;
     
     system.autoUpgrade = {
       enable = true;
diff --git a/hosts/FredOS-Macbook.nix b/hosts/FredOS-Macbook.nix
index 9ded019..5415882 100644
--- a/hosts/FredOS-Macbook.nix
+++ b/hosts/FredOS-Macbook.nix
@@ -37,42 +37,43 @@
         kernelParams = [ "acpi_osi=" ];
       };
       hardware.enableRedistributableFirmware = true;
+      boot.loader.systemd-boot.configurationLimit = 5;
+      boot.initrd.systemd.enable = true;
 
-services.xserver.deviceSection = lib.mkDefault ''
-    Option "TearFree" "true"
-  '';
+      services.xserver.deviceSection = lib.mkDefault ''
+          Option "TearFree" "true"
+        '';
 
-# Enable Bluetooth
-  hardware.bluetooth = {
-    enable = true;
-    powerOnBoot = true;
-    settings = {
-      General = {
-        Enable = "Source,Sink,Media,Socket";
-        Experimental = true;
+      #Enable Bluetooth
+      hardware.bluetooth = {
+        enable = true;
+        powerOnBoot = true;
+        settings = {
+          General = {
+            Enable = "Source,Sink,Media,Socket";
+            Experimental = true;
+          };
+        };
       };
-    };
-  };
-
-  # PipeWire with Bluetooth support
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    pulse.enable = true;
-    
-    # Add Bluetooth codec config
-    wireplumber.configPackages = [
-      (pkgs.writeTextDir "share/wireplumber/bluetooth.lua.d/51-bluez-config.lua" ''
-        bluez_monitor.properties = {
-          ["bluez5.enable-sbc-xq"] = true,
-          ["bluez5.enable-msbc"] = true,
-          ["bluez5.enable-hw-volume"] = true,
-          ["bluez5.headset-roles"] = "[ hsp_hs hsp_ag hfp_hf hfp_ag ]"
-        }
-      '')
-    ];
-  };
 
+      # PipeWire with Bluetooth support
+      services.pipewire = {
+        enable = true;
+        alsa.enable = true;
+        pulse.enable = true;
+        
+        # Add Bluetooth codec config
+        wireplumber.configPackages = [
+          (pkgs.writeTextDir "share/wireplumber/bluetooth.lua.d/51-bluez-config.lua" ''
+            bluez_monitor.properties = {
+              ["bluez5.enable-sbc-xq"] = true,
+              ["bluez5.enable-msbc"] = true,
+              ["bluez5.enable-hw-volume"] = true,
+              ["bluez5.headset-roles"] = "[ hsp_hs hsp_ag hfp_hf hfp_ag ]"
+            }
+          '')
+        ];
+      };
     })
   ];
 }
diff --git a/hosts/hardware/FredOS-Mediaserver.nix b/hosts/hardware/FredOS-Mediaserver.nix
new file mode 100644
index 0000000..93b98f9
--- /dev/null
+++ b/hosts/hardware/FredOS-Mediaserver.nix
@@ -0,0 +1,32 @@
+#./hosts/hardware/FredOS-Mediaserver.nix
+{ config, lib, pkgs, modulesPath, ... }:
+{
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
+
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "uhci_hcd" "usbhid" "usb_storage" "sd_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/6008e793-4b24-4e62-821f-7a204fef5729";
+    fsType = "ext4";
+  };
+
+  swapDevices = [ ];
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+
+  networking.hostName = "FredOS-Mediaserver";
+
+  boot.loader.grub.enable = true;
+  boot.loader.grub.device = "/dev/sdc";
+  boot.loader.grub.forceInstall = false;
+
+  nix.settings.experimental-features = [ "nix-command" "flakes" ];
+
+  system.stateVersion = "25.11";
+}
\ No newline at end of file