Merge branch 'master' of github.com:IvanMalison/dotfiles

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)"

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
   ];

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;
 

nixos/raspberry-pi.nix

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