hosts/nixdesk/default.nix

@@ -10,7 +10,6 @@
     [
       ./hardware.nix
       ./profiles/hibernate-boot.nix
-      ./profiles/devshells.nix
       ./profiles/samba-mount.nix
       ./profiles/wireguard.nix
       ./profiles/restic-server.nix
@@ -131,7 +130,6 @@
         "discord-ptb"
         "obsidian"
         "rider"
-        "clion"
         "idea-ultimate"
         "android-studio-stable"
         "krunker"

hosts/nixdesk/home.nix

@@ -121,7 +121,11 @@
     vscodium-fhs
     android-studio
     jetbrains.rider
-    jetbrains.clion
+    (pkgs.buildFHSEnv {
+      name = "silk-fhs";
+      runScript = "bash";
+      targetPkgs = pkgs: with pkgs; [glfw assimp];
+    })
     # jetbrains.idea-ultimate
 
     # communication

hosts/nixdesk/profiles/devshells.nix

@@ -1,44 +0,0 @@
-{
-  pkgs,
-  lib,
-  ...
-}: let
-  shells = {
-    silk-fhs = "with pkgs; [glfw libGL assimp wgpu-native]";
-  };
-in {
-  environment.systemPackages = [
-    (pkgs.writeShellApplication {
-      name = "runsh";
-
-      runtimeInputs = [pkgs.nix];
-
-      text = ''
-        ${lib.concatMapAttrsStringSep "\n" (name: value: ''
-            runshell-${name}() {
-              # shellcheck disable=SC2016
-              nix shell --impure --expr '(import <nixpkgs> {}).buildFHSEnv {
-                name = "devshell";
-                runScript = "$SHELL";
-                targetPkgs = pkgs: ${value};
-              }' --command devshell
-            }
-          '')
-          shells}
-        if [ -z "''${1:-}" ]; then
-          echo "available shells:"
-          ${lib.concatMapAttrsStringSep "\n" (name: _: "echo ${name}") shells}
-          exit
-        fi
-
-        case $1 in
-        ${lib.concatMapAttrsStringSep "\n" (name: _: ''
-            "${name}") runshell-${name} ;;
-          '')
-          shells}
-          *) echo no such shell ;;
-        esac
-      '';
-    })
-  ];
-}

sys/profiles/programs/tools.nix

@@ -14,7 +14,6 @@
     fd # find replacement
     graphviz-nox
     p7zip
-    zip
     unar
     jq
     openssl # for generating passwords