Merge pull request #84 from ryan4yin/refactor-darwin-packages

Refactor: Remove darwin packages

home/base/desktop/cloud/default.nix

@@ -3,8 +3,7 @@
   pkgs,
   ...
 }: {
-  home.packages = with pkgs;
+  home.packages = with pkgs; [
-    [
     # infrastructure as code
     # pulumi
     # pulumictl
@@ -25,13 +24,9 @@
 
     # aliyun
     aliyun-cli
-    ]
-    ++ (
-      lib.optionals pkgs.stdenv.isLinux [
     # cloud tools that nix do not have cache for.
     terraform
     terraformer # generate terraform configs from existing cloud resources
     packer # machine image builder
-      ]
+  ];
-    );
 }

home/base/desktop/dev-tools.nix

@@ -14,8 +14,7 @@
   #
   #############################################################
 
-  home.packages = with pkgs;
+  home.packages = with pkgs; [
-    [
     colmena # nixos's remote deployment tool
 
     # db related
@@ -39,9 +38,7 @@
 
     # solve coding extercises - learn by doing
     exercism
-    ]
+
-    ++ (
-      lib.optionals pkgs.stdenv.isLinux [
     # 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
@@ -55,8 +52,7 @@
     insomnia # REST client
     wireshark # network analyzer
     ventoy # create bootable usb
-      ]
+  ];
-    );
 
   programs = {
     direnv = {

home/base/desktop/editors/packages.nix

@@ -5,8 +5,7 @@
     '';
   };
 
-  home.packages = with pkgs;
+  home.packages = with pkgs; [
-    [
     #-- c/c++
     cmake
     cmake-language-server
@@ -121,17 +120,14 @@
     nodePackages.dockerfile-language-server-nodejs
     # terraform  # install via brew on macOS
     terraform-ls
+    jsonnet
     jsonnet-language-server
     hadolint # Dockerfile linter
-    ]
+
-    ++ (
-      lib.optionals pkgs.stdenv.isLinux [
-        jsonnet
     #-- zig
     zls
     #-- verilog / systemverilog
     verible
     gdb
-      ]
+  ];
-    );
 }

home/base/server/core.nix

@@ -4,8 +4,7 @@
   nur-ryan4yin,
   ...
 }: {
-  home.packages = with pkgs;
+  home.packages = with pkgs; [
-    [
     # Misc
     tldr
     cowsay
@@ -53,9 +52,7 @@
     # productivity
     caddy # A webserver with automatic HTTPS via Let's Encrypt(replacement of nginx)
     croc # File transfer between computers securely and easily
-    ]
     # self-hosted nix cache server
-    ++ lib.optionals (pkgs.system != "x86_64-darwin") [
     attic.packages.${pkgs.system}.attic-client
     ncdu # analyzer your disk usage Interactively, via TUI(replacement of `du`)
   ];

modules/darwin/broken-packages.nix

@@ -0,0 +1,32 @@
+{lib, ...}:
+# ===================================================================
+# Remove packages that are not well supported for the Darwin platform
+# ===================================================================
+let
+  brokenPackages = [
+    "terraform"
+    "terraformer"
+    "packer"
+    "git-trim"
+    "conda"
+    "mitmproxy"
+    "insomnia"
+    "wireshark"
+    "ventoy"
+    "jsonnet"
+    "zls"
+    "verible"
+    "gdb"
+  ];
+in {
+  nixpkgs.overlays = [
+    (_: super: let
+      removeUnwantedPackages = pname:
+        lib.warn "the ${pname} has been removed on the darwin platform"
+        super.emptyDirectory;
+    in
+      lib.genAttrs
+      brokenPackages
+      removeUnwantedPackages)
+  ];
+}