Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleaning up #68

Merged
merged 4 commits into from
Feb 24, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions nix/modules/darwin-configuration.nix
Original file line number Diff line number Diff line change
Expand Up @@ -224,5 +224,10 @@
};
};

## For any of this to work, we need to enable automatic updates in general.
system.defaults.CustomSystemPreferences."com.apple.SoftwareUpdate".AutomaticCheckEnabled = true;
## This will automatically install macOS updates, which we want because Nix
## doesn’t manage the OS.
system.defaults.CustomSystemPreferences."com.apple.commerce".AutoUpdateRestartRequired = true;
system.defaults.SoftwareUpdate.AutomaticallyInstallMacOSUpdates = true;
}
3 changes: 2 additions & 1 deletion nix/modules/home-configuration.nix
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,8 @@
local = [
"GitHub"
"Skitch"
"Vizsla"
"Rankine" # the temperature scale
"Vizsla" # the dog breed
];
};
};
Expand Down
2 changes: 1 addition & 1 deletion nix/modules/nix-configuration.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
registry = {
## Set the registry’s Nixpkgs to match this flake’s.
nixpkgs.flake = nixpkgs;
## Allows `sys#` to reference the templates, devShells, etc. from Flaky
## Allows `env#` to reference the templates, devShells, etc. from Flaky
## environments.
env.to = {
type = "github";
Expand Down
8 changes: 7 additions & 1 deletion nix/modules/programming/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@

programs = {
## This is for pairing with VSCode users, including Ronnie. Would be ideal
## if there were something like Foobits, but that seems effectively dead.
## if there were something like Floobits, but that seems effectively dead.
vscode = {
enable = true;
enableExtensionUpdateCheck = false; # Nervous about these two, see how
Expand Down Expand Up @@ -113,6 +113,12 @@
"editor.fontLigatures" = true;
"editor.fontSize" = config.lib.local.defaultFont.size;
"workbench.colorTheme" = "Solarized Dark";
## Projects that don’t keep things formatted should have a
## .vscode/settings.json that overrides this.
"editor.formatOnSave" = true;
## This avoids calling out all of my wonderful Unicode content.
"editor.unicodeHighlight.includeComments" = false;
"editor.unicodeHighlight.includeStrings" = false;
};
};

Expand Down
3 changes: 0 additions & 3 deletions nix/modules/shell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,6 @@
normal.family = config.lib.local.defaultFont.monoFamily;
size = config.lib.local.defaultFont.size;
};
## Make sure we don’t fall back to different versions on non-NixOS (e.g.
## the ancient Bash 3.2 on darwin).
terminal.shell.program = lib.getExe pkgs.bashInteractive;
};
};

Expand Down