From f62082a35a4750c35b9c4a4701ab979f7aa827f1 Mon Sep 17 00:00:00 2001
From: mjallen18 <matt.l.jallen@gmail.com>
Date: Sat, 16 Mar 2024 14:35:52 -0500
Subject: [PATCH] minor cleanup

---
 hosts/mac-nixos/configuration.nix | 83 +++++++++++--------------------
 1 file changed, 28 insertions(+), 55 deletions(-)

diff --git a/hosts/mac-nixos/configuration.nix b/hosts/mac-nixos/configuration.nix
index 55ea68e..8220dc0 100644
--- a/hosts/mac-nixos/configuration.nix
+++ b/hosts/mac-nixos/configuration.nix
@@ -8,6 +8,7 @@
   imports =
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
+      # using channel right now, convert to flake???
       #./apple-silicon-support
       <apple-silicon-support/apple-silicon-support>
       ../default.nix
@@ -20,53 +21,39 @@
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = false;
 
+  apps.discover-wrapped.enable = true;
+
   boot.extraModprobeConfig = ''
     options hid_apple iso_layout=0
   '';
 
   networking.hostName = "mac-nixos"; # Define your hostname.
-  # Pick only one of the below networking options.
-  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
   networking.networkmanager.enable = true;  # Easiest to use and most distros use this by default.
 
-  # Set your time zone.
-  time.timeZone = "America/Chicago";
+  services = {
+    # Enable the X11 windowing system.
+    xserver = {
+      enable = true;
 
-  # Configure network proxy if necessary
-  # networking.proxy.default = "http://user:password@proxy:port/";
-  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
+      # Enable the Plasma 6 Desktop Environment.
+      displayManager = {
+        sddm.enable = true;
+        defaultSession = "plasma";
+      };
+    };
 
-  # Select internationalisation properties.
-  # i18n.defaultLocale = "en_US.UTF-8";
-  # console = {
-  #   font = "Lat2-Terminus16";
-  #   keyMap = "us";
-  #   useXkbConfig = true; # use xkb.options in tty.
-  # };
+    desktopManager.plasma6.enable = true;
 
-  # Enable the X11 windowing system.
-  # services.xserver.enable = true;
+    # enable auto discovery of printers
+    avahi = {
+      enable = true;
+      nssmdns4 = true;
+      openFirewall = true;
+    };
 
-  services.xserver.enable = true;
-#  services.xserver.desktopManager.plasma5.enable = true;
-  services.xserver.displayManager.sddm.enable = true;
-#  services.xserver.displayManager.defaultSession = "plasmawayland";
-  services.desktopManager.plasma6.enable = true;
-  services.xserver.displayManager.defaultSession = "plasma";
-
-  # Configure keymap in X11
-  # services.xserver.xkb.layout = "us";
-  # services.xserver.xkb.options = "eurosign:e,caps:escape";
-
-  # Enable CUPS to print documents.
-  # services.printing.enable = true;
-
-  # Enable sound.
-  # sound.enable = true;
-  # hardware.pulseaudio.enable = true;
-
-  # Enable touchpad support (enabled default in most desktopManager).
-  # services.xserver.libinput.enable = true;
+    # Enable Flatpak
+    flatpak.enable = true;
+  };
 
   # Define a user account. Don't forget to set a password with ‘passwd’.
   users.users.matt = {
@@ -77,9 +64,14 @@
       tree
       neofetch
       git
+      box64
+      #minecraft
+      prismlauncher
     ];
   };
 
+  programs.java.enable = true;
+
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [
@@ -87,25 +79,6 @@
     wget
   ];
 
-  # Some programs need SUID wrappers, can be configured further or are
-  # started in user sessions.
-  # programs.mtr.enable = true;
-  # programs.gnupg.agent = {
-  #   enable = true;
-  #   enableSSHSupport = true;
-  # };
-
-  # List services that you want to enable:
-
-  # Enable the OpenSSH daemon.
-  # services.openssh.enable = true;
-
-  # Open ports in the firewall.
-  # networking.firewall.allowedTCPPorts = [ ... ];
-  # networking.firewall.allowedUDPPorts = [ ... ];
-  # Or disable the firewall altogether.
-  # networking.firewall.enable = false;
-
   # 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.