From 7491191f8c492104d9bda7fa27aa6b6786aae0a6 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Sat, 19 Aug 2023 14:55:09 -0600 Subject: [PATCH] [NixOS] Handle arm-incompatible inline --- nixos/arm-incompatible.nix | 16 ---------------- nixos/code.nix | 12 ++++++------ nixos/desktop.nix | 14 +++++++++++++- nixos/full.nix | 1 - nixos/laptop.nix | 1 - 5 files changed, 19 insertions(+), 25 deletions(-) delete mode 100644 nixos/arm-incompatible.nix diff --git a/nixos/arm-incompatible.nix b/nixos/arm-incompatible.nix deleted file mode 100644 index 0ad566d0..00000000 --- a/nixos/arm-incompatible.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ pkgs, ... }: -{ - environment.systemPackages = with pkgs; [ - etcher - discord - google-chrome - keybase-gui - pommed_light - slack - spicetify-cli - spotify - tor-browser-bundle-bin - vscode - zoom-us - ]; -} diff --git a/nixos/code.nix b/nixos/code.nix index 7a1a7efb..7504d3b0 100644 --- a/nixos/code.nix +++ b/nixos/code.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ pkgs, config, ... }: { programs.direnv = { enable = true; @@ -39,10 +39,6 @@ # Ruby ruby - # purescript - purescript - spago - # python poetry black @@ -58,5 +54,9 @@ # nix nixd nil - ]; + ] ++ (if config.system.platform.system == "x86_64-linux" then with pkgs; [ + # purescript + purescript + spago + ] else []); } diff --git a/nixos/desktop.nix b/nixos/desktop.nix index 3e1d6bcb..1b279dfe 100644 --- a/nixos/desktop.nix +++ b/nixos/desktop.nix @@ -110,5 +110,17 @@ # Visualization graphviz nodePackages.mermaid-cli - ]; + ] ++ (if config.system.platform.system == "x86_64-linux" then with pkgs; [ + etcher + discord + google-chrome + keybase-gui + pommed_light + slack + spicetify-cli + spotify + tor-browser-bundle-bin + vscode + zoom-us + ] else []); } diff --git a/nixos/full.nix b/nixos/full.nix index edca85c2..4a0ce72a 100644 --- a/nixos/full.nix +++ b/nixos/full.nix @@ -2,7 +2,6 @@ { imports = [ ./android.nix - ./arm-incompatible.nix ./base.nix ./code.nix ./desktop.nix diff --git a/nixos/laptop.nix b/nixos/laptop.nix index 3e10f0d5..64c33fc1 100644 --- a/nixos/laptop.nix +++ b/nixos/laptop.nix @@ -1,7 +1,6 @@ { pkgs, ... }: { imports = [ - ./arm-incompatible.nix ./base.nix ./code.nix ./desktop.nix