fix: nix-darwin with nixos-23.11

This commit is contained in:
Ryan Yin
2023-11-27 13:42:15 +08:00
parent 0996ec71e9
commit a1f4764526
13 changed files with 57 additions and 58 deletions

View File

@@ -1,12 +1,9 @@
{
pkgs,
pkgs-unstable,
...
}: {
home.packages = with pkgs; [
# general tools
terraform
pkgs-unstable.terraformer # generate terraform configs from existing cloud resources
pulumi
pulumictl
# istioctl

View File

@@ -46,7 +46,6 @@
# other tools
bfg-repo-cleaner # remove large files from git history
k6 # load testing tool
mitmproxy # http/https proxy tool
protobuf # protocol buffer compiler
];

View File

@@ -103,7 +103,7 @@
#-- CloudNative
nodePackages.dockerfile-language-server-nodejs
terraform
# terraform # install via brew on macOS
terraform-ls
jsonnet
jsonnet-language-server

View File

@@ -1,8 +1,5 @@
{
lib,
pkgs,
pkgs-unstable,
catppuccin-wezterm,
...
}:
###########################################################
@@ -15,11 +12,14 @@
{
# wezterm has catppuccin theme built-in,
# it's not necessary to install it separately.
# xdg.configFile."wezterm/colors".source = "${catppuccin-wezterm}/dist";
programs.wezterm = {
enable = true;
package = pkgs-unstable.wezterm;
package = if pkgs.stdenv.isDarwin
then
pkgs.hello # install wezterm via homebrew on macOS to avoid compilation, dummy package here.
else
pkgs.wezterm;
extraConfig =
let

View File

@@ -16,9 +16,6 @@
'';
home.packages = with pkgs; [
# Automatically trims your branches whose tracking remote refs are merged or gone
# It's really useful when you work on a project for a long time.
git-trim
];
programs.git = {