diff --git a/nix/configuration.nix b/nix/configuration.nix index c09f7e5..01aa07b 100644 --- a/nix/configuration.nix +++ b/nix/configuration.nix @@ -45,10 +45,13 @@ # List packages installed in system profile. To search, run: # $ nix search wget environment.systemPackages = with pkgs; [ + cachix firefox + inkscape unzip vim wget + xclip zathura zsh ]; @@ -119,6 +122,8 @@ shell = pkgs.zsh; }; + nix.trustedUsers = [ "root" "haak" ]; + # This value determines the NixOS release with which your system is to be # compatible, in order to avoid breaking some software such as database # servers. You should change this only after NixOS release notes say you diff --git a/nix/home.nix b/nix/home.nix index 0d023db..be3c88d 100644 --- a/nix/home.nix +++ b/nix/home.nix @@ -14,7 +14,8 @@ let }; cargoSha256 = "1aqjgfpqsasy9qvw08ill7ig6k9n9rdkwxlg1z5g61z7cmi1p3i4"; - buildInputs = [ pkgs.pkg-config pkgs.openssl ] ++ (if pkgs.stdenv.isDarwin then [ pkgs.libiconv pkgs.darwin.apple_sdk.frameworks.Security ] else []); + nativeBuildInputs = [ pkgs.pkgconfig ]; + buildInputs = [ pkgs.openssl ] ++ (if pkgs.stdenv.isDarwin then [ pkgs.libiconv pkgs.darwin.apple_sdk.frameworks.Security ] else []); }; vim-goyo = pkgs.vimUtils.buildVimPlugin { @@ -46,6 +47,7 @@ in { zsh-syntax-highlighting ] ++ (if pkgs.stdenv.isDarwin then [ lorri + skhd # keyboard shortcut daemon for macOS ] else [ slack ]); @@ -89,6 +91,8 @@ in { ".tools-info" "*~" "*.swp" + ".yardoc/" + "doc/" ]; }; @@ -191,7 +195,7 @@ in { \ 'javascript.jsx': ['prettier'], \ 'javascriptreact': ['prettier'], \ 'typescriptreact': ['prettier'], - \ 'ruby': ['rubocop', 'sorbet'], + \ 'ruby': [], \ 'rust': ['rustfmt'], \ 'elixir': ['mix_format'] \} diff --git a/secrets b/secrets index f0f2bd8..b6a3a14 160000 --- a/secrets +++ b/secrets @@ -1 +1 @@ -Subproject commit f0f2bd84ca7a06fec4e2c1287982c656022a8268 +Subproject commit b6a3a147522d60105b98dc8e827e81d89df1e667