Merge remote-tracking branch 'origin/master'

This commit is contained in:
Ivan Malison 2021-07-11 20:02:22 -06:00
commit e5361e2e0e
No known key found for this signature in database
GPG Key ID: 62530EFBE99DC2F8
3 changed files with 22 additions and 3 deletions

View File

@ -15,4 +15,4 @@ function if_emacs_zsh {
environment_variable_exists INSIDE_EMACS && export PROMPT='$ ' environment_variable_exists INSIDE_EMACS && export PROMPT='$ '
# Enable direnv # Enable direnv
eval "$(direnv hook zsh)" command_exists direnv && eval "$(direnv hook zsh)"

View File

@ -1,6 +1,23 @@
{ pkgs, ... }: { 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; [ environment.systemPackages = with pkgs; [
python-with-my-packages
emacs emacs
firefox firefox
vlc vlc
@ -53,14 +70,15 @@
# Tools # Tools
binutils binutils
# direnv
gitFull gitFull
htop htop
ncdu ncdu
rcm rcm
silver-searcher
ripgrep ripgrep
usbutils silver-searcher
tmux tmux
usbutils
wget wget
yubikey-manager yubikey-manager
]; ];

View File

@ -3,6 +3,7 @@
{ {
imports = [ imports = [
./base.nix ./base.nix
./fonts.nix
]; ];
hardware.raspberry-pi."4".fkms-3d.enable = true; hardware.raspberry-pi."4".fkms-3d.enable = true;