diff options
| author | Grigory Shipunov | 2022-10-09 13:29:30 +0200 |
|---|---|---|
| committer | Grigory Shipunov | 2022-10-09 13:29:30 +0200 |
| commit | 2ded3b282601f6aaaca12ce685b333407035fe13 (patch) | |
| tree | 6381c3bfc9a158bfa500a104783d69abe30851a8 | |
| parent | 3996f63789147cabec2b8deddab76df93ec3d9a7 (diff) | |
pin nixpkgs in flake registry to system's flake.lock, minor changes
add C tooling to devtools, more history for zsh by default, pcmanfm cause some stuff requires full-blown file manager
| -rw-r--r-- | modules/basic-tools.nix | 13 | ||||
| -rw-r--r-- | modules/devtools.nix | 6 |
2 files changed, 18 insertions, 1 deletions
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" |