diff --git a/.gitignore b/.gitignore index b2be92b..3ec26e6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ result +/.pre-commit-config.yaml diff --git a/darwin/default.nix b/darwin/default.nix index 0fc50c6..b616312 100644 --- a/darwin/default.nix +++ b/darwin/default.nix @@ -124,33 +124,32 @@ ShowPathbar = true; ShowStatusBar = false; }; - # - # NSGlobalDomain = { - # # AppleMeasurementUnits = "Centimeters"; - # AppleMetricUnits = 1; - # AppleShowAllExtensions = true; - # # AppleTemperatureUnit = "Celsius"; - # # AppleInterfaceStyle = "Dark"; - # AppleInterfaceStyle = null; # -- light mode - # AppleInterfaceStyleSwitchesAutomatically = false; - # InitialKeyRepeat = 20; - # KeyRepeat = 2; - # NSAutomaticCapitalizationEnabled = false; - # NSAutomaticDashSubstitutionEnabled = false; - # NSAutomaticPeriodSubstitutionEnabled = false; - # NSAutomaticQuoteSubstitutionEnabled = false; - # NSAutomaticSpellingCorrectionEnabled = false; - # NSDisableAutomaticTermination = true; - # NSAutomaticWindowAnimationsEnabled = false; - # NSDocumentSaveNewDocumentsToCloud = false; - # NSNavPanelExpandedStateForSaveMode = true; - # NSNavPanelExpandedStateForSaveMode2 = true; - # NSTableViewDefaultSizeMode = 2; - # NSWindowResizeTime = 1.0e-4; - # PMPrintingExpandedStateForPrint = true; - # PMPrintingExpandedStateForPrint2 = true; - # }; - # LaunchServices.LSQuarantine = false; + NSGlobalDomain = { + # AppleMeasurementUnits = "Centimeters"; + AppleMetricUnits = 1; + AppleShowAllExtensions = true; + # AppleTemperatureUnit = "Celsius"; + AppleInterfaceStyle = "Dark"; + # AppleInterfaceStyle = null; # -- light mode + AppleInterfaceStyleSwitchesAutomatically = false; + InitialKeyRepeat = 20; + KeyRepeat = 2; + NSAutomaticCapitalizationEnabled = false; + NSAutomaticDashSubstitutionEnabled = false; + NSAutomaticPeriodSubstitutionEnabled = false; + NSAutomaticQuoteSubstitutionEnabled = false; + NSAutomaticSpellingCorrectionEnabled = false; + NSDisableAutomaticTermination = true; + NSAutomaticWindowAnimationsEnabled = false; + NSDocumentSaveNewDocumentsToCloud = false; + NSNavPanelExpandedStateForSaveMode = true; + NSNavPanelExpandedStateForSaveMode2 = true; + NSTableViewDefaultSizeMode = 2; + NSWindowResizeTime = 1.0e-4; + PMPrintingExpandedStateForPrint = true; + PMPrintingExpandedStateForPrint2 = true; + }; + LaunchServices.LSQuarantine = false; }; environment.systemPackages = diff --git a/darwin/homebrew.nix b/darwin/homebrew.nix index b42612c..cad8f5e 100644 --- a/darwin/homebrew.nix +++ b/darwin/homebrew.nix @@ -29,6 +29,7 @@ ice = mkEnableOption "Enable Ice Menu Manager"; contexts = mkEnableOption "Enable Contexts"; forklift = mkEnableOption "Enable Forklift 4"; + flux = mkEnableOption "Enable f.lux"; }; config = lib.mkMerge [ @@ -48,7 +49,7 @@ enable = true; onActivation = { # autoUpdate = true; - # cleanup = "zap"; + cleanup = "zap"; }; global = { brewfile = true; @@ -157,5 +158,10 @@ "forklift" ]; }) + (lib.mkIf config.custom.brew.flux { + homebrew.casks = [ + "flux" + ]; + }) ]; } diff --git a/darwin/sketchybar/config/items/cal.lua b/darwin/sketchybar/config/items/cal.lua index cd6672d..58de614 100644 --- a/darwin/sketchybar/config/items/cal.lua +++ b/darwin/sketchybar/config/items/cal.lua @@ -39,6 +39,12 @@ local cal = sbar.add("item", { -- Padding item required because of bracket sbar.add("item", { position = "right", width = settings.group_paddings }) +-- cal:subscribe({ "forced", "routine", "system_woke" }, function(env) +-- cal:set({ icon = os.date("􀉉 %B %d %a"), label = os.date("􀐫 %H:%M") }) +-- end) cal:subscribe({ "forced", "routine", "system_woke" }, function(env) - cal:set({ icon = os.date("􀉉 %B %d %a"), label = os.date("􀐫 %H:%M") }) + cal:set({ + icon = os.date("􀉉 %B %d %a"), + label = os.date("􀐫 %I:%M %p") -- 12-hour format with AM/PM + }) end) diff --git a/hosts/dango/default.nix b/hosts/dango/default.nix index 904ba8d..367331b 100644 --- a/hosts/dango/default.nix +++ b/hosts/dango/default.nix @@ -37,6 +37,7 @@ scroll-reverser = true; ice = true; contexts = true; + flux = true; }; }; diff --git a/hosts/default.nix b/hosts/default.nix index e4f4d9b..676de36 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -41,7 +41,6 @@ let ./${host} ./${host}/hardware.nix ../nixos - ../overlays ( { config, ... }: { @@ -53,6 +52,7 @@ let inherit host user system; system-font = "Consolas"; dots = "/home/${user}/dotfiles"; + home-dir = config.home-manager.users.${user}.home.homeDirectory; }; users.${user} = {