From 93527c8f52e56dbf30c2359398832631c787d38e Mon Sep 17 00:00:00 2001 From: earnest ma Date: Mon, 2 Aug 2021 19:43:37 -0400 Subject: [PATCH] NixOS, user packages Try and maintain compatibility with non-NixOS as well - on Tycho, I'll still be using Ubuntu until I feel like I've gotten the hang of Nix(OS) on ataraxia and retire it. --- .config/nixpkgs/home.nix | 6 ++++++ .config/shell/start.sh | 5 ++++- .config/zsh/.zshrc | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.config/nixpkgs/home.nix b/.config/nixpkgs/home.nix index 2d1414d..aab5c21 100644 --- a/.config/nixpkgs/home.nix +++ b/.config/nixpkgs/home.nix @@ -11,6 +11,12 @@ in home.homeDirectory = "/home/earne"; home.packages = with pkgs; [ + # Doom Emacs + dependencies + pkgsUnstable.fd + pkgsUnstable.ripgrep + pkgsUnstable.emacs + + alacritty gitFull pkgsUnstable.neovim tmux diff --git a/.config/shell/start.sh b/.config/shell/start.sh index 335ebd8..b44632f 100755 --- a/.config/shell/start.sh +++ b/.config/shell/start.sh @@ -11,6 +11,9 @@ export XDG_USER_CONFIG_DIR="$XDG_CONFIG_HOME" export XDG_DATA_HOME="$HOME/.local/share" export XDG_CACHE_HOME="$HOME/.cache" +# NixOS home-manager desktop files "fix" +export XDG_DATA_DIRS="$HOME/.nix-profile/share:$XDG_DATA_DIRS" + export LANG=en_CA.UTF-8 # TZ @@ -51,7 +54,7 @@ export NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME/npm/npmrc" alias wget="wget --hsts-file=$XDG_CACHE_HOME/wget-hsts" -export GNUPGHOME="$XDG_DATA_HOME/gnupg" +# export GNUPGHOME="$XDG_DATA_HOME/gnupg" # Causes issues on NixOS export PATH # just in case diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index dd5fff7..4ce925d 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -82,5 +82,5 @@ zstyle ':vcs_info:git:*' formats '%F{240}(%b)%r%f' zstyle ':vcs_info:*' enable git # This must be placed at the end -source /usr/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh +[ -f /usr/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh ] && source /usr/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh