Cleanup:

mikesplain · Jun 20, 2024 · cb9fe68 · cb9fe68
1 parent aed8a96
commit cb9fe68
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 26 deletions.
diff --git a/nixos-config/flake.lock b/nixos-config/flake.lock
diff --git a/nixos-config/modules/packages/default.nix b/nixos-config/modules/packages/default.nix
@@ -37,7 +37,7 @@ in {
       jq
       k9s # Doesn't resolve properly on mac, using brew instead, see https://github.com/derailed/k9s/issues/780
       less
-      nixfmt
+      nixfmt-classic
       ripgrep
       tree
       watch

diff --git a/nixos-config/platforms/darwin/configuration.nix b/nixos-config/platforms/darwin/configuration.nix
@@ -5,14 +5,14 @@
   system.stateVersion = 4;
 
   security.pam.enableSudoTouchIdAuth = true;
-  fonts.fontDir.enable = true;
+  # fonts.fontDir.enable = true;
 # fonts.fonts = [(pkgs.nerdfonts.override {fonts = ["Meslo"];})];
-  fonts.fonts = [(pkgs.nerdfonts)];
+  fonts.packages = [(pkgs.nerdfonts)];
 
   nix.package = pkgs.nix;
   nix.settings.auto-optimise-store = true;
   nix.settings.trusted-users = [ user.name ];
-  nix.maxJobs = 10;
+  nix.settings.max-jobs = 10;
 
   programs.zsh.enable = true;
 
@@ -47,7 +47,7 @@
   environment = {
     shells = with pkgs; [zsh];
     loginShell = pkgs.zsh;
-    systemPackages = with pkgs; [ nixfmt git coreutils ];
+    systemPackages = with pkgs; [ nixfmt-classic git coreutils ];
     pathsToLink = [
       "/Applications"
       "/share/zsh"