diff options
| -rw-r--r-- | flake.lock | 126 | ||||
| -rw-r--r-- | flake.nix | 8 | ||||
| -rw-r--r-- | hosts/darwin/configuration.nix | 3 |
3 files changed, 125 insertions, 12 deletions
@@ -1,6 +1,38 @@ { "nodes": { + "cl-nix-lite": { + "locked": { + "lastModified": 1728174978, + "narHash": "sha256-Grqqg+xuicANB85j0gNEXxi9SBKY7bzGeTuyi95eGcY=", + "owner": "hraban", + "repo": "cl-nix-lite", + "rev": "31cfe6275c341eb3120a99f4b1c8516c49a29d87", + "type": "github" + }, + "original": { + "owner": "hraban", + "repo": "cl-nix-lite", + "type": "github" + } + }, "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1730663653, + "narHash": "sha256-kFCUWettiFHDIqxCWWQ9qY8pVh+Lj+XL0Giyy/kdomg=", + "owner": "hraban", + "repo": "flake-compat", + "rev": "e5b16676185cb7548581c852f51ce7f3a49bba5e", + "type": "github" + }, + "original": { + "owner": "hraban", + "ref": "fixed-output", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { "locked": { "lastModified": 1733328505, "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", @@ -14,6 +46,26 @@ "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" } }, + "flake-utils": { + "inputs": { + "systems": [ + "mac-app-util", + "systems" + ] + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "id": "flake-utils", + "type": "indirect" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -35,6 +87,28 @@ "type": "github" } }, + "mac-app-util": { + "inputs": { + "cl-nix-lite": "cl-nix-lite", + "flake-compat": "flake-compat", + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs", + "systems": "systems" + }, + "locked": { + "lastModified": 1742156590, + "narHash": "sha256-aTM/2CrNN5utdVEQGsOA+kl4UozgH7VPLBQL5OXtBrg=", + "owner": "hraban", + "repo": "mac-app-util", + "rev": "341ede93f290df7957047682482c298e47291b4d", + "type": "github" + }, + "original": { + "owner": "hraban", + "repo": "mac-app-util", + "type": "github" + } + }, "nix-darwin": { "inputs": { "nixpkgs": [ @@ -58,9 +132,9 @@ }, "nixcord": { "inputs": { - "flake-compat": "flake-compat", - "nixpkgs": "nixpkgs", - "systems": "systems", + "flake-compat": "flake-compat_2", + "nixpkgs": "nixpkgs_2", + "systems": "systems_2", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -79,17 +153,17 @@ }, "nixpkgs": { "locked": { - "lastModified": 1744868846, - "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=", + "lastModified": 1732617236, + "narHash": "sha256-PYkz6U0bSEaEB1al7O1XsqVNeSNS+s3NVclJw7YC43w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c", + "rev": "af51545ec9a44eadf3fe3547610a5cdd882bc34e", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", "repo": "nixpkgs", + "rev": "af51545ec9a44eadf3fe3547610a5cdd882bc34e", "type": "github" } }, @@ -111,6 +185,22 @@ }, "nixpkgs_2": { "locked": { + "lastModified": 1744868846, + "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { "lastModified": 1746183838, "narHash": "sha256-kwaaguGkAqTZ1oK0yXeQ3ayYjs8u/W7eEfrFpFfIDFA=", "owner": "nixos", @@ -128,9 +218,10 @@ "root": { "inputs": { "home-manager": "home-manager", + "mac-app-util": "mac-app-util", "nix-darwin": "nix-darwin", "nixcord": "nixcord", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "nixpkgs-darwin": "nixpkgs-darwin", "spicetify-nix": "spicetify-nix" } @@ -140,7 +231,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1746287507, @@ -158,6 +249,21 @@ }, "systems": { "locked": { + "lastModified": 1689347925, + "narHash": "sha256-ozenz5bFe1UUqOn7f60HRmgc01BgTGIKZ4Xl+HbocGQ=", + "owner": "nix-systems", + "repo": "default-darwin", + "rev": "2235d7e6cc29ae99878133c95e9fe5e157661ffb", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-darwin", + "type": "github" + } + }, + "systems_2": { + "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", @@ -170,7 +276,7 @@ "type": "indirect" } }, - "systems_2": { + "systems_3": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -15,6 +15,8 @@ spicetify-nix.inputs.nixpkgs.follows = "nixpkgs"; nixcord.url = "github:kaylorben/nixcord"; + + mac-app-util.url = "github:hraban/mac-app-util"; }; outputs = { nixpkgs, nix-darwin, home-manager, ... } @ inputs: let @@ -52,11 +54,17 @@ modules = [ ./hosts/darwin/configuration.nix + inputs.mac-app-util.darwinModules.default + home-manager.darwinModules.home-manager { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; home-manager.extraSpecialArgs = { inherit inputs; }; home-manager.users.${username} = import ./hosts/darwin/home.nix; + + home-manager.sharedModules = [ + inputs.mac-app-util.homeManagerModules.default + ]; } ]; }; diff --git a/hosts/darwin/configuration.nix b/hosts/darwin/configuration.nix index 86dee3c..573bacd 100644 --- a/hosts/darwin/configuration.nix +++ b/hosts/darwin/configuration.nix @@ -6,7 +6,6 @@ nixpkgs.hostPlatform = "aarch64-darwin"; nixpkgs.config.allowUnfree = true; - users.users.schererleander = { home = "/Users/schererleander"; shell = pkgs.zsh; @@ -28,4 +27,4 @@ }; system.stateVersion = 5; -} +}
\ No newline at end of file |