diff --git a/modules/basic-tools.nix b/modules/basic-tools.nix
index 7175e66..fdafb1c 100644
--- a/modules/basic-tools.nix
+++ b/modules/basic-tools.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ lib, config, pkgs, inputs, ... }:
 
 {
   environment.systemPackages = with pkgs; [
@@ -25,6 +25,7 @@
     man-pages
     wlsunset
     screen
+    pcmanfm
   ];
 
   nix = {
@@ -33,6 +34,13 @@
     '';
   };
 
+  # override default nix shell nixpkgs# behaviour to use current flake lock
+  nix.registry =
+    let flakes = lib.filterAttrs (name: value: value ? outputs) inputs.self.inputs;
+    in builtins.mapAttrs (name: v: { flake = v; }) flakes;
+
+  nix.nixPath = lib.mapAttrsToList (name: value: "${name}=${value.outPath}") inputs.self.inputs;
+
 
   programs.tmux = {
     enable = true;
@@ -69,6 +77,9 @@
     syntaxHighlighting.enable = true;
     interactiveShellInit = ''
       bindkey -e
+      export HISTFILE="$HOME/.zsh_history"
+      export HISTSIZE=10000000
+      export SAVEHIST=10000000
     '';
     promptInit = ''
       source ${pkgs.liquidprompt}/share/zsh/plugins/liquidprompt/liquidprompt
diff --git a/modules/devtools.nix b/modules/devtools.nix
index a21df41..e3fe07b 100644
--- a/modules/devtools.nix
+++ b/modules/devtools.nix
@@ -5,6 +5,12 @@
     inputs.emacs-overlay.overlay
   ];
   environment.systemPackages = with pkgs; [
+    # general
+    cmake
+    gcc
+    binutils
+    clang
+    clang-tools
     # rust
     (inputs.fenix.packages."x86_64-linux".stable.withComponents [
       "cargo"