From 59e1b6f35012c69c0bc1e38a724e9cf5e9ad6f80 Mon Sep 17 00:00:00 2001
From: Antoine Viallon <antoine@lesviallon.fr>
Date: Thu, 18 May 2023 00:34:58 +0200
Subject: [PATCH] [Desktop/Developer] developer-specific packages in the
 relevant section Re-enable adfs-rootless Remove system-wide clion install

---
 desktop/developer.nix | 13 +++++++++++--
 packages.nix          | 25 +++++++------------------
 2 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/desktop/developer.nix b/desktop/developer.nix
index 1e18779..5b5ca15 100644
--- a/desktop/developer.nix
+++ b/desktop/developer.nix
@@ -2,6 +2,7 @@
 with lib;
 let
   cfg = config.aviallon.developer;
+  generalCfg = config.aviallon.general;
 in {
   options.aviallon.developer = {
     enable = mkEnableOption "enable developer mode on this machine";
@@ -30,13 +31,21 @@ in {
       vulkan-tools
       gh # GitHub CLI
 
+      clinfo
+      binutils
+      cpuset
+      gptfdisk # gdisk
+    
+      gcc
+      gnumake
+      cmake
+
       linux-manual man-pages man-pages-posix
       
       linuxHeaders
 
       libsForQt5.kdevelop
-      jetbrains.clion
-      # adbfs-rootless
+      unstable.adbfs-rootless
 
       amdctl
     ];
diff --git a/packages.nix b/packages.nix
index e5fde7f..f955a2c 100644
--- a/packages.nix
+++ b/packages.nix
@@ -4,7 +4,9 @@ let
   cfg = config.aviallon.programs;
   desktopCfg = config.aviallon.desktop;
   generalCfg = config.aviallon.general;
+  optimizeCfg = config.aviallon.optimizations;
 
+  myOpenssh = if optimizeCfg.enable then (optimizeCfg.optimizePkg {} pkgs.openssh) else pkgs.openssh;
 in
 {
   imports = [
@@ -35,12 +37,12 @@ in
 
     nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) cfg.allowUnfreeList;
 
-    environment.systemPackages = with pkgs; with libsForQt5; []
+    environment.systemPackages = with pkgs; []
     ++ [
       vim
       wget
       nano
-      openssh
+      myOpenssh
       psmisc
       pciutils
       ripgrep
@@ -59,21 +61,9 @@ in
       pv
       xxHash
       unzip
-    ]
-    ++ (optionals config.aviallon.developer.enable [
-      schedtool
-      clinfo
-      binutils
-      cpuset
-      gptfdisk # gdisk
-    
-      gcc
-      gnumake
-      cmake
-    ])
-    ;
+    ];
 
-    programs.ssh.package = pkgs.opensshOptimized;
+    programs.ssh.package = myOpenssh;
 
     programs.tmux = {
       enable = true;
@@ -82,8 +72,7 @@ in
       newSession = true;
     };
 
-    aviallon.programs.allowUnfreeList = [
-    ];
+    aviallon.programs.allowUnfreeList = [];
 
     programs.ccache.enable = true;