🗑️ fix deprecation warnings

Close #12

flake.lock

@@ -157,11 +157,11 @@
     },
     "nixpkgs-22_05": {
       "locked": {
-        "lastModified": 1661009065,
-        "narHash": "sha256-i+Q2ttGp4uOL3j0wEYP3MXLcu/4L/WbChxGQogiNSZo=",
+        "lastModified": 1661656705,
+        "narHash": "sha256-1ujNuL1Tx1dt8dC/kuYS329ZZgiXXmD96axwrqsUY7w=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9a91318fffec81ad009b73fd3b640d2541d87909",
+        "rev": "290dbaacc1f0b783fd8e271b585ec2c8c3b03954",
         "type": "github"
       },
       "original": {
@@ -189,11 +189,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1661336769,
-        "narHash": "sha256-5Sf9tMd1Jdm+lTBGspbQ4kEoYCDKpUhEVAZHRcm6mGU=",
+        "lastModified": 1661353537,
+        "narHash": "sha256-1E2IGPajOsrkR49mM5h55OtYnU0dGyre6gl60NXKITE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "03428dbaaa23d6bf458770907b0927b377c873a8",
+        "rev": "0e304ff0d9db453a4b230e9386418fd974d5804a",
         "type": "github"
       },
       "original": {
@@ -224,11 +224,11 @@
         "nixpkgs-22_05": "nixpkgs-22_05"
       },
       "locked": {
-        "lastModified": 1661054796,
-        "narHash": "sha256-SWiWmENiim8liUNOZ1oxjc5yKb/fNpcyfSRo41bsEy0=",
+        "lastModified": 1661660105,
+        "narHash": "sha256-3ITdkYwsNDh2DRqi7FZOJ92ui92NmcO6Nhj49u+JjWY=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "6068774a8e85fea4b0177efcc90afb3c3b74430b",
+        "rev": "d92fba1bfc9f64e4ccb533701ddd8590c0d8c74a",
         "type": "github"
       },
       "original": {

hosts/epicurus/darwin-configuration.nix

@@ -2,6 +2,8 @@
 {
   imports = [
     ./homebrew.nix
+
+    ../../modules/base/darwin.nix
     ../../modules/builder
   ];
 
@@ -16,7 +18,6 @@
   # Auto upgrade nix package and the daemon service.
   services.nix-daemon.enable = true;
 
-  users.nix.configureBuildUsers = true;
   users.users.walkah = {
     home = "/Users/walkah";
     shell = pkgs.zsh;
@@ -24,17 +25,6 @@
 
   home-manager.users.walkah = import "${dotfiles}/home.nix";
 
-  nix = {
-    package = pkgs.nix;
-
-    trustedUsers = [ "root" "@admin" ];
-
-    extraOptions = ''
-      extra-platforms = x86_64-darwin aarch64-darwin
-      experimental-features = nix-command flakes
-    '';
-  };
-
   nixpkgs.config.packageOverrides = pkgs: {
     haskellPackages = pkgs.haskellPackages.override {
       overrides = self: super: {

hosts/heraclitus/darwin-configuration.nix

@@ -16,7 +16,6 @@
   # Auto upgrade nix package and the daemon service.
   services.nix-daemon.enable = true;
 
-  users.nix.configureBuildUsers = true;
   users.users.walkah = {
     home = "/Users/walkah";
     shell = pkgs.zsh;
@@ -24,17 +23,6 @@
 
   home-manager.users.walkah = import "${dotfiles}/home.nix";
 
-  nix = {
-    package = pkgs.nix;
-
-    trustedUsers = [ "root" "@admin" ];
-
-    extraOptions = ''
-      extra-platforms = x86_64-darwin aarch64-darwin
-      experimental-features = nix-command flakes
-    '';
-  };
-
   services.lorri.enable = true;
 
   programs = {

modules/base/darwin.nix

@@ -1,4 +1,18 @@
 { pkgs, config, ... }: {
+
+  nix = {
+    configureBuildUsers = true;
+
+    extraOptions = ''
+      extra-platforms = x86_64-darwin aarch64-darwin
+      experimental-features = nix-command flakes
+    '';
+
+    settings = {
+      trusted-users = [ "root" "@admin" ];
+    };
+  };
+
   system.activationScripts.applications.text = pkgs.lib.mkForce (
     ''
       rm -rf /Applications/Nix