Merge branch 'macbook-hyprland'

2025-07-07 11:19:38 -05:00
parent 42db510b8f 2bf33d8743
commit 46adb33771
48 changed files with 714 additions and 290 deletions
--- a/hosts/deck/home.nix
+++ b/hosts/deck/home.nix
@@ -1,10 +1,10 @@
 { pkgs, ... }:
 let
  shellAliases = {
-    update-boot = "sudo nixos-rebuild boot --max-jobs 10 --build-host admin@10.0.1.18";
+    update-boot = "sudo nixos-rebuild boot --max-jobs 10 --build-host admin@10.0.1.3";
    update-switch = "sudo nixos-rebuild switch --max-jobs 10";
    update-flake = "nix flake update steamdeck-nixpkgs steamdeck-chaotic steamdeck-home-manager steamdeck-impermanence steamdeck-jovian steamdeck-lanzaboote steamdeck-nixos-hardware steamdeck-sops-nix steamdeck-steam-rom-manager --flake /etc/nixos";
-    nas-ssh = "ssh admin@10.0.1.18";
+    nas-ssh = "ssh admin@10.0.1.3";
  };
 in
 {
--- a/hosts/desktop/filesystems.nix
+++ b/hosts/desktop/filesystems.nix
@@ -39,19 +39,19 @@ in

    # Network shares
    "/media/nas/backup" = {
-      device = "//10.0.1.18/Backup";
+      device = "//10.0.1.3/Backup";
      fsType = "cifs";
      options = defaultNetworkShareOptions;
    };

    "/media/nas/isos" = {
-      device = "//10.0.1.18/isos";
+      device = "//10.0.1.3/isos";
      fsType = "cifs";
      options = defaultNetworkShareOptions;
    };

    "/media/nas/3d_printer" = {
-      device = "//10.0.1.18/3d_printer";
+      device = "//10.0.1.3/3d_printer";
      fsType = "cifs";
      options = defaultNetworkShareOptions;
    };
--- a/hosts/desktop/home.nix
+++ b/hosts/desktop/home.nix
@@ -1,10 +1,10 @@
 { pkgs, ... }:
 let
  shellAliases = {
-    update-boot = "sudo nixos-rebuild boot --max-jobs 10 --build-host admin@10.0.1.18";
-    update-switch = "sudo nixos-rebuild switch --max-jobs 10 --build-host admin@10.0.1.18";
+    update-boot = "sudo nixos-rebuild boot --max-jobs 10 --build-host admin@10.0.1.3";
+    update-switch = "sudo nixos-rebuild switch --max-jobs 10 --build-host admin@10.0.1.3";
    update-flake = "nix flake update desktop-nixpkgs desktop-chaotic desktop-home-manager desktop-impermanence desktop-lanzaboote desktop-nixos-hardware desktop-sops-nix desktop-steam-rom-manager --flake /etc/nixos";
-    update-nas = "nixos-rebuild switch --use-remote-sudo --target-host admin@10.0.1.18 --build-host admin@10.0.1.18 --flake ~/nix-config#jallen-nas";
+    update-nas = "nixos-rebuild switch --use-remote-sudo --target-host admin@10.0.1.3 --build-host admin@10.0.1.3 --flake ~/nix-config#jallen-nas";
  };
 in
 {
--- a/hosts/desktop/services.nix
+++ b/hosts/desktop/services.nix
@@ -100,7 +100,7 @@ in
          openssh
        ];
        script = ''
-          rsync -rtpogvPlHzs --ignore-existing --exclude={'/home/matt/Games', '/home/matt/1TB', '/home/matt/Downloads/*', '/home/matt/.cache'} -e ssh /home/matt admin@10.0.1.18:/media/nas/main/backup/desktop-nix/home 
+          rsync -rtpogvPlHzs --ignore-existing --exclude={'/home/matt/Games', '/home/matt/1TB', '/home/matt/Downloads/*', '/home/matt/.cache'} -e ssh /home/matt admin@10.0.1.3:/media/nas/main/backup/desktop-nix/home 
        '';
      };
    };
