diff --git a/devices/macbook/configuration.nix b/devices/macbook/configuration.nix index 4620734..b43994b 100644 --- a/devices/macbook/configuration.nix +++ b/devices/macbook/configuration.nix @@ -63,9 +63,6 @@ ]; }; - # Auto upgrade nix package and the daemon service. - services.nix-daemon.enable = true; - # nix.package = pkgs.nix; # Necessary for using flakes on this system. nix.settings.experimental-features = "nix-command flakes"; diff --git a/flake.lock b/flake.lock index bd0a4fc..f907450 100644 --- a/flake.lock +++ b/flake.lock @@ -204,9 +204,7 @@ }, "nix-darwin": { "inputs": { - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1742373336, @@ -246,16 +244,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1730785428, - "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", - "owner": "nixos", + "lastModified": 1742272065, + "narHash": "sha256-ud8vcSzJsZ/CK+r8/v0lyf4yUntVmDq6Z0A41ODfWbE=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", + "rev": "3549532663732bfd89993204d40543e9edaec4f2", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-unstable", + "owner": "NixOS", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -289,6 +287,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1730785428, + "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1730200266, "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", @@ -304,7 +318,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1730200266, "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", @@ -320,7 +334,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1730272153, "narHash": "sha256-B5WRZYsRlJgwVHIV6DvidFN7VX7Fg9uuwkRW9Ha8z+w=", @@ -339,7 +353,7 @@ "nixvim": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "nixvim": "nixvim_2" }, "locked": { @@ -364,7 +378,7 @@ "git-hooks": "git-hooks", "home-manager": "home-manager", "nix-darwin": "nix-darwin_2", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nuschtosSearch": "nuschtosSearch", "treefmt-nix": "treefmt-nix" }, @@ -409,14 +423,14 @@ "root": { "inputs": { "nix-darwin": "nix-darwin", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nixvim": "nixvim", "sops-nix": "sops-nix" } }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { diff --git a/flake.nix b/flake.nix index 0ae32cf..096dd3f 100644 --- a/flake.nix +++ b/flake.nix @@ -4,12 +4,16 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nix-darwin.url = "github:LnL7/nix-darwin"; - nix-darwin.inputs.nixpkgs.follows = "nixpkgs"; - nixvim.url = "github:Polensky/nixvim"; - sops-nix.url = "github:Mic92/sops-nix"; + nixvim.url = "github:Polensky/nixvim"; + sops-nix.url = "github:Mic92/sops-nix"; }; - outputs = {nixpkgs, nix-darwin, sops-nix ,...} @ inputs: { + outputs = { + nixpkgs, + nix-darwin, + sops-nix, + ... + } @ inputs: { nixosConfigurations = { default = nixpkgs.lib.nixosSystem { specialArgs = {inherit inputs;}; @@ -33,23 +37,25 @@ modules = [ "${nixpkgs}/nixos/modules/installer/sd-card/sd-image-aarch64-installer.nix" ./devices/pi/configuration.nix - sops-nix.nixosModules.sops + sops-nix.nixosModules.sops { sdImage.compressImage = false; - nixpkgs.overlays = [ + nixpkgs.overlays = [ (final: super: { makeModulesClosure = x: - super.makeModulesClosure (x // { allowMissing = true; }); + super.makeModulesClosure (x // {allowMissing = true;}); }) ]; } ]; }; - darwinConfigurations."Charless-MacBook-Pro" = nix-darwin.lib.darwinSystem { - modules = [ ./devices/macbook/configuration.nix ]; - specialArgs = { inherit inputs; }; - }; + }; + darwinConfigurations = { + "Charless-MacBook-Pro" = nix-darwin.lib.darwinSystem { + modules = [./devices/macbook/configuration.nix]; + specialArgs = {inherit inputs;}; + system = "x86_64-darwin"; + }; }; }; } -