diff --git a/hosts/nixdesk/default.nix b/hosts/nixdesk/default.nix index d0cd579..7fc15cd 100644 --- a/hosts/nixdesk/default.nix +++ b/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" diff --git a/hosts/nixdesk/home.nix b/hosts/nixdesk/home.nix index 1e0737a..101795b 100644 --- a/hosts/nixdesk/home.nix +++ b/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 diff --git a/hosts/nixdesk/profiles/devshells.nix b/hosts/nixdesk/profiles/devshells.nix deleted file mode 100644 index d174caf..0000000 --- a/hosts/nixdesk/profiles/devshells.nix +++ /dev/null @@ -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 {}).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 - ''; - }) - ]; -} diff --git a/sys/profiles/programs/tools.nix b/sys/profiles/programs/tools.nix index 22b32b3..127fc34 100644 --- a/sys/profiles/programs/tools.nix +++ b/sys/profiles/programs/tools.nix @@ -14,7 +14,6 @@ fd # find replacement graphviz-nox p7zip - zip unar jq openssl # for generating passwords