From ba1ccc492d1f490a645f7245b5552eb5fc04d6cf Mon Sep 17 00:00:00 2001 From: Arnie Date: Sun, 5 Jan 2025 09:36:27 +0100 Subject: [PATCH] Update mac config --- devices/lcech-mac-veracode.nix | 11 ++++++++--- flake.nix | 21 +++++++++++++++++---- 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/devices/lcech-mac-veracode.nix b/devices/lcech-mac-veracode.nix index aace18b..849eda4 100644 --- a/devices/lcech-mac-veracode.nix +++ b/devices/lcech-mac-veracode.nix @@ -10,9 +10,6 @@ let zshSourceCommon = ../.zsh/common; in { - nixGL.packages = pkgs.nixgl; - nixGL.defaultWrapper = "nvidia"; - # Let Home Manager install and manage itself. programs.home-manager.enable = true; @@ -34,6 +31,13 @@ in nix-direnv.enable = true; }; + programs.ghostty = { + enable = true; + + installVimSyntax = true; + enableZshIntegration = true; + }; + programs.git = { enable = true; userName = "Lukas Cech"; @@ -63,6 +67,7 @@ in dirHashes = { mac = "${homedir}/.macshare"; + nix = "${homedir}/.config/nix"; }; initExtra = '' diff --git a/flake.nix b/flake.nix index be4fcd7..2332837 100644 --- a/flake.nix +++ b/flake.nix @@ -60,9 +60,6 @@ # The platform the configuration will be used on. nixpkgs.hostPlatform = "aarch64-darwin"; - # Necessary for using flakes on this system. - nix.settings.experimental-features = "nix-command flakes"; - # Set Git commit hash for darwin-version. system.configurationRevision = self.rev or self.dirtyRev or null; @@ -80,6 +77,22 @@ ShowStatusBar = true; # show status bar }; }; + + # Auto upgrade nix package and the daemon service. + services.nix-daemon.enable = true; + + nix = { + configureBuildUsers = true; + distributedBuilds = true; + + gc = { + automatic = true; + options = "--delete-older-than 7d"; + }; + settings = { + experimental-features = "nix-command flakes"; + }; + }; }; in { @@ -113,7 +126,7 @@ # nix run nix-darwin -- switch --flake ~/.config/nix # update with # darwin-rebuild switch --flake ~/.config/nix - lcech-mac-veracode = nix-darwin.lib.darwinSystem { + lcech-mac-veracode.system = nix-darwin.lib.darwinSystem { system = "aarch64-darwin"; modules = [ darwin-common