mac updates

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?
 }