From c8e3dcd97341a8cd56ffcbb604055a6171b16ba8 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Sun, 11 Jul 2021 22:55:19 +0000 Subject: [PATCH 1/3] Don't run direnv if it does not exist at shell startup --- dotfiles/lib/zsh.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotfiles/lib/zsh.sh b/dotfiles/lib/zsh.sh index 7921d578..6cacf439 100644 --- a/dotfiles/lib/zsh.sh +++ b/dotfiles/lib/zsh.sh @@ -15,4 +15,4 @@ function if_emacs_zsh { environment_variable_exists INSIDE_EMACS && export PROMPT='$ ' # Enable direnv -eval "$(direnv hook zsh)" +command_exists direnv && eval "$(direnv hook zsh)" From 8f6f2bb525e727ea85788c13bc2e8e883364eb93 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Sun, 11 Jul 2021 22:55:55 +0000 Subject: [PATCH 2/3] [NixOS] Add some essential packages --- nixos/essential.nix | 5 +++-- nixos/raspberry-pi.nix | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/essential.nix b/nixos/essential.nix index 337234d1..5c28864f 100644 --- a/nixos/essential.nix +++ b/nixos/essential.nix @@ -53,12 +53,13 @@ # Tools binutils + direnv gitFull rcm - silver-searcher ripgrep - usbutils + silver-searcher tmux + usbutils wget yubikey-manager ]; diff --git a/nixos/raspberry-pi.nix b/nixos/raspberry-pi.nix index bd1cbaeb..387e8e31 100644 --- a/nixos/raspberry-pi.nix +++ b/nixos/raspberry-pi.nix @@ -3,6 +3,7 @@ { imports = [ ./base.nix + ./fonts.nix ]; hardware.raspberry-pi."4".fkms-3d.enable = true; From 81b915506f1fe4bbe2050d144e18796dc5354c7c Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Mon, 12 Jul 2021 01:10:07 +0000 Subject: [PATCH 3/3] [NixOS] Add python to essential --- nixos/essential.nix | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/nixos/essential.nix b/nixos/essential.nix index 5c28864f..e6c96a79 100644 --- a/nixos/essential.nix +++ b/nixos/essential.nix @@ -1,6 +1,23 @@ { pkgs, ... }: +let + my-python-packages = python-packages: with python-packages; [ + appdirs + ipdb + ipython + numpy + openpyxl + pip + requests + tox + virtualenv + virtualenvwrapper + ]; + python-with-my-packages = pkgs.python3.withPackages my-python-packages; +in { environment.systemPackages = with pkgs; [ + python-with-my-packages + emacs firefox vlc @@ -53,7 +70,7 @@ # Tools binutils - direnv + # direnv gitFull rcm ripgrep