Bring in bismuth configuration

Signed-off-by: Mel <einebeere@gmail.com>

8 files changed, 160 insertions, 3 deletions

diff --git a/machines/bismuth/default.nix b/machines/bismuth/default.nix
new file mode 100644
index 0000000..8dbdd14
--- /dev/null
+++ b/machines/bismuth/default.nix
@@ -0,0 +1,27 @@
+{ ... }:
+
+{
+  imports = [
+    ../../modules/common.nix
+
+    ./hardware.nix
+    ./devices.nix
+
+    ../../modules/jellyfin.nix
+    ../../modules/nvidia.nix
+  ];
+
+  networking.hostName = "Bismuth";
+
+  # expose vm web interface to tailnet
+  services.tailscale.extraUpFlags = [
+    "--advertise-routes=192.168.122.100/32"
+  ];
+
+  # set monitor configuration for gdm
+  systemd.tmpfiles.rules = [
+    "L+ /run/gdm/.config/monitors.xml - - - - ${../../configs/monitors.xml}"
+  ];
+
+  system.stateVersion = "23.11";
+}
diff --git a/machines/bismuth/devices.nix b/machines/bismuth/devices.nix
new file mode 100644
index 0000000..06fa69f
--- /dev/null
+++ b/machines/bismuth/devices.nix
@@ -0,0 +1,75 @@
+{ config, pkgs, ... }:
+
+{
+  # boot settings
+  boot = {
+    loader.grub = {
+      enable = true;
+      devices = [ "nodev" ];
+      efiSupport = true;
+      useOSProber = true;
+      gfxmodeEfi = "1366x768x32";
+    };
+
+    loader.efi.canTouchEfiVariables = true;
+
+    plymouth.enable = true;
+  
+    initrd.systemd.enable = true; 
+  };
+
+  # swap
+  swapDevices = [{
+    device = "/var/swapfile";
+    size = 8 * 1024;
+  }];
+
+  # internet
+  networking.networkmanager.enable = true;
+  
+  # sound 
+  sound.enable = true;
+  hardware.pulseaudio.enable = false;
+  security.rtkit.enable = true;
+  services.pipewire = {
+    enable = true;
+    alsa = { enable = true; support32Bit = true; };
+    pulse.enable = true;
+    jack.enable = true;
+  };
+
+  # extra filesystems
+  boot.supportedFilesystems = [ "ntfs" ];
+
+  fileSystems = {
+    "/run/media/mel/Duo" = {
+      device = "/dev/disk/by-label/Duo";
+      fsType = "ntfs-3g";
+      options = [ "rw" "uid=1000" ];
+    };
+    "/run/media/mel/Half" = {
+      device = "/dev/disk/by-label/Half";
+      fsType = "ntfs-3g";
+      options = [ "rw" "uid=1000" ];
+    };
+    "/run/media/mel/Main" = {
+      device = "/dev/disk/by-label/Main";
+      fsType = "ntfs-3g";
+      options = [ "rw" "uid=1000" ];
+    };
+  };
+
+  # printing
+  services.printing = {
+    enable = true;
+    stateless = true;
+    startWhenNeeded = true;
+  };
+
+  services.avahi.enable = false;
+  #services.avahi = {
+  #  enable = true;
+  #  nssmdns4 = true;
+  #  openFirewall = true;
+  #};
+}
diff --git a/machines/bismuth/hardware.nix b/machines/bismuth/hardware.nix
new file mode 100644
index 0000000..272f987
--- /dev/null
+++ b/machines/bismuth/hardware.nix
@@ -0,0 +1,37 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-amd" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/58d99ea0-ea5e-465a-a5aa-4dc6f6d02e55";
+      fsType = "ext4";
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/F2C3-B4E5";
+      fsType = "vfat";
+    };
+
+  swapDevices = [ ];
+
+  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+  # (the default) this is the recommended approach. When using systemd-networkd it's
+  # still possible to use this option, but it's recommended to use it in conjunction
+  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+  networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.eno1.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}
diff --git a/machines/bismuth/home.nix b/machines/bismuth/home.nix
new file mode 100644
index 0000000..2ba6f25
--- /dev/null
+++ b/machines/bismuth/home.nix
@@ -0,0 +1,9 @@
+{ pkgs, ... }:
+
+{
+  imports = [
+    ../../modules/home/common.nix
+  ];
+
+  home.stateVersion = "23.11";
+}
diff --git a/machines/graphite.nix b/machines/graphite/default.nix
index d0bcaa8..4bbb938 100644
--- a/machines/graphite.nix
+++ b/machines/graphite/default.nix
@@ -2,10 +2,10 @@
 
 {
   imports = [
-    ../modules/common.nix
+    ../../modules/common.nix
 
-    ./hardware/graphite.nix
-    ./devices/graphite.nix
+    ./hardware.nix
+    ./devices.nix
   ];
 
   networking.hostName = "Graphite";
diff --git a/machines/devices/graphite.nix b/machines/graphite/devices.nix
index f8b7631..f8b7631 100644
--- a/machines/devices/graphite.nix
+++ b/machines/graphite/devices.nix
diff --git a/machines/hardware/graphite.nix b/machines/graphite/hardware.nix
index c8fc7c6..c8fc7c6 100644
--- a/machines/hardware/graphite.nix
+++ b/machines/graphite/hardware.nix
diff --git a/machines/graphite/home.nix b/machines/graphite/home.nix
new file mode 100644
index 0000000..dce0783
--- /dev/null
+++ b/machines/graphite/home.nix
@@ -0,0 +1,9 @@
+{ pkgs, ... }:
+
+{
+  imports = [
+    ../../modules/home/common.nix
+  ];
+
+  home.stateVersion = "24.05";
+}