changes

darwin-modules/nix.nix

@@ -4,7 +4,7 @@
   nixpkgs.config.allowUnfree = true;
 
   nix = {
-    package = pkgs.nixVersions.nix_2_23;
+    # package = pkgs.nixVersions.nix_2_23;
     extraOptions = ''
       extra-experimental-features = nix-command flakes
       use-case-hack = false
@@ -20,6 +20,8 @@
         "esselius.cachix.org-1:h6FQzpdflxdZfnnL0caV88xt5K5sNzgO0VIHQthTymA="
         "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
       ];
+      plugin-files = "${pkgs.nix-plugins}/lib/nix/plugins";
+      extra-builtins-file = "${../extra-builtins.nix}";
     };
 
     optimise = {

extra-builtins.nix

@@ -0,0 +1,11 @@
+{ exec, ... }:
+
+let
+  bashScript = script: [ "bash" "-c" script ];
+  run = command: bashScript ''
+    echo '"'$(${command})'"'
+  '';
+in
+{
+  gcloudToken = exec (run "gcloud auth print-access-token");
+}

flake.nix

@@ -9,6 +9,8 @@
     nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
     nixpkgs-darwin.url = "github:NixOS/nixpkgs/nixpkgs-24.05-darwin";
 
+    cfg-work.url = "github:esselius/cfg-work";
+
     raspberry-pi-nix.url = "github:tstat/raspberry-pi-nix/v0.4.0";
     raspberry-pi-nix.inputs.nixpkgs.follows = "nixpkgs";
     authentik-nix.url = "github:nix-community/authentik-nix/version/2024.6.1";

home-configurations/peteresselius.nix

@@ -1,4 +1,4 @@
-{ pkgs, ezModules, config, lib, ... }:
+{ inputs, pkgs, ezModules, config, lib, ... }:
 
 let
   inherit (lib) mkMerge mkIf;
@@ -9,6 +9,7 @@ in
     ezModules.git
     ezModules.ssh
     ezModules.profiles
+    inputs.cfg-work.homeModules.sbt
   ];
 
   config = mkMerge [

home-modules/git.nix

@@ -47,7 +47,8 @@
       ghq = {
         root = "~/src";
       };
-      url."[email protected]:".insteadOf = "https://github.com";
+      url."[email protected]:pagero".insteadOf = "https://github.com/pagero";
+      url."[email protected]:esselius".insteadOf = "https://github.com/esselius";
     };
   };