diff --git a/config/nixpkgs/home.nix b/config/nixpkgs/home.nix new file mode 100644 index 0000000..6c6544c --- /dev/null +++ b/config/nixpkgs/home.nix @@ -0,0 +1,38 @@ +{ config, pkgs, ... }: + +{ + # Home Manager needs a bit of information about you and the + # paths it should manage. + # TODO(spotlightishere): Is there a cleaner approach? + home.username = if pkgs.stdenv.isDarwin then + "spot" + else + "spotlight"; + + home.homeDirectory = if pkgs.stdenv.isDarwin then + "/Users/spot" + else + "/home/spotlight"; + + home.packages = with pkgs; [ + dogdns + htop + mtr + ncdu + tmux + vim + ]; + + # This value determines the Home Manager release that your + # configuration is compatible with. This helps avoid breakage + # when a new Home Manager release introduces backwards + # incompatible changes. + # + # You can update Home Manager without changing this value. See + # the Home Manager release notes for a list of state version + # changes in each release. + home.stateVersion = "21.11"; + + # Let Home Manager install and manage itself. + programs.home-manager.enable = true; +} diff --git a/dotfilesrc b/dotfilesrc index 28a3fb4..c19f57b 100644 --- a/dotfilesrc +++ b/dotfilesrc @@ -1,3 +1,4 @@ [dotfiles] repository = ~/.dotfiles ignore = ['.git'] +packages = ['config'] diff --git a/zshrc b/zshrc index 6370f46..e4cf6db 100644 --- a/zshrc +++ b/zshrc @@ -60,7 +60,6 @@ if [ -d /opt/devkitpro ]; then export DEVKITPRO=/opt/devkitpro export DEVKITARM=/opt/devkitpro/devkitARM export DEVKITPPC=/opt/devkitpro/devkitPPC - export PATH=/opt/devkitpro/tools/bin:$PATH fi if [[ $OSTYPE == darwin* ]]; then @@ -98,8 +97,9 @@ if [ -f $HOME/.keysrc ]; then fi # Allow nix if possible -if [ -e $HOME/.nix-profile/etc/profile.d/nix.sh ]; then - source $HOME/.nix-profile/etc/profile.d/nix.sh +if [ -d /nix ]; then + # https://github.com/NixOS/nix/issues/2033 + export NIX_PATH=$HOME/.nix-defexpr/channels:/nix/var/nix/profiles/per-user/root/channels${NIX_PATH:+:$NIX_PATH} fi # Rust