From c3354e36097ab3fc30f37614dbd2f0cb440bc4e2 Mon Sep 17 00:00:00 2001
From: Youwen Wu <youwenw@gmail.com>
Date: Wed, 7 Aug 2024 08:43:27 -0700
Subject: [PATCH] fix: remove most of the lib.mkDefaults to stop quirks

---
 users/youwen/common/core.nix | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/users/youwen/common/core.nix b/users/youwen/common/core.nix
index ef7a4d0..06b0d9e 100755
--- a/users/youwen/common/core.nix
+++ b/users/youwen/common/core.nix
@@ -1,6 +1,6 @@
 { pkgs, ... }: {
-  programs.bash.enable = pkgs.lib.mkDefault true;
-  programs.nushell = pkgs.lib.mkDefault {
+  programs.bash.enable = true;
+  programs.nushell = {
     enable = true;
     configFile.text = ''
       $env.config = {
@@ -10,21 +10,21 @@
     '';
   };
 
-  programs.fzf = pkgs.lib.mkDefault { enable = true; };
+  programs.fzf = { enable = true; };
 
-  programs.git = pkgs.lib.mkDefault {
+  programs.git = {
     enable = true;
     userName = "Youwen Wu";
     userEmail = "youwenw@gmail.com";
     delta.enable = true;
     extraConfig = {
       init.defaultBranch = "main";
-      commit.gpgsign = "true";
+      commit.gpgsign = pkgs.lib.mkDefault "true";
       user.signingkey = "8F5E6C1AF90976CA7102917A865658ED1FE61EC3";
     };
   };
 
-  programs.lazygit = pkgs.lib.mkDefault {
+  programs.lazygit = {
     enable = true;
     settings = {
       git.paging = {
@@ -34,28 +34,28 @@
     };
   };
 
-  programs.bat.enable = pkgs.lib.mkDefault true;
+  programs.bat.enable = true;
 
-  programs.ripgrep.enable = pkgs.lib.mkDefault true;
+  programs.ripgrep.enable = true;
 
   programs.readline = {
     enable = true;
     extraConfig = "set editing-mode vi";
   };
 
-  programs.zoxide = pkgs.lib.mkDefault {
+  programs.zoxide = {
     enable = true;
     # enableZshIntegration = true;
     enableFishIntegration = true;
     enableNushellIntegration = true;
   };
 
-  programs.gh = pkgs.lib.mkDefault {
+  programs.gh = {
     enable = true;
     extensions = [ pkgs.github-copilot-cli ];
   };
 
-  programs.oh-my-posh = pkgs.lib.mkDefault {
+  programs.oh-my-posh = {
     enable = true;
     # enableZshIntegration = true;
     enableFishIntegration = true;
@@ -124,9 +124,9 @@
     ];
   };
 
-  programs.fd.enable = pkgs.lib.mkDefault true;
+  programs.fd.enable = true;
 
-  programs.btop = pkgs.lib.mkDefault {
+  programs.btop = {
     enable = true;
     settings = {
       color_theme = "tokyo-night";
@@ -135,13 +135,13 @@
     };
   };
 
-  programs.eza = pkgs.lib.mkDefault {
+  programs.eza = {
     enable = true;
     enableFishIntegration = true;
     enableBashIntegration = true;
   };
 
-  programs.neovim = pkgs.lib.mkDefault {
+  programs.neovim = {
     enable = true;
     defaultEditor = true;
     viAlias = true;