ma tools: enable init-host, rambox

5 files changed, 23 insertions, 5 deletions

diff --git a/2configs/tools/all.nix b/2configs/tools/all.nix
index b6554e040..6844fdfe4 100644
--- a/2configs/tools/all.nix
+++ b/2configs/tools/all.nix
@@ -10,6 +10,7 @@
     ./games.nix
     ./media.nix
     ./mobility.nix
+    ./pcmanfm-extra.nix
     ./scanner-tools.nix
     ./sec.nix
     ./sec-gui.nix
diff --git a/2configs/tools/core-gui.nix b/2configs/tools/core-gui.nix
index 582d941a6..41bfef270 100644
--- a/2configs/tools/core-gui.nix
+++ b/2configs/tools/core-gui.nix
@@ -6,7 +6,7 @@
     chromium
     feh
     clipit
-    firefox
+    # firefox
     keepassx
     pcmanfm
     evince
diff --git a/2configs/tools/dev.nix b/2configs/tools/dev.nix
index fe25bd49a..23da9d577 100644
--- a/2configs/tools/dev.nix
+++ b/2configs/tools/dev.nix
@@ -2,10 +2,15 @@
 
 {
   users.users.makefu.packages = with pkgs;[
-    python3
-    python3Packages.pyserial
+    (python3.withPackages(ps: [
+      ps.python-language-server
+      # the following plugins are optional, they provide type checking, import sorting and code formatting
+      ps.pyls-mypy ps.pyls-isort ps.pyls-black
+      ps.virtualenv
+    ]))
     picocom
-    python3Packages.virtualenv
+    python3.pkgs.pyserial
+    python3.pkgs.virtualenv
     # embedded
     gi
     flashrom
@@ -26,6 +31,6 @@
     nix-review
     # git-related
     tig
-    init-host
+    (pkgs.callPackage ./init-host {})
   ];
 }
diff --git a/2configs/tools/extra-gui.nix b/2configs/tools/extra-gui.nix
index 3d26cc574..dfb4183df 100644
--- a/2configs/tools/extra-gui.nix
+++ b/2configs/tools/extra-gui.nix
@@ -14,5 +14,6 @@
     saleae-logic
     gitAndTools.gitFull
     signal-desktop
+    rambox
   ];
 }
diff --git a/2configs/tools/pcmanfm-extra.nix b/2configs/tools/pcmanfm-extra.nix
new file mode 100644
index 000000000..2d5d20f80
--- /dev/null
+++ b/2configs/tools/pcmanfm-extra.nix
@@ -0,0 +1,11 @@
+{ pkgs, ... }:
+{
+  users.users.makefu.packages = with pkgs; [
+    pcmanfm
+    lxqt.lxqt-policykit
+    shared_mime_info
+    lxmenu-data
+  ];
+  environment.variables.GIO_EXTRA_MODULES = [ "${pkgs.gvfs}/lib/gio/modules" ];
+  services.gnome3.gvfs.enable = true;
+}