From 3059241c1c8b9c942bb5887d1742be9da5c5e92b Mon Sep 17 00:00:00 2001 From: Noah Masur <7386960+nmasur@users.noreply.github.com> Date: Wed, 19 Apr 2023 16:47:36 -0400 Subject: [PATCH] fix: builtins.storePath issue on mac --- hosts/lookingglass/default.nix | 4 +--- modules/common/default.nix | 1 - modules/common/shell/nixpkgs.nix | 2 +- modules/darwin/system.nix | 7 +++++++ modules/nixos/system/default.nix | 3 +++ 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/hosts/lookingglass/default.nix b/hosts/lookingglass/default.nix index 5c7223a..09b2abd 100644 --- a/hosts/lookingglass/default.nix +++ b/hosts/lookingglass/default.nix @@ -18,6 +18,7 @@ darwin.lib.darwinSystem { }) home-manager.darwinModules.home-manager { + nixpkgs.overlays = [ firefox-darwin.overlay ] ++ overlays; networking.hostName = "lookingglass"; identityFile = "/Users/Noah.Masur/.ssh/id_ed25519"; gui.enable = true; @@ -26,9 +27,6 @@ darwin.lib.darwinSystem { dark = true; }; mail.user = globals.user; - nixpkgs.overlays = [ firefox-darwin.overlay ] ++ overlays; - # Set registry to flake packages, used for nix X commands - nix.registry.nixpkgs.flake = nixpkgs; charm.enable = true; neovim.enable = true; mail.enable = true; diff --git a/modules/common/default.nix b/modules/common/default.nix index 9793826..713b248 100644 --- a/modules/common/default.nix +++ b/modules/common/default.nix @@ -81,7 +81,6 @@ gc = { automatic = true; - dates = "weekly"; options = "--delete-older-than 7d"; }; diff --git a/modules/common/shell/nixpkgs.nix b/modules/common/shell/nixpkgs.nix index ebf3979..cb8262d 100644 --- a/modules/common/shell/nixpkgs.nix +++ b/modules/common/shell/nixpkgs.nix @@ -70,7 +70,7 @@ # Set registry to this flake's packages, used for nix X commands registry.nixpkgs.to = { type = "path"; - path = pkgs.path; + path = builtins.toString pkgs.path; }; }; diff --git a/modules/darwin/system.nix b/modules/darwin/system.nix index 6361485..a1f89b5 100644 --- a/modules/darwin/system.nix +++ b/modules/darwin/system.nix @@ -4,6 +4,13 @@ services.nix-daemon.enable = true; + # This setting only applies to Darwin, different on NixOS + nix.gc.interval = { + Hour = 12; + Minute = 15; + Day = 1; + }; + environment.shells = [ pkgs.fish ]; security.pam.enableSudoTouchIdAuth = true; diff --git a/modules/nixos/system/default.nix b/modules/nixos/system/default.nix index d23505b..982274f 100644 --- a/modules/nixos/system/default.nix +++ b/modules/nixos/system/default.nix @@ -8,6 +8,9 @@ system.stateVersion = config.home-manager.users.${config.user}.home.stateVersion; + # This setting only applies to NixOS, different on Darwin + nix.gc.dates = "weekly"; + }; }