[NixOS] Handle arm-incompatible inline

This commit is contained in:
Ivan Malison 2023-08-19 14:55:09 -06:00
parent 654137f653
commit 7491191f8c
5 changed files with 19 additions and 25 deletions

View File

@ -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
];
}

View File

@ -1,4 +1,4 @@
{ pkgs, ... }: { pkgs, config, ... }:
{ {
programs.direnv = { programs.direnv = {
enable = true; enable = true;
@ -39,10 +39,6 @@
# Ruby # Ruby
ruby ruby
# purescript
purescript
spago
# python # python
poetry poetry
black black
@ -58,5 +54,9 @@
# nix # nix
nixd nixd
nil nil
]; ] ++ (if config.system.platform.system == "x86_64-linux" then with pkgs; [
# purescript
purescript
spago
] else []);
} }

View File

@ -110,5 +110,17 @@
# Visualization # Visualization
graphviz graphviz
nodePackages.mermaid-cli 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 []);
} }

View File

@ -2,7 +2,6 @@
{ {
imports = [ imports = [
./android.nix ./android.nix
./arm-incompatible.nix
./base.nix ./base.nix
./code.nix ./code.nix
./desktop.nix ./desktop.nix

View File

@ -1,7 +1,6 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
imports = [ imports = [
./arm-incompatible.nix
./base.nix ./base.nix
./code.nix ./code.nix
./desktop.nix ./desktop.nix