From b6fb0d61122662a5564c876ebdc2942fdf734c16 Mon Sep 17 00:00:00 2001
From: Rory& <root@rory.gay>
Date: Sun, 12 Oct 2025 20:53:13 +0200
Subject: Desktop changes

---
 modules/software-templates/devenv/c-cpp.nix      | 12 +++++++++++
 modules/software-templates/devenv/dotnet.nix     | 27 ++++++++++++++++++++++++
 modules/software-templates/devenv/java.nix       | 13 ++++++++++++
 modules/software-templates/devenv/javascript.nix | 11 ++++++++++
 modules/software-templates/dotnet.client.nix     | 26 -----------------------
 modules/software-templates/eid-mw.nix            | 11 ++++++++++
 modules/software-templates/profilers.nix         |  2 +-
 7 files changed, 75 insertions(+), 27 deletions(-)
 create mode 100644 modules/software-templates/devenv/c-cpp.nix
 create mode 100644 modules/software-templates/devenv/dotnet.nix
 create mode 100644 modules/software-templates/devenv/java.nix
 create mode 100644 modules/software-templates/devenv/javascript.nix
 delete mode 100644 modules/software-templates/dotnet.client.nix
 create mode 100644 modules/software-templates/eid-mw.nix

(limited to 'modules')

diff --git a/modules/software-templates/devenv/c-cpp.nix b/modules/software-templates/devenv/c-cpp.nix
new file mode 100644
index 0000000..d07191b
--- /dev/null
+++ b/modules/software-templates/devenv/c-cpp.nix
@@ -0,0 +1,12 @@
+{ pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    (jetbrains.plugins.addPlugins jetbrains.clion [
+      jetbrains.plugins.github-copilot-fixed
+      #"github-copilot"
+      "nixidea"
+      "visual-studio-keymap"
+    ]) # "string-manipulation"
+  ];
+}
\ No newline at end of file
diff --git a/modules/software-templates/devenv/dotnet.nix b/modules/software-templates/devenv/dotnet.nix
new file mode 100644
index 0000000..bb052d8
--- /dev/null
+++ b/modules/software-templates/devenv/dotnet.nix
@@ -0,0 +1,27 @@
+{
+  config,
+  pkgs,
+  nixpkgs-stable,
+  ...
+}:
+
+let
+  # We have to specify config to set allowUnfree, as nixpkgs-stable.legacyPackages doesn't pass through config.
+  # See: https://slab.midna.dev/public/posts/where-does-pkgs-come-from-xw6epo0t
+  stablePkgs = import nixpkgs-stable {
+    config = config.nixpkgs.config;
+    system = pkgs.stdenv.hostPlatform.system;
+  };
+in
+{
+  #imports = [ ./dotnet.nix ];
+  environment.systemPackages = with pkgs; [
+    #`jetbrains.rider
+    (jetbrains.plugins.addPlugins jetbrains.rider [
+      jetbrains.plugins.github-copilot-fixed
+      #"github-copilot"
+      "nixidea"
+    ])
+    dotnetCorePackages.sdk_9_0
+  ];
+}
diff --git a/modules/software-templates/devenv/java.nix b/modules/software-templates/devenv/java.nix
new file mode 100644
index 0000000..48613e1
--- /dev/null
+++ b/modules/software-templates/devenv/java.nix
@@ -0,0 +1,13 @@
+{ pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    (jetbrains.plugins.addPlugins jetbrains.idea-ultimate [
+      jetbrains.plugins.github-copilot-fixed
+      #"github-copilot"
+      "nixidea"
+      "visual-studio-keymap"
+    ]) # "string-manipulation"
+    openjdk17
+  ];
+}
\ No newline at end of file
diff --git a/modules/software-templates/devenv/javascript.nix b/modules/software-templates/devenv/javascript.nix
new file mode 100644
index 0000000..1d272fb
--- /dev/null
+++ b/modules/software-templates/devenv/javascript.nix
@@ -0,0 +1,11 @@
+{ pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    (jetbrains.plugins.addPlugins jetbrains.webstorm [
+      jetbrains.plugins.github-copilot-fixed
+      #"github-copilot"
+    ])
+    nodejs
+  ];
+}
\ No newline at end of file
diff --git a/modules/software-templates/dotnet.client.nix b/modules/software-templates/dotnet.client.nix
deleted file mode 100644
index f855aa3..0000000
--- a/modules/software-templates/dotnet.client.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  config,
-  pkgs,
-  nixpkgs-stable,
-  ...
-}:
-
-let
-  # We have to specify config to set allowUnfree, as nixpkgs-stable.legacyPackages doesn't pass through config.
-  # See: https://slab.midna.dev/public/posts/where-does-pkgs-come-from-xw6epo0t
-  stablePkgs = import nixpkgs-stable {
-    config = config.nixpkgs.config;
-    system = pkgs.stdenv.hostPlatform.system;
-  };
-in
-{
-  #imports = [ ./dotnet.nix ];
-  environment.systemPackages = with pkgs; [
-    #`jetbrains.rider
-    (jetbrains.plugins.addPlugins jetbrains.rider [
-      jetbrains.plugins.github-copilot-fixed
-      #"github-copilot"
-      "nixidea"
-    ])
-  ];
-}
diff --git a/modules/software-templates/eid-mw.nix b/modules/software-templates/eid-mw.nix
new file mode 100644
index 0000000..b74d060
--- /dev/null
+++ b/modules/software-templates/eid-mw.nix
@@ -0,0 +1,11 @@
+{ pkgs, ... }: {
+  services.pcscd.enable = true;
+  environment.systemPackages = with pkgs; [
+    p11-kit
+    opensc
+    eid-mw
+  ];
+  environment.etc."pkcs11/modules/opensc-pkcs11".text = ''
+    module: ${pkgs.opensc}/lib/opensc-pkcs11.so
+  '';
+}
\ No newline at end of file
diff --git a/modules/software-templates/profilers.nix b/modules/software-templates/profilers.nix
index c90f81e..8c67b4f 100644
--- a/modules/software-templates/profilers.nix
+++ b/modules/software-templates/profilers.nix
@@ -3,7 +3,7 @@
 {
   environment.systemPackages = with pkgs; [
     kdePackages.kcachegrind
-    config.boot.kernelPackages.perf
+    perf
     hotspot
     valgrind
   ];
-- 
cgit 1.5.1