From c577261b43f551c2cf703043b96f39cac6c21eea Mon Sep 17 00:00:00 2001
From: mjallen18 <matt.l.jallen@gmail.com>
Date: Wed, 27 Mar 2024 13:13:36 -0500
Subject: [PATCH] update default

---
 hosts/default.nix           | 38 ++++++++++++++++++++-----------------
 hosts/mac/configuration.nix |  5 ++++-
 2 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/hosts/default.nix b/hosts/default.nix
index eb4eb68..5b25616 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -8,23 +8,23 @@ in {
     settings.experimental-features = [ "nix-command" "flakes" ];
 
     # Garbage collect automatically every week
-    gc.automatic = true;
+    gc.automatic = lib.mkDefault true;
     gc.options = "--delete-older-than 30d";
 
-    optimise.automatic = true;
+    optimise.automatic = lib.mkDefault true;
   };
 
   # Configure nixpkgs
   # Enable non free
-  nixpkgs.config.allowUnfree = true;
+  nixpkgs.config.allowUnfree = lib.mkDefault true;
 
   # Hardware configs
   hardware = {
     # Bluetooth
-    bluetooth.enable = true;
+    bluetooth.enable = lib.mkDefault true;
 
     # Enable all firmware
-    enableAllFirmware = true;
+    enableAllFirmware = lib.mkDefault true;
 
     # Disable pulse audio in favor of pipewire
     pulseaudio.enable = false;
@@ -32,24 +32,24 @@ in {
 
   # Services configs
   services = {
-    openssh.enable = true;
+    openssh.enable = lib.mkDefault true;
 
     # Enable firmware updates
-    fwupd.enable = true;
+    fwupd.enable = lib.mkDefault true;
 
     fstrim.enable = lib.mkDefault true;
 
-    pcscd.enable = true;
+    pcscd.enable = lib.mkDefault true;
 
     # Enable CUPS to print documents.
-    printing.enable = true;
+    printing.enable = lib.mkDefault true;
 
     # configure pipewire
     pipewire = {
-      enable = true;
-      alsa.enable = true;
-      alsa.support32Bit = true;
-      pulse.enable = true;
+      enable = lib.mkDefault true;
+      alsa.enable = lib.mkDefault true;
+      alsa.support32Bit = lib.mkDefault true;
+      pulse.enable = lib.mkDefault true;
     };
   };
 
@@ -62,7 +62,7 @@ in {
   boot = {
     # Enable AppImage
     binfmt.registrations.appimage = {
-      wrapInterpreterInShell = false;
+      wrapInterpreterInShell = lib.mkDefault false;
       interpreter = "${pkgs.appimage-run}/bin/appimage-run";
       recognitionType = "magic";
       offset = 0;
@@ -72,10 +72,14 @@ in {
   };
 
   programs = {
-    fish.enable = true;
+    fish.enable = lib.mkDefault true;
     gnupg.agent = {
       enable = lib.mkDefault true;
+<<<<<<< HEAD
       pinentryPackage = lib.mkForce pkgs.pinentry-qt;
+=======
+      # pinentryPackage = pkgs.pinentry-curses;
+>>>>>>> d18eaa1 (update default)
       enableSSHSupport = lib.mkDefault true;
     };
   };
@@ -86,11 +90,11 @@ in {
   
   # Security config
   security = {
-    rtkit.enable = true;
+    rtkit.enable = lib.mkDefault true;
 
     # configure sudo
     sudo = {
-      enable = true;
+      enable = lib.mkDefault true;
       extraRules = [{
         commands = [
           {
diff --git a/hosts/mac/configuration.nix b/hosts/mac/configuration.nix
index caa5ff5..2f3a59b 100644
--- a/hosts/mac/configuration.nix
+++ b/hosts/mac/configuration.nix
@@ -1,5 +1,7 @@
 { pkgs, ... }:
 {
+  #nix run nix-darwin -- switch --flake ~/nix-config
+
   # List packages installed in system profile. To search by name, run:
   # $ nix-env -qaP | grep wget
   environment.systemPackages =
@@ -22,6 +24,7 @@
       "orcaslicer"
       "vscodium"
       "epic-games"
+      "wine-stable"
   ];
 
   homebrew.masApps = {
@@ -36,7 +39,7 @@
   system.defaults.NSGlobalDomain."com.apple.mouse.tapBehavior" = 1;
   system.defaults.dock.autohide = false;
   system.defaults.NSGlobalDomain.AppleInterfaceStyle = "Dark";
-  system.defaults.NSGlobalDomain."com.apple.keyboard.fnState" = true;
+  system.defaults.NSGlobalDomain."com.apple.keyboard.fnState" = false;
   security.pam.enableSudoTouchIdAuth = true;