From c8cc72b1acdfa248c365108548b61ff2fc3311f7 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Wed, 22 May 2024 09:00:00 +0100 Subject: [PATCH] Add `build-configs` from its derivation It currently uses a local version of `build-configs`. I need to look into how to get it to with Nix and a private GitHub repository. --- flake.lock | 18 ++++++++++++++++++ flake.nix | 5 +++++ lib/shared/home-manager-packages.nix | 2 ++ lib/shared/modules/zsh.nix | 6 ------ 4 files changed, 25 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 37c258a..0075826 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,22 @@ { "nodes": { + "build-configs": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1716365597, + "narHash": "sha256-hVI9QY4tLbXmci1MERp8CEduJ3xfeTT3ZxKnuMCJP3E=", + "path": "/home/opdavies/Code/personal/build-configs", + "type": "path" + }, + "original": { + "path": "/home/opdavies/Code/personal/build-configs", + "type": "path" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -75,6 +92,7 @@ }, "root": { "inputs": { + "build-configs": "build-configs", "home-manager": "home-manager", "nixpkgs": "nixpkgs", "opdavies-nvim": "opdavies-nvim" diff --git a/flake.nix b/flake.nix index 89845cc..e886599 100644 --- a/flake.nix +++ b/flake.nix @@ -8,6 +8,11 @@ opdavies-nvim.inputs.nixpkgs.follows = "nixpkgs"; opdavies-nvim.url = "github:opdavies/opdavies.nvim"; # opdavies-nvim.url = "path:/home/opdavies/Code/personal/opdavies.nvim"; + + build-configs.inputs.nixpkgs.follows = "nixpkgs"; + build-configs.url = "path:/home/opdavies/Code/personal/build-configs"; + # TODO: how to do this with a private GitHub repository? + # build-configs.url = "github:OliverDaviesLtd/build-configs"; }; outputs = { nixpkgs, self, ... }@inputs: diff --git a/lib/shared/home-manager-packages.nix b/lib/shared/home-manager-packages.nix index 8098e27..d8af11d 100644 --- a/lib/shared/home-manager-packages.nix +++ b/lib/shared/home-manager-packages.nix @@ -3,6 +3,8 @@ let php = pkgs.php82; phpPackages = pkgs.php82Packages; in with pkgs; [ + inputs.build-configs.packages.${pkgs.system}.default + awscli2 bitwarden-cli bottom diff --git a/lib/shared/modules/zsh.nix b/lib/shared/modules/zsh.nix index 63ef32b..f101039 100644 --- a/lib/shared/modules/zsh.nix +++ b/lib/shared/modules/zsh.nix @@ -266,12 +266,6 @@ alias rdci="run drush config:import -y" alias rduli="run drush uli" - # Build Configs. - ialias build-configs="nix shell nixpkgs#php82 --command ~/Code/github.com/OliverDaviesLtd/build-configs/main/bin/build-configs app:generate" - ialias build-configs-update-all="~/Code/github.com/OliverDaviesLtd/build-configs-updater/update.sh" - alias bc=build-configs - alias bcu=build-configs-update-all - alias -g A1="| awk '{print \$1}'" alias -g Fj='| jq .' alias -g Fy='| yq .'