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)" diff --git a/nixos/essential.nix b/nixos/essential.nix index 9c6aaf54..41d2dbe9 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,14 +70,15 @@ # Tools binutils + # direnv gitFull htop ncdu rcm - silver-searcher ripgrep - usbutils + silver-searcher tmux + usbutils wget yubikey-manager ]; diff --git a/nixos/machines/ryzen-shine.nix b/nixos/machines/ryzen-shine.nix index 762166e2..907d1632 100644 --- a/nixos/machines/ryzen-shine.nix +++ b/nixos/machines/ryzen-shine.nix @@ -7,9 +7,10 @@ imports = [ ../full.nix ../dfinity.nix - ../jellyfin.nix ]; + hardware.enableRedistributableFirmware = true; + networking.interfaces.enp5s0.useDHCP = true; networking.interfaces.wlp4s0.useDHCP = true; diff --git a/nixos/raspberry-pi.nix b/nixos/raspberry-pi.nix index 00640ba3..fe949127 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;