rayandrew/nix
rayandrew/nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix stuffs

Browse source
This commit is contained in:
Ray Andrew 2025-04-08 23:37:00 -05:00
parent 1cb11aef59
commit 1efeda4130
Signed by: rayandrew
SSH key fingerprint: SHA256:XYrYrxF0Z3A72n8P/p6mqPRNQZT22F88XcLsG+kX4xw
6 changed files with 43 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -1 +1,2 @@
result result
/.pre-commit-config.yaml

53
darwin/default.nix
View file

@ -124,33 +124,32 @@
ShowPathbar = true; ShowPathbar = true;
ShowStatusBar = false; ShowStatusBar = false;
}; };
# NSGlobalDomain = {
# NSGlobalDomain = { # AppleMeasurementUnits = "Centimeters";
# # AppleMeasurementUnits = "Centimeters"; AppleMetricUnits = 1;
# AppleMetricUnits = 1; AppleShowAllExtensions = true;
# AppleShowAllExtensions = true; # AppleTemperatureUnit = "Celsius";
# # AppleTemperatureUnit = "Celsius"; AppleInterfaceStyle = "Dark";
# # AppleInterfaceStyle = "Dark"; # AppleInterfaceStyle = null; # -- light mode
# AppleInterfaceStyle = null; # -- light mode AppleInterfaceStyleSwitchesAutomatically = false;
# AppleInterfaceStyleSwitchesAutomatically = false; InitialKeyRepeat = 20;
# InitialKeyRepeat = 20; KeyRepeat = 2;
# KeyRepeat = 2; NSAutomaticCapitalizationEnabled = false;
# NSAutomaticCapitalizationEnabled = false; NSAutomaticDashSubstitutionEnabled = false;
# NSAutomaticDashSubstitutionEnabled = false; NSAutomaticPeriodSubstitutionEnabled = false;
# NSAutomaticPeriodSubstitutionEnabled = false; NSAutomaticQuoteSubstitutionEnabled = false;
# NSAutomaticQuoteSubstitutionEnabled = false; NSAutomaticSpellingCorrectionEnabled = false;
# NSAutomaticSpellingCorrectionEnabled = false; NSDisableAutomaticTermination = true;
# NSDisableAutomaticTermination = true; NSAutomaticWindowAnimationsEnabled = false;
# NSAutomaticWindowAnimationsEnabled = false; NSDocumentSaveNewDocumentsToCloud = false;
# NSDocumentSaveNewDocumentsToCloud = false; NSNavPanelExpandedStateForSaveMode = true;
# NSNavPanelExpandedStateForSaveMode = true; NSNavPanelExpandedStateForSaveMode2 = true;
# NSNavPanelExpandedStateForSaveMode2 = true; NSTableViewDefaultSizeMode = 2;
# NSTableViewDefaultSizeMode = 2; NSWindowResizeTime = 1.0e-4;
# NSWindowResizeTime = 1.0e-4; PMPrintingExpandedStateForPrint = true;
# PMPrintingExpandedStateForPrint = true; PMPrintingExpandedStateForPrint2 = true;
# PMPrintingExpandedStateForPrint2 = true; };
# }; LaunchServices.LSQuarantine = false;
# LaunchServices.LSQuarantine = false;
}; };
environment.systemPackages = environment.systemPackages =

8
darwin/homebrew.nix
View file

@ -29,6 +29,7 @@
ice = mkEnableOption "Enable Ice Menu Manager"; ice = mkEnableOption "Enable Ice Menu Manager";
contexts = mkEnableOption "Enable Contexts"; contexts = mkEnableOption "Enable Contexts";
forklift = mkEnableOption "Enable Forklift 4"; forklift = mkEnableOption "Enable Forklift 4";
flux = mkEnableOption "Enable f.lux";
}; };
config = lib.mkMerge [ config = lib.mkMerge [
@ -48,7 +49,7 @@
enable = true; enable = true;
onActivation = { onActivation = {
# autoUpdate = true; # autoUpdate = true;
# cleanup = "zap"; cleanup = "zap";
}; };
global = { global = {
brewfile = true; brewfile = true;
@ -157,5 +158,10 @@
"forklift" "forklift"
]; ];
}) })
(lib.mkIf config.custom.brew.flux {
homebrew.casks = [
"flux"
];
})
]; ];
} }

8
darwin/sketchybar/config/items/cal.lua
View file

@ -39,6 +39,12 @@ local cal = sbar.add("item", {
-- Padding item required because of bracket -- Padding item required because of bracket
sbar.add("item", { position = "right", width = settings.group_paddings }) 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: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) end)

1
hosts/dango/default.nix
View file

@ -37,6 +37,7 @@
scroll-reverser = true; scroll-reverser = true;
ice = true; ice = true;
contexts = true; contexts = true;
flux = true;
}; };
}; };

2
hosts/default.nix
View file

@ -41,7 +41,6 @@ let
./${host} ./${host}
./${host}/hardware.nix ./${host}/hardware.nix
../nixos ../nixos
../overlays
( (
{ config, ... }: { config, ... }:
{ {
@ -53,6 +52,7 @@ let
inherit host user system; inherit host user system;
system-font = "Consolas"; system-font = "Consolas";
dots = "/home/${user}/dotfiles"; dots = "/home/${user}/dotfiles";
home-dir = config.home-manager.users.${user}.home.homeDirectory;
}; };
users.${user} = { users.${user} = {