--- a/hosts/homeassistant/home.nix
+++ b/hosts/homeassistant/home.nix
@@ -2,11 +2,11 @@
 let
  shellAliases = {
    ll = "ls -alh";
-    update-boot = "sudo nixos-rebuild boot --max-jobs 10 --build-host admin@10.0.1.18";
-    update-switch = "sudo nixos-rebuild switch --max-jobs 10 --build-host admin@10.0.1.18";
+    update-boot = "sudo nixos-rebuild boot --max-jobs 10 --build-host admin@10.0.1.3";
+    update-switch = "sudo nixos-rebuild switch --max-jobs 10 --build-host admin@10.0.1.3";
    update-flake = "sudo nix flake update ~/nix-config";
-    update-nas = "nixos-rebuild switch --use-remote-sudo --target-host admin@10.0.1.18 --build-host admin@10.0.1.18 --flake ~/nix-config#jallen-nas";
-    nas-ssh = "kitten ssh admin@10.0.1.18";
+    update-nas = "nixos-rebuild switch --use-remote-sudo --target-host admin@10.0.1.3 --build-host admin@10.0.1.3 --flake ~/nix-config#jallen-nas";
+    nas-ssh = "kitten ssh admin@10.0.1.3";
    ducks = "du -cksh * | sort -hr | head -n 15";
  };

--- a/hosts/homeassistant/homeassistant.nix
+++ b/hosts/homeassistant/homeassistant.nix
@@ -258,7 +258,7 @@ in
        use_x_forwarded_for = true;
        trusted_proxies = [
          "172.30.33.0/24"
-          "10.0.1.18"
+          "10.0.1.3"
          "10.0.1.0/24"
        ];
      };
--- a/hosts/mac-nixos/boot.nix
+++ b/hosts/mac-nixos/boot.nix
@@ -0,0 +1,34 @@
+{ pkgs, lib, ... }:
+{
+  # Use the systemd-boot EFI boot loader.
+  boot = {
+    loader = {
+      systemd-boot = {
+        enable = true;
+        configurationLimit = 15;
+        consoleMode = lib.mkDefault "max";
+      };
+      efi.canTouchEfiVariables = lib.mkForce false;
+    };
+
+    kernelParams = [
+      "apple_dcp.show_notch=1"
+    ];
+
+    extraModprobeConfig = ''
+      options hid_apple iso_layout=0
+    '';
+
+    binfmt.registrations. "x86_64-linux" = {
+      magicOrExtension = ''\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x3e\x00'';
+      mask = ''\xff\xff\xff\xff\xff\xfe\xfe\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff'';
+      openBinary = true;
+      interpreter = "${pkgs.box64}/bin/box64";
+      preserveArgvZero = true; 
+      matchCredentials = true;
+      fixBinary = false;
+    };
+  };
+
+  zramSwap.enable = true;
+}
--- a/hosts/mac-nixos/configuration.nix
+++ b/hosts/mac-nixos/configuration.nix
@@ -8,94 +8,58 @@ let
 in
 {
  imports = [
-    # Include the results of the hardware scan.
+    ./boot.nix
    ./hardware-configuration.nix
+    ./networking.nix
+    ./services.nix
  ];

  hardware.asahi = {
    enable = true;
    useExperimentalGPUDriver = true;
    peripheralFirmwareDirectory = ./firmware;
-    # extractPeripheralFirmware = false;
    setupAsahiSound = true;
  };

-  # Use the systemd-boot EFI boot loader.
-  boot.loader = {
-    systemd-boot = {
-      enable = true;
-      configurationLimit = 3;
-    };
-    efi.canTouchEfiVariables = lib.mkForce false;
-  };
+  hardware.graphics.enable32Bit = lib.mkForce false;

-  boot.extraModprobeConfig = ''
-    options hid_apple iso_layout=0
-  '';
-
-  boot.binfmt.emulatedSystems = [ "x86_64-linux" ];
-
-  # Networking configs
-  networking = {
-    hostName = "macbook-pro-nixos";
-
-    # Enable Network Manager
-    networkmanager = {
-      enable = lib.mkDefault true;
-      wifi.powersave = lib.mkDefault false;
-      settings.connectivity.uri = lib.mkDefault "http://nmcheck.gnome.org/check_network_status.txt";
-    };
-  };
-
-  services = {
-    displayManager.sddm.wayland.enable = lib.mkDefault plasma;
-    displayManager.sddm.enable = lib.mkDefault plasma;
-    desktopManager.plasma6.enable = lib.mkDefault plasma;
-    desktopManager.gnome.enable = lib.mkForce true;
-    displayManager.gdm.enable = lib.mkForce true;
-
-    # enable auto discovery of printers
-    avahi = {
-      enable = true;
-      nssmdns4 = true;
-      openFirewall = true;
-    };
-
-    # Enable Flatpak
-    flatpak.enable = lib.mkDefault false;
-  };
+  nixpkgs.config.allowUnfree = true;
+  nixpkgs.config.allowUnsupportedSystem = true;

  # Define a user account. Don't forget to set a password with ‘passwd’.
  users.users.matt = {
    isNormalUser = true;
-    extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
+    extraGroups = [
+      "wheel"
+      "keys"
+      "networkmanager"
+      "ratbagd"
+      "input"
+      "scanner"
+      "lp"
+      "video"
+      "i2c"
+     ]; # Enable ‘sudo’ for the user.
    shell = pkgs.zsh;
    packages = with pkgs; [
      firefox
      tree
-      neofetch
-      gdm
      git
      box64
-      #minecraft
      prismlauncher
      distrobox
-      podman
    ];
  };

-  programs.java.enable = true;
-
-  virtualisation.containers.enable = true;
+  virtualisation = {
+    containers.enable = true;
+    podman.enable = true;
+  };

  # List packages installed in system profile. To search, run:
  # $ nix search wget
  environment.systemPackages = with pkgs; [
-    apple-cursor
-    gnomeExtensions.dash-to-dock
-    gnomeExtensions.arcmenu
-    gnomeExtensions.appindicator
-    gnomeExtensions.tiling-assistant
+    micro
    vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
    wget
  ];
@@ -103,30 +67,4 @@ in
  environment.sessionVariables = {
    DBX_CONTAINER_MANAGER = "podman";
  };
-
-  nixpkgs.config.allowUnsupportedSystem = true;
-
-  # Copy the NixOS configuration file and link it from the resulting system
-  # (/run/current-system/configuration.nix). This is useful in case you
-  # accidentally delete configuration.nix.
-  # system.copySystemConfiguration = true;
-
-  # This option defines the first version of NixOS you have installed on this particular machine,
-  # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions.
-  #
-  # Most users should NEVER change this value after the initial install, for any reason,
-  # even if you've upgraded your system to a new NixOS release.
-  #
-  # This value does NOT affect the Nixpkgs version your packages and OS are pulled from,
-  # so changing it will NOT upgrade your system - see https://nixos.org/manual/nixos/stable/#sec-upgrading for how
-  # to actually do that.
-  #
-  # This value being lower than the current NixOS release does NOT mean your system is
-  # out of date, out of support, or vulnerable.
-  #
-  # Do NOT change this value unless you have manually inspected all the changes it would make to your configuration,
-  # and migrated your data accordingly.
-  #
-  # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion .
-  system.stateVersion = "24.05"; # Did you read the comment?
 }
--- a/hosts/mac-nixos/hardware-configuration.nix
+++ b/hosts/mac-nixos/hardware-configuration.nix
@@ -19,39 +19,39 @@
    };

  fileSystems."/root" =
-    { device = "/dev/disk/by-uuid/69fa608d-1dd2-408a-9907-7d0881db5b4a";
+    { device = "/dev/disk/by-uuid/adcc14fa-8bf7-4b4b-a9e4-b038993b96cc";
      fsType = "btrfs";
-      options = [ "subvol=root" ];
+      options = [ "compress=zstd" "noatime" "subvol=root" ];
    };

  fileSystems."/etc" =
-    { device = "/dev/disk/by-uuid/69fa608d-1dd2-408a-9907-7d0881db5b4a";
+    { device = "/dev/disk/by-uuid/adcc14fa-8bf7-4b4b-a9e4-b038993b96cc";
      fsType = "btrfs";
-      options = [ "subvol=etc" ];
+      options = [ "compress=zstd" "noatime" "subvol=etc" ];
    };

  fileSystems."/tmp" =
-    { device = "/dev/disk/by-uuid/69fa608d-1dd2-408a-9907-7d0881db5b4a";
+    { device = "/dev/disk/by-uuid/adcc14fa-8bf7-4b4b-a9e4-b038993b96cc";
      fsType = "btrfs";
-      options = [ "subvol=tmp" ];
+      options = [ "compress=zstd" "noatime" "subvol=tmp" ];
    };

  fileSystems."/nix" =
-    { device = "/dev/disk/by-uuid/69fa608d-1dd2-408a-9907-7d0881db5b4a";
+    { device = "/dev/disk/by-uuid/adcc14fa-8bf7-4b4b-a9e4-b038993b96cc";
      fsType = "btrfs";
-      options = [ "subvol=nix" ];
+      options = [ "compress=zstd" "noatime" "subvol=nix" ];
    };

  fileSystems."/var/log" =
-    { device = "/dev/disk/by-uuid/69fa608d-1dd2-408a-9907-7d0881db5b4a";
+    { device = "/dev/disk/by-uuid/adcc14fa-8bf7-4b4b-a9e4-b038993b96cc";
      fsType = "btrfs";
-      options = [ "subvol=log" ];
+      options = [ "compress=zstd" "noatime" "subvol=log" ];
    };

  fileSystems."/home" =
-    { device = "/dev/disk/by-uuid/69fa608d-1dd2-408a-9907-7d0881db5b4a";
+    { device = "/dev/disk/by-uuid/adcc14fa-8bf7-4b4b-a9e4-b038993b96cc";
      fsType = "btrfs";
-      options = [ "subvol=home" ];
+      options = [ "compress=zstd" "subvol=home" ];
    };

  fileSystems."/boot" =
@@ -60,7 +60,12 @@
      options = [ "fmask=0022" "dmask=0022" ];
    };

-  swapDevices = [ ];
+  swapDevices = [
+    {
+      device = "/tmp/swapfile";
+      randomEncryption.enable = true;
+    }
+  ];

  # 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
--- a/hosts/mac-nixos/hardware-configuration.nix.ori
+++ b/hosts/mac-nixos/hardware-configuration.nix.ori
@@ -1,69 +0,0 @@
-# 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.
-{ lib, modulesPath, ... }:
-
-{
-  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
-
-  boot.initrd.availableKernelModules = [ "sdhci_pci" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" = {
-    device = "none";
-    fsType = "tmpfs";
-  };
-
-  fileSystems."/etc" = {
-    device = "/dev/disk/by-uuid/19b99a76-0285-443a-a83c-a00a5fab54f5";
-    fsType = "btrfs";
-    options = [ "subvol=etc" ];
-  };
-
-  fileSystems."/nix" = {
-    device = "/dev/disk/by-uuid/19b99a76-0285-443a-a83c-a00a5fab54f5";
-    fsType = "btrfs";
-    options = [ "subvol=nix" ];
-  };
-
-  fileSystems."/var/log" = {
-    device = "/dev/disk/by-uuid/19b99a76-0285-443a-a83c-a00a5fab54f5";
-    fsType = "btrfs";
-    options = [ "subvol=log" ];
-  };
-
-  fileSystems."/home" = {
-    device = "/dev/disk/by-uuid/19b99a76-0285-443a-a83c-a00a5fab54f5";
-    fsType = "btrfs";
-    options = [ "subvol=home" ];
-  };
-
-  fileSystems."/root" = {
-    device = "/dev/disk/by-uuid/19b99a76-0285-443a-a83c-a00a5fab54f5";
-    fsType = "btrfs";
-    options = [ "subvol=root" ];
-  };
-
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/F4A1-C77F";
-    fsType = "vfat";
-  };
-
-  #  fileSystems."/boot" =
-  #    { device = "/dev/disk/by-uuid/3aaa1d0e-057d-4b7d-b2fe-ef02db373e9f";
-  #      fsType = "ext4";
-  #    };
-
-  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.wlp1s0f0.useDHCP = lib.mkDefault true;
-
-  nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux";
-}
--- a/hosts/mac-nixos/home.nix
+++ b/hosts/mac-nixos/home.nix
@@ -4,4 +4,11 @@
  home.username = "matt";
  home.homeDirectory = "/home/matt";
  home.stateVersion = "23.11";
+
+  home.packages = with pkgs; [
+    iw
+    iwd
+    orca-slicer
+    vscodium
+  ];
 }
--- a/hosts/mac-nixos/hyprland-settings.nix
+++ b/hosts/mac-nixos/hyprland-settings.nix
@@ -0,0 +1,44 @@
+{
+  monitor = [
+    "eDP-1,3456x2234@60.00000,0x0,1.0,bitdepth,10,cm,hdr,sdrbrightness,1.2,sdrsaturation,0.98"
+  ];
+  
+  workspace = [
+    "name:firefox, monitor:eDP-1, default:false, special, class:(.*firefox.*)"
+    "name:discord, monitor:eDP-1, default:true, special, title:(.*vesktop.*), title:(.*Apple Music.*)"
+    "name:steam, monitor:eDP-1, default:false, special, class:(.*[Ss]team.*)"
+  ];
+
+  windowRule = [
+    # "tag +fakefull, fullscreen: 0"
+    # "float, tag:fakefull"
+    # "size 3356 2160, tag:fakefull"
+    # "move 100 74, tag:fakefull"
+    # "noanim, tag:fakefull"
+    # "noblur, tag:fakefull"
+    # "norounding, tag:fakefull"
+    # "noshadow, tag:fakefull"
+    # "immediate, tag:fakefull"
+    # "noborder, tag:fakefull"
+    # "nodim, tag:fakefull"
+    # "idleinhibit, tag:fakefull"
+    "size 2160 3356, tag:horizonrdp"
+  ];
+
+  waybar = {
+    modules-right = [
+      "tray"
+      "temperature"
+      "temperature#gpu"
+      "keyboard-state#capslock"
+      "keyboard-state#numlock"
+      "wireplumber#sink"
+      # "wireplumber#source"
+      "bluetooth"
+      "network"
+      "clock"
+      "battery"
+      "custom/weather"
+    ];
+  };
+}
--- a/hosts/mac-nixos/networking.nix
+++ b/hosts/mac-nixos/networking.nix
@@ -0,0 +1,37 @@
+{ pkgs, lib, ... }:
+{
+  # Networking configs
+  networking = {
+    hostName = "macbook-pro-nixos";
+
+    wireless.iwd = {
+      enable = true;
+      settings = {
+        General = {
+            EnableNetworkConfiguration = true;
+        };
+        Rank = {
+          BandModifier2_4GHz = 1.0;
+          BandModifier5GHz = 5.0;
+          BandModifier6GHz = 10.0;
+        };
+        # DriverQuirks = {
+        #   PowerSaveDisable = "hci_bcm4377,brcmfmac";
+        # };
+        Network = {
+          AutoConnect = true;
+        };
+      };
+    };
+
+    # Enable Network Manager
+    networkmanager = {
+      enable = lib.mkForce false;
+      wifi = {
+        backend = lib.mkForce "iwd";
+        powersave = lib.mkDefault false;
+      };
+      settings.connectivity.uri = lib.mkDefault "http://nmcheck.gnome.org/check_network_status.txt";
+    };
+  };
+}
--- a/hosts/mac-nixos/omnissa.nix
+++ b/hosts/mac-nixos/omnissa.nix
@@ -0,0 +1,123 @@
+{ stdenv
+, lib
+, buildFHSEnv
+, fetchurl
+, makeWrapper
+, gsettings-desktop-schemas
+, opensc
+, writeTextDir
+, configText ? ""
+}:
+
+let
+  version = "2503-8.15.0";
+  sysArch = "armhf";
+  mainProgram = "horizon-client";
+
+  wrapBinCommands = path: name: ''
+    makeWrapper "$out/${path}/${name}" "$out/bin/${name}_wrapper" \
+      --set GTK_THEME Adwaita \
+      --suffix XDG_DATA_DIRS : "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}" \
+      --suffix LD_LIBRARY_PATH : "$out/lib/omnissa/horizon:$out/lib/omnissa/horizon/vdpService:$out/lib/omnissa"
+  '';
+
+  omnissaHorizonClientFiles = stdenv.mkDerivation {
+    pname = "omnissa-horizon-armhf-files";
+    inherit version;
+
+    src = fetchurl {
+      url = "https://download3.omnissa.com/software/CART26FQ1_LIN_2503_TARBALL/Omnissa-Horizon-Client-Linux-2503-8.15.0-14256322247.tar.gz";
+      sha256 = "sha256-x98ITXF9xwzlPq375anQ2qBpMbZAcCqDVXBfvZPha7Q=";
+    };
+
+    nativeBuildInputs = [ makeWrapper ];
+
+    installPhase = ''
+      mkdir ext
+      tar -xzf $src
+      cd Omnissa-Horizon-Client-Linux-*/${sysArch}
+
+      mkdir -p ext
+      for archive in *.tar.gz; do
+        tar -C ext --strip-components=1 -xf "$archive"
+      done
+
+      chmod -R u+w ext/usr/lib
+
+      mkdir -p $out
+      mv ext/usr $out
+      mv ext/${sysArch}/lib $out/
+      mv ext/${sysArch}/include $out/
+
+      mkdir -p $out/lib/omnissa/horizon/pkcs11
+      ln -s ${opensc}/lib/pkcs11/opensc-pkcs11.so $out/lib/omnissa/horizon/pkcs11/libopenscpkcs11.so
+
+      chmod +x "$out/usr/bin/horizon-client"
+      ${wrapBinCommands "usr/bin" "horizon-client"}
+    '';
+  };
+
+  omnissaFHSUserEnv =
+    pname:
+    buildFHSEnv {
+      inherit pname version;
+
+      runScript = "${omnissaHorizonClientFiles}/bin/${pname}_wrapper";
+
+      targetPkgs = pkgs: with pkgs; [
+        atk
+        cairo
+        dbus
+        file
+        fontconfig
+        freetype
+        gdk-pixbuf
+        glib
+        gtk3
+        libjpeg
+        libpng
+        libpulseaudio
+        libtiff
+        libuuid
+        libv4l
+        libxml2
+        pango
+        pcsclite
+        pixman
+        udev
+        omnissaHorizonClientFiles
+        xorg.libX11
+        xorg.libXau
+        xorg.libXcursor
+        xorg.libXext
+        xorg.libXi
+        xorg.libXrandr
+        xorg.libXrender
+        xorg.libXtst
+        zlib
+
+        (writeTextDir "etc/omnissa/config" configText)
+      ];
+    };
+in
+stdenv.mkDerivation {
+  pname = "omnissa-horizon-client";
+  inherit version;
+
+  dontUnpack = true;
+
+  installPhase = ''
+    mkdir -p $out/bin
+    ln -s ${omnissaFHSUserEnv "horizon-client"}/bin/horizon-client $out/bin/
+    ln -s ${omnissaFHSUserEnv "horizon-eucusbarbitrator"}/bin/horizon-eucusbarbitrator $out/bin/
+  '';
+
+  passthru.unwrapped = omnissaHorizonClientFiles;
+
+  meta = {
+    description = "Omnissa Horizon Client for ARM";
+    homepage = "https://www.omnissa.com/products/horizon-8/";
+    license = lib.licenses.unfree;
+    platforms = [ "aarch64-linux" "armv7l-linux" ];
+  };
+}
--- a/hosts/mac-nixos/services.nix
+++ b/hosts/mac-nixos/services.nix
@@ -0,0 +1,83 @@
+{ lib, ... }:
+{
+  services = {
+    auto-cpufreq = {
+      enable = true;
+      settings = {
+        # settings for when connected to a power source
+        charger = {
+          # see available governors by running: cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_available_governors
+          # preferred governor
+          governor = "performance";
+
+          # minimum cpu frequency (in kHz)
+          # example: for 800 MHz = 800000 kHz --> scaling_min_freq = 800000
+          # see conversion info: https://www.rapidtables.com/convert/frequency/mhz-to-hz.html
+          # to use this feature, uncomment the following line and set the value accordingly
+          # scaling_min_freq = 800000
+
+          # maximum cpu frequency (in kHz)
+          # example: for 1GHz = 1000 MHz = 1000000 kHz -> scaling_max_freq = 1000000
+          # see conversion info: https://www.rapidtables.com/convert/frequency/mhz-to-hz.html
+          # to use this feature, uncomment the following line and set the value accordingly
+          # scaling_max_freq = 1000000
+
+          # turbo boost setting. possible values: always, auto, never
+          turbo = "auto";
+        };
+        # settings for when using battery power
+        battery = {
+          # see available governors by running: cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_available_governors
+          # preferred governor
+          governor = "schedutil";
+
+          # minimum cpu frequency (in kHz)
+          # example: for 800 MHz = 800000 kHz --> scaling_min_freq = 800000
+          # see conversion info: https://www.rapidtables.com/convert/frequency/mhz-to-hz.html
+          # to use this feature, uncomment the following line and set the value accordingly
+          # scaling_min_freq = 800000
+
+          # maximum cpu frequency (in kHz)
+          # see conversion info: https://www.rapidtables.com/convert/frequency/mhz-to-hz.html
+          # example: for 1GHz = 1000 MHz = 1000000 kHz -> scaling_max_freq = 1000000
+          # to use this feature, uncomment the following line and set the value accordingly
+          # scaling_max_freq = 1000000
+
+          # turbo boost setting (always, auto, or never)
+          turbo = "auto";
+
+          # battery charging threshold
+          # reference: https://github.com/AdnanHodzic/auto-cpufreq/#battery-charging-thresholds
+          #enable_thresholds = true
+          #start_threshold = 20
+          #stop_threshold = 80
+        };
+      };
+    };
+  
+    displayManager = {
+      sddm = {
+        enable = lib.mkForce true;
+        wayland.enable = lib.mkForce true;
+      };
+      gdm.enable = lib.mkForce false;
+    };
+  
+    desktopManager = {
+      plasma6.enable = lib.mkForce false;
+      gnome.enable = lib.mkForce false;
+    };
+
+    logind = {
+      lidSwitch = "suspend";
+      lidSwitchExternalPower = "ignore";
+      powerKey = "suspend";
+      powerKeyLongPress = "poweroff";
+    };
+
+    # Enable Flatpak
+    flatpak.enable = lib.mkDefault false;
+
+    gvfs.enable = true;
+  };
+}
--- a/hosts/nas/apps.nix
+++ b/hosts/nas/apps.nix
@@ -1,4 +1,7 @@
 { pkgs, lib, ... }:
+let
+  settings = import ./settings.nix;
+in
 {
  imports = [
    ./apps/actual
@@ -69,7 +72,7 @@
    crowdsec = {
      enable = true;
      port = 9898;
-      apiAddress = "10.0.1.18";
+      apiAddress = settings.hostAddress;
      apiKey = "1daH89qmJ41r2Lpd9hvDw4sxtOAtBzaj3aKFOFqE";
      dataDir = "/media/nas/ssd/nix-app-data/crowdsec";
    };
--- a/hosts/nas/apps/actual/default.nix
+++ b/hosts/nas/apps/actual/default.nix
@@ -2,8 +2,9 @@
 with lib;
 let
  cfg = config.nas-apps.actual;
+  settings = import ../settings.nix;
  dataDir = "/data";
-  hostAddress = "10.0.1.18";
+  hostAddress = settings.hostAddress;
  actualUserId = config.users.users.nix-apps.uid;
  actualGroupId = config.users.groups.jallen-nas.gid;
 in
--- a/hosts/nas/apps/arrs/default.nix
+++ b/hosts/nas/apps/arrs/default.nix
@@ -7,6 +7,7 @@
 with lib;
 let
  cfg = config.nas-apps.arrs;
+  settings = import ../settings.nix;
  radarrDataDir = "/var/lib/radarr";
  downloadDir = "/downloads";
  incompleteDir = "/downloads-incomplete";
@@ -29,7 +30,7 @@ in
    containers.arrs = {
      autoStart = true;
      privateNetwork = true;
-      hostAddress = "10.0.1.18";
+      hostAddress = settings.hostAddress;
      localAddress = cfg.localAddress;

      config =
--- a/hosts/nas/apps/gitea/default.nix
+++ b/hosts/nas/apps/gitea/default.nix
@@ -2,7 +2,8 @@
 with lib;
 let
  cfg = config.nas-apps.gitea;
-  hostAddress = "10.0.1.18";
+  settings = import ../settings.nix;
+  hostAddress = settings.hostAddress;
  # localAddress = "10.0.4.18";
  # httpPort = 3000;
  # sshPort = 2222;
--- a/hosts/nas/apps/immich/default.nix
+++ b/hosts/nas/apps/immich/default.nix
@@ -1,5 +1,6 @@
 { config, lib, ... }:
 let
+  settings = import ../settings.nix;
  immichPort = 2283;
  dataDir = "/media/nas/main/photos";
  dbPassword = config.sops.secrets."jallen-nas/immich/db-password".path;
@@ -15,7 +16,7 @@ in

    environment = {
      IMMICH_HOST = lib.mkForce "0.0.0.0";
-      IMMICH_TRUSTED_PROXIES = "10.0.1.18";
+      IMMICH_TRUSTED_PROXIES = settings.hostAddress;
      TZ = "America/Chicago";
    };

--- a/hosts/nas/apps/jellyseerr/default.nix
+++ b/hosts/nas/apps/jellyseerr/default.nix
@@ -3,12 +3,13 @@
 let
  jellyseerrPort = 5055;
  dataDir = "/var/lib/private/jellyseerr";
+  settings = import ../settings.nix;
 in
 {
  containers.jellyseerr = {
    autoStart = true;
    privateNetwork = true;
-    hostAddress = "10.0.1.18";
+    hostAddress = settings.hostAddress;
    localAddress = "10.0.1.52";
    hostAddress6 = "fc00::1";
    localAddress6 = "fc00::4";
--- a/hosts/nas/apps/nextcloud/default.nix
+++ b/hosts/nas/apps/nextcloud/default.nix
@@ -1,12 +1,13 @@
 { config, pkgs, ... }:
 let
+  settings = import ../settings.nix;
  adminpass = config.sops.secrets."jallen-nas/nextcloud/adminpassword".path;
  secretsFile =  config.sops.secrets."jallen-nas/nextcloud/smtp_settings".path;
  jwtSecretFile =  config.sops.secrets."jallen-nas/onlyoffice-key".path;
  nextcloudUserId = config.users.users.nix-apps.uid;
  nextcloudGroupId = config.users.groups.jallen-nas.gid;
  nextcloudPackage = pkgs.unstable.nextcloud31;
-  hostAddress = "10.0.1.18";
+  hostAddress = settings.hostAddress;
  localAddress = "10.0.2.18";
  nextcloudPortExtHttp = 9988;
  nextcloudPortExtHttps = 9943;
--- a/hosts/nas/apps/paperless/default.nix
+++ b/hosts/nas/apps/paperless/default.nix
@@ -4,6 +4,7 @@
  ...
 }:
 let
+  settings = import ../settings.nix;
  paperlessPort = 28981;
  paperlessUserId = config.users.users.nix-apps.uid;
  paperlessGroupId = config.users.groups.jallen-nas.gid;
@@ -14,7 +15,7 @@ in
  containers.paperless = {
    autoStart = true;
    privateNetwork = true;
-    hostAddress = "10.0.1.18";
+    hostAddress = settings.hostAddress;
    localAddress = "10.0.1.20";
    hostAddress6 = "fc00::1";
    localAddress6 = "fc00::20";
--- a/hosts/nas/apps/traefik/default.nix
+++ b/hosts/nas/apps/traefik/default.nix
@@ -1,7 +1,8 @@
 { config, ... }:
 let
+  settings = import ../settings.nix;
  domain = "mjallen.dev";
-  serverIp = "10.0.1.18";
+  serverIp = settings.hostAddress;

  # Forward services
  authUrl = "http://${serverIp}:9000/outpost.goauthentik.io";
--- a/hosts/nas/networking.nix
+++ b/hosts/nas/networking.nix
@@ -1,6 +1,6 @@
 { config, ... }:
 let
-  hostname = "jallen-nas";
+  settings = import ./settings.nix;
  ports = [
    8008 # restic
    9000 # authentik
@@ -27,7 +27,7 @@ in
 {
  # Networking configs
  networking = {
-    hostName = hostname;
+    hostName = settings.hostname;

    useNetworkd = true;

@@ -48,7 +48,7 @@ in
              type = "wifi";
            };
            ipv4 = {
-              address1 = "10.0.1.18/24";
+              address1 = "${settings.hostAddress}/24";
              dns = "10.0.1.1";
              gateway = "10.0.1.1";
              method = "manual";
--- a/hosts/pi4/adguard.nix
+++ b/hosts/pi4/adguard.nix
@@ -29,7 +29,7 @@
        trusted_proxies = [
          "127.0.0.0/8"
          "::1/128"
-          "10.0.1.18"
+          "10.0.1.3"
        ];
        cache_optimistic = true;
      };
--- a/hosts/pi4/home.nix
+++ b/hosts/pi4/home.nix
@@ -2,11 +2,11 @@
 let
  shellAliases = {
    ll = "ls -alh";
-    update-boot = "sudo nixos-rebuild boot --max-jobs 10 --build-host admin@10.0.1.18";
-    update-switch = "sudo nixos-rebuild switch --max-jobs 10 --build-host admin@10.0.1.18";
+    update-boot = "sudo nixos-rebuild boot --max-jobs 10 --build-host admin@10.0.1.3";
+    update-switch = "sudo nixos-rebuild switch --max-jobs 10 --build-host admin@10.0.1.3";
    update-flake = "nix flake update pi4-nixpkgs pi4-home-manager pi4-impermanence pi4-sops-nix pi4-nixos-hardware pi4-nixos-raspberrypi pi4-disko --flake /etc/nixos";
-    update-nas = "nixos-rebuild switch --use-remote-sudo --target-host admin@10.0.1.18 --build-host admin@10.0.1.18 --flake ~/nix-config#jallen-nas";
-    nas-ssh = "kitten ssh admin@10.0.1.18";
+    update-nas = "nixos-rebuild switch --use-remote-sudo --target-host admin@10.0.1.3 --build-host admin@10.0.1.3 --flake ~/nix-config#jallen-nas";
+    nas-ssh = "kitten ssh admin@10.0.1.3";
    ducks = "du -cksh * | sort -hr | head -n 15";
  };
 in
--- a/hosts/pi5/hass.nix
+++ b/hosts/pi5/hass.nix
@@ -1,6 +1,6 @@
 { ... }:
 let
-  hostAddress = "10.0.1.18";
+  hostAddress = "10.0.1.3";
  localAddress = "10.0.5.18";
  hassPort = 8192;
 in
--- a/hosts/pi5/home.nix
+++ b/hosts/pi5/home.nix
@@ -1,11 +1,11 @@
 { pkgs, lib, config, ... }:
 let
  shellAliases = {
-    update-boot = "sudo nixos-rebuild boot --max-jobs 10 --build-host admin@10.0.1.18";
-    update-switch = "sudo nixos-rebuild switch --max-jobs 10 --build-host admin@10.0.1.18";
+    update-boot = "sudo nixos-rebuild boot --max-jobs 10 --build-host admin@10.0.1.3";
+    update-switch = "sudo nixos-rebuild switch --max-jobs 10 --build-host admin@10.0.1.3";
    update-flake = "nix flake update pi5-nixpkgs pi5-home-manager pi5-impermanence pi5-nixos-hardware pi5-sops-nix nixos-raspberrypi --flake /etc/nixos";
-    update-nas = "nixos-rebuild switch --use-remote-sudo --target-host admin@10.0.1.18 --build-host admin@10.0.1.18 --flake ~/nix-config#jallen-nas";
-    nas-ssh = "kitten ssh admin@10.0.1.18";
+    update-nas = "nixos-rebuild switch --use-remote-sudo --target-host admin@10.0.1.3 --build-host admin@10.0.1.3 --flake ~/nix-config#jallen-nas";
+    nas-ssh = "kitten ssh admin@10.0.1.3";
  };
 in
 {