mirror of
https://github.com/ryan4yin/nix-config.git
synced 2026-04-21 08:21:24 +02:00
fix: nix-darwin with nixos-23.11
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
];
|
||||
|
||||
|
||||
@@ -103,7 +103,7 @@
|
||||
|
||||
#-- CloudNative
|
||||
nodePackages.dockerfile-language-server-nodejs
|
||||
terraform
|
||||
# terraform # install via brew on macOS
|
||||
terraform-ls
|
||||
jsonnet
|
||||
jsonnet-language-server
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 = {
|
||||
|
||||
@@ -1,6 +1,14 @@
|
||||
{pkgs, ...}: {
|
||||
# Linux Only Packages, not available on Darwin
|
||||
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
|
||||
|
||||
# cloud tools that nix do not have cache for.
|
||||
terraform
|
||||
terraformer # generate terraform configs from existing cloud resources
|
||||
|
||||
nmon
|
||||
iotop
|
||||
iftop
|
||||
|
||||
@@ -29,6 +29,7 @@
|
||||
|
||||
# misc
|
||||
flameshot
|
||||
mitmproxy # http/https proxy tool
|
||||
];
|
||||
|
||||
# GitHub CLI tool
|
||||
|
||||
Reference in New Issue
Block a user