From a77155ef671291632ed1b68ee2f1aa41a184eb7f Mon Sep 17 00:00:00 2001
From: Ivan Bushchik <ivabus@ivabus.dev>
Date: Sat, 6 Jan 2024 12:01:49 +0300
Subject: [PATCH] remote-access: add waypipe; roles/devel.nix: disable binfmt +
 enable vscode-fhs

Signed-off-by: Ivan Bushchik <ivabus@ivabus.dev>
---
 common/remote-access.nix |  3 ++-
 roles/devel.nix          | 33 +++++++++++++++++----------------
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/common/remote-access.nix b/common/remote-access.nix
index e8c42e0..abaf513 100644
--- a/common/remote-access.nix
+++ b/common/remote-access.nix
@@ -14,6 +14,7 @@
 
     '';
   };
-  environment.systemPackages = lib.mkIf config.my.roles.graphical.enable [ pkgs.waypipe ];
+  environment.systemPackages =
+    lib.mkIf config.my.roles.graphical.enable [ pkgs.waypipe ];
   programs.ssh.startAgent = true;
 }
diff --git a/roles/devel.nix b/roles/devel.nix
index 554510d..5de796d 100644
--- a/roles/devel.nix
+++ b/roles/devel.nix
@@ -33,27 +33,28 @@ in {
         sshfs
       ];
     }
-    # Architecture-specific packages and configuration
-    (lib.mkIf (!pkgs.stdenv.isAarch64) {
-      boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
-    })
-    (lib.mkIf (!pkgs.stdenv.isAarch32) {
-      boot.binfmt.emulatedSystems = [ "armv6l-linux" ];
-    })
-    (lib.mkIf (!pkgs.stdenv.isx86_64) {
-      boot.binfmt.emulatedSystems = [ "x86_64-linux" "i686-linux" ];
-    })
+    /* # Will be reenabled
+       # Architecture-specific packages and configuration
+       (lib.mkIf (!pkgs.stdenv.isAarch64) {
+         boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
+       })
+       (lib.mkIf (!pkgs.stdenv.isAarch32) {
+         boot.binfmt.emulatedSystems = [ "armv6l-linux" ];
+       })
+       (lib.mkIf (!pkgs.stdenv.isx86_64) {
+         boot.binfmt.emulatedSystems = [ "x86_64-linux" "i686-linux" ];
+       })
+    */
 
     /* # Install CLion only if we are on x86_64
         (lib.mkIf (pkgs.stdenv.isx86_64) {
           environment.systemPackages = with pkgs; [ jetbrains.clion ];
         })
-
-        # Install vscode only if we are on x86_64 or aarch64 or aarch32
-        (lib.mkIf
-          (pkgs.stdenv.isx86_64 || pkgs.stdenv.isAarch64 || pkgs.stdenv.isAarch32) {
-            environment.systemPackages = with pkgs; [ vscode ];
-          })
     */
+    # Install vscode only if we are on x86_64 or aarch64 or aarch32
+    (lib.mkIf
+      (pkgs.stdenv.isx86_64 || pkgs.stdenv.isAarch64 || pkgs.stdenv.isAarch32) {
+        environment.systemPackages = with pkgs; [ vscode-fhs ];
+      })
   ]);
 }