diff --git a/.config/nix/flake.nix b/.config/nix/flake.nix index a19def4..4ba86fe 100644 --- a/.config/nix/flake.nix +++ b/.config/nix/flake.nix @@ -9,11 +9,16 @@ outputs = inputs@{ self, nix-darwin, nixpkgs }: let - configuration = { pkgs, ... }: { + configuration = { pkgs, ... }: let + python = pkgs.python310Full.override { + # FIXME: Build failed, maybe override postInstall instead? + #enableFramework = true; + }; + in + { # List packages installed in system profile. To search by name, run: # $ nix-env -qaP | grep wget - environment.systemPackages = - [ + environment.systemPackages = [ pkgs.zsh pkgs.git pkgs.vim @@ -23,11 +28,12 @@ pkgs.pinentry_mac pkgs.gnupg pkgs.htop-vim - pkgs.poetry - pkgs.python310Full + python + # FIXME: Build failed, dnspython pytest keep returning FAILED caused by timeout. Maybe find a way to bypass check for them + # (pkgs.poetry.override { python3 = python; }) pkgs.python310Packages.pip pkgs.python310Packages.tkinter - pkgs.pfetch + pkgs.fastfetch pkgs.eza pkgs.lf pkgs.wimlib @@ -62,6 +68,8 @@ }; in { + # TODO: Split configurations + # Build darwin flake using: # $ darwin-rebuild build --flake .#ThiccBook-Pro darwinConfigurations."ThiccBook-Pro" = nix-darwin.lib.darwinSystem { @@ -72,3 +80,4 @@ darwinPackages = self.darwinConfigurations."ThiccBook-Pro".pkgs; }; } +# vim:set ts=2 sw=2 et: diff --git a/.config/zsh/include/aliases b/.config/zsh/include/aliases index 0741f0b..ade3280 100644 --- a/.config/zsh/include/aliases +++ b/.config/zsh/include/aliases @@ -76,7 +76,7 @@ alias reUSD='rm -rf /tmp/rate.html /tmp/rateUSD.txt' #alias mpv='mpv --geometry=1280x720' #config shortcuts -alias cdnixd='cd $XDG_CONFIG_HOME/nix-darwin' +alias cdnixd='cd $XDG_CONFIG_HOME/nix/darwin' alias cdnix='cd $XDG_CONFIG_HOME/nix' alias config='cd ${DOTFILES:-$HOME/Build/GIT/dotfiles}' alias cfg='config'