Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
e5361e2e0e
@ -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)"
|
||||
|
@ -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,14 +70,15 @@
|
||||
|
||||
# Tools
|
||||
binutils
|
||||
# direnv
|
||||
gitFull
|
||||
htop
|
||||
ncdu
|
||||
rcm
|
||||
silver-searcher
|
||||
ripgrep
|
||||
usbutils
|
||||
silver-searcher
|
||||
tmux
|
||||
usbutils
|
||||
wget
|
||||
yubikey-manager
|
||||
];
|
||||
|
@ -3,6 +3,7 @@
|
||||
{
|
||||
imports = [
|
||||
./base.nix
|
||||
./fonts.nix
|
||||
];
|
||||
|
||||
hardware.raspberry-pi."4".fkms-3d.enable = true;
|
||||
|
Loading…
Reference in New Issue
Block a user