diff --git a/nix/modules/darwin-configuration.nix b/nix/modules/darwin-configuration.nix index 8141063..28194df 100644 --- a/nix/modules/darwin-configuration.nix +++ b/nix/modules/darwin-configuration.nix @@ -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; } diff --git a/nix/modules/home-configuration.nix b/nix/modules/home-configuration.nix index 0b83674..1f1c8b9 100644 --- a/nix/modules/home-configuration.nix +++ b/nix/modules/home-configuration.nix @@ -367,7 +367,8 @@ local = [ "GitHub" "Skitch" - "Vizsla" + "Rankine" # the temperature scale + "Vizsla" # the dog breed ]; }; }; diff --git a/nix/modules/nix-configuration.nix b/nix/modules/nix-configuration.nix index 04d278a..7ee5b0e 100644 --- a/nix/modules/nix-configuration.nix +++ b/nix/modules/nix-configuration.nix @@ -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"; diff --git a/nix/modules/programming/default.nix b/nix/modules/programming/default.nix index d9c2604..2cb2252 100644 --- a/nix/modules/programming/default.nix +++ b/nix/modules/programming/default.nix @@ -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 @@ -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; }; }; diff --git a/nix/modules/shell.nix b/nix/modules/shell.nix index edbce79..702a60a 100644 --- a/nix/modules/shell.nix +++ b/nix/modules/shell.nix @@ -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; }; };