separate nixos from non-nixos configuration a bit

This commit is contained in:
Haak Saxberg 2020-05-27 02:43:45 -07:00
parent 982f4260c8
commit 90c60edc62

View file

@ -16,22 +16,39 @@ let
cargoSha256 = "1aqjgfpqsasy9qvw08ill7ig6k9n9rdkwxlg1z5g61z7cmi1p3i4"; cargoSha256 = "1aqjgfpqsasy9qvw08ill7ig6k9n9rdkwxlg1z5g61z7cmi1p3i4";
buildInputs = [ pkgs.pkg-config pkgs.openssl ] ++ (if pkgs.stdenv.isDarwin then [ pkgs.libiconv pkgs.darwin.apple_sdk.frameworks.Security ] else []); buildInputs = [ pkgs.pkg-config pkgs.openssl ] ++ (if pkgs.stdenv.isDarwin then [ pkgs.libiconv pkgs.darwin.apple_sdk.frameworks.Security ] else []);
}; };
vim-goyo = pkgs.vimUtils.buildVimPlugin {
name = "vim-goyo";
src = pkgs.fetchFromGitHub {
owner = "junegunn";
repo = "goyo.vim";
rev = "6b6ed2734084fdbb6315357ddcaecf9c8e6f143d";
sha256 = "1ywlz1hn54kxyp5q0angriaarimq7ys7m6sk6l4x8jr1g2yh0afz";
};
};
in { in {
home.packages = with pkgs; [ home.packages = with pkgs; [
direnv
git-plan git-plan
htop htop
jq jq
keybase keybase
lastpass-cli lastpass-cli
(let neuronSrc = builtins.fetchTarball https://github.com/srid/neuron/archive/master.tar.gz;
in import neuronSrc)
nox nox
tree tree
ranger ranger
ripgrep ripgrep
vlc
zsh-autosuggestions zsh-autosuggestions
zsh-history-substring-search zsh-history-substring-search
zsh-syntax-highlighting zsh-syntax-highlighting
]; ] ++ (if pkgs.stdenv.isDarwin then [
lorri
] else [
slack
]);
programs.direnv = { programs.direnv = {
enable = true; enable = true;
@ -115,6 +132,11 @@ in {
eval "$(direnv hook zsh)" eval "$(direnv hook zsh)"
''); '');
shellAliases = {
n = "neuron new";
ns = "neuron search -a";
};
oh-my-zsh = { oh-my-zsh = {
enable = true; enable = true;
theme = "typewritten"; theme = "typewritten";
@ -154,6 +176,7 @@ in {
LanguageClient-neovim LanguageClient-neovim
deoplete-nvim deoplete-nvim
papercolor-theme papercolor-theme
vim-goyo
]; ];
extraConfig = '' extraConfig = ''
@ -161,6 +184,7 @@ in {
" ALE " ALE
let g:ale_fix_on_save = 1 let g:ale_fix_on_save = 1
let g:ale_elixir_credo_strict = 1
let g:ale_fixers = { let g:ale_fixers = {
\ 'elm': ['elm-format', 'format'], \ 'elm': ['elm-format', 'format'],
\ 'javascript': ['prettier'], \ 'javascript': ['prettier'],
@ -169,6 +193,7 @@ in {
\ 'typescriptreact': ['prettier'], \ 'typescriptreact': ['prettier'],
\ 'ruby': ['rubocop', 'sorbet'], \ 'ruby': ['rubocop', 'sorbet'],
\ 'rust': ['rustfmt'], \ 'rust': ['rustfmt'],
\ 'elixir': ['mix_format']
\} \}
" Easymotion " Easymotion
@ -320,6 +345,8 @@ in {
defaultCommand = "rg --no-ignore --follow --files --hidden --smart-case --glob \\\"!.git/*\\\""; defaultCommand = "rg --no-ignore --follow --files --hidden --smart-case --glob \\\"!.git/*\\\"";
}; };
services.lorri.enable = !pkgs.stdenv.isDarwin;
# Let Home Manager install and manage itself. # Let Home Manager install and manage itself.
programs.home-manager.enable = true; programs.home-manager.enable = true;