From 77736d8c5f2bd9b662bf5982179e3d3f754ac4ac Mon Sep 17 00:00:00 2001 From: billimek Date: Mon, 14 Oct 2024 08:46:01 -0400 Subject: [PATCH] fix(hosts): Remove unnecessary comments and configurations Remove unnecessary comments and configurations in the defaults.nix file to clean up the codebase. This includes outdated or commented-out settings that are no longer needed for system configurations. --- hosts/common/darwin/defaults.nix | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/hosts/common/darwin/defaults.nix b/hosts/common/darwin/defaults.nix index b49b202..77a863a 100644 --- a/hosts/common/darwin/defaults.nix +++ b/hosts/common/darwin/defaults.nix @@ -1,5 +1,4 @@ { - config, inputs, pkgs, lib, @@ -21,7 +20,6 @@ }; nix = { - # package = lib.mkDefault pkgs.nix; package = pkgs.nix; settings = { experimental-features = [ @@ -31,7 +29,7 @@ ]; warn-dirty = false; # false until https://github.com/NixOS/nix/issues/11002 is truly resolved - sandbox = false; + # sandbox = false; }; configureBuildUsers = true; @@ -52,7 +50,6 @@ pkgs.bashInteractive pkgs.fish ]; - shellAliases.nh = "nh_darwin"; variables = { EDITOR = "${lib.getBin pkgs.neovim}/bin/nvim"; SSH_AUTH_SOCK = "$HOME/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock"; @@ -74,7 +71,7 @@ }; # add nerd fonts - fonts.packages = with pkgs; [ + fonts.packages = [ (pkgs-unstable.nerdfonts.override { fonts = [ "Hack" @@ -83,14 +80,6 @@ }) ]; - #system-defaults.nix - # activationScripts are executed every time you boot the system or run `nixos-rebuild` / `darwin-rebuild`. - # system.activationScripts.postUserActivation.text = '' - # # activateSettings -u will reload the settings from the database and apply them to the current session, - # # so we do not need to logout and login again to make the changes take effect. - # /System/Library/PrivateFrameworks/SystemAdministration.framework/Resources/activateSettings -u - # ''; - system.keyboard = { enableKeyMapping = true; }; @@ -184,9 +173,14 @@ # Add flake support and apple silicon stuff nix.extraOptions = '' experimental-features = nix-command flakes - extra-platforms = aarch64-darwin x86_64-darwi + extra-platforms = aarch64-darwin x86_64-darwin ''; # Use touch ID for sudo auth security.pam.enableSudoTouchIdAuth = true; + + # Set sudo timestamp timeout + security.sudo.extraConfig = '' + Defaults timestamp_timeout=30 + ''; }