From 4099a560e0910be3cf75addbfc526d669e210991 Mon Sep 17 00:00:00 2001 From: reo101 Date: Mon, 23 Oct 2023 09:01:07 +0300 Subject: [PATCH] chore(limonka): various updates Add `nixpkgs-cross-overlay` to substituters Add `google-cloud-sdk` to `home.packages` Remove comment (from old experiments) from `reo101-shell` HM module Remove `pinentry-touchid` from `brew` packages (causing issues, no longer used) --- machines/nix-darwin/aarch64-darwin/limonka/configuration.nix | 2 ++ .../nix-darwin/aarch64-darwin/limonka/home/pavelatanasov.nix | 3 +++ modules/home-manager/reo101-shell/default.nix | 2 +- modules/nix-darwin/brew/default.nix | 1 - 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/machines/nix-darwin/aarch64-darwin/limonka/configuration.nix b/machines/nix-darwin/aarch64-darwin/limonka/configuration.nix index fc88b10..168fd91 100644 --- a/machines/nix-darwin/aarch64-darwin/limonka/configuration.nix +++ b/machines/nix-darwin/aarch64-darwin/limonka/configuration.nix @@ -54,11 +54,13 @@ "https://rix101.cachix.org" "https://nix-community.cachix.org" "https://lean4.cachix.org" + "https://nixpkgs-cross-overlay.cachix.org" ]; trusted-public-keys = [ "rix101.cachix.org-1:2u9ZGi93zY3hJXQyoHkNBZpJK+GiXQyYf9J5TLzCpFY=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "lean4.cachix.org-1:mawtxSxcaiWE24xCXXgh3qnvlTkyU7evRRnGeAhD4Wk=" + "nixpkgs-cross-overlay.cachix.org-1:TjKExGN4ys960TlsGqNOI/NBdoz2Jdr2ow1VybWV5JM=" ]; }; }; diff --git a/machines/nix-darwin/aarch64-darwin/limonka/home/pavelatanasov.nix b/machines/nix-darwin/aarch64-darwin/limonka/home/pavelatanasov.nix index dd18181..24cd414 100644 --- a/machines/nix-darwin/aarch64-darwin/limonka/home/pavelatanasov.nix +++ b/machines/nix-darwin/aarch64-darwin/limonka/home/pavelatanasov.nix @@ -119,6 +119,9 @@ pass-otp ])) + # GCP + google-cloud-sdk + # FMI vim-fmi-cli diff --git a/modules/home-manager/reo101-shell/default.nix b/modules/home-manager/reo101-shell/default.nix index da0d0a5..36e6437 100644 --- a/modules/home-manager/reo101-shell/default.nix +++ b/modules/home-manager/reo101-shell/default.nix @@ -171,7 +171,7 @@ in }; # Nushell - programs.nushell/* -reo101 */ = mkMerge [ + programs.nushell = mkMerge [ (mkIf (builtins.elem "nushell" cfg.shells) { enable = true; diff --git a/modules/nix-darwin/brew/default.nix b/modules/nix-darwin/brew/default.nix index 69deff3..879911b 100644 --- a/modules/nix-darwin/brew/default.nix +++ b/modules/nix-darwin/brew/default.nix @@ -49,7 +49,6 @@ in "libusb" "openssl" "switchaudio-osx" - "pinentry-touchid" ]; casks = [ "android-platform-tools"