From 17880ab25c7075b2830e2dc053996efe09587a92 Mon Sep 17 00:00:00 2001 From: servostar Date: Sat, 18 Nov 2023 11:39:28 +0100 Subject: [PATCH] added dev component moved language-server, dotnet to dev --- configuration.nix | 3 ++- core/dotnet.nix | 1 - dev/default.nix | 7 +++++++ dev/dotnet.nix | 5 +++++ {extra => dev}/language-server.nix | 0 {extra => dev}/platformio.nix | 0 extra/default.nix | 2 -- 7 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 dev/default.nix create mode 100644 dev/dotnet.nix rename {extra => dev}/language-server.nix (100%) rename {extra => dev}/platformio.nix (100%) diff --git a/configuration.nix b/configuration.nix index 24c9817..8246cb3 100644 --- a/configuration.nix +++ b/configuration.nix @@ -20,7 +20,8 @@ in ./.luks-swap.nix ./fonts.nix ./extra - ./core/ + ./core + ./dev ]; hardware.bluetooth.enable = true; diff --git a/core/dotnet.nix b/core/dotnet.nix index 50b2cc0..3667676 100644 --- a/core/dotnet.nix +++ b/core/dotnet.nix @@ -1,6 +1,5 @@ { pkgs, config, ... }: { environment.systemPackages = with pkgs; [ - dotnet-sdk mono ]; } diff --git a/dev/default.nix b/dev/default.nix new file mode 100644 index 0000000..dca0e6f --- /dev/null +++ b/dev/default.nix @@ -0,0 +1,7 @@ +{ + imports = [ + ./language-server.nix + ./dotnet.nix + ./platformio.nix + ]; +} diff --git a/dev/dotnet.nix b/dev/dotnet.nix new file mode 100644 index 0000000..412a325 --- /dev/null +++ b/dev/dotnet.nix @@ -0,0 +1,5 @@ +{ pkgs, config, ... }: { + environment.systemPackages = with pkgs; [ + dotnet-sdk + ]; +} diff --git a/extra/language-server.nix b/dev/language-server.nix similarity index 100% rename from extra/language-server.nix rename to dev/language-server.nix diff --git a/extra/platformio.nix b/dev/platformio.nix similarity index 100% rename from extra/platformio.nix rename to dev/platformio.nix diff --git a/extra/default.nix b/extra/default.nix index 1da134f..2697f2e 100644 --- a/extra/default.nix +++ b/extra/default.nix @@ -3,8 +3,6 @@ ./bluray.nix ./dvd.nix ./yubikey.nix - ./platformio.nix ./wireguard.nix - ./language-server.nix ]; }