Tweaks and fixes

work
mat ess 2022-06-26 20:56:06 -04:00
parent 0b6fc13d62
commit c40b7af665
4 changed files with 42 additions and 22 deletions

View File

@ -76,5 +76,10 @@ in
# For cli packages that aren't currently available for macOS in `nixpkgs`.Packages should be # For cli packages that aren't currently available for macOS in `nixpkgs`.Packages should be
# installed in `../home/default.nix` whenever possible. # installed in `../home/default.nix` whenever possible.
homebrew.brews = [ "fileicon" "fzf" "unison-language" ]; homebrew.brews = [
"fileicon"
"fzf"
"unison-language"
"xcbeautify"
];
} }

View File

@ -79,11 +79,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1656111632, "lastModified": 1656266731,
"narHash": "sha256-TqNwPFPRy/NP3zGf9DJvBFfIyVtsH150nkOIX07MKBI=", "narHash": "sha256-yHA/O4VEtjaGFyI7tUD3/eCrrcrRrscwLyPttdd4jgE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "223b9deeaddb9b8e2a6325fb661d2f62abe8450d", "rev": "72a135b093cbf3497a287bd5b1a605dcdcc73b7a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -94,11 +94,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1656052185, "lastModified": 1656198488,
"narHash": "sha256-jv62Zk1VX1kHI1nCSy1mbGeY4N+2RwWVfOmK0Fr91p0=", "narHash": "sha256-xe81o3Kin6a0jXA3mTxcR+jeA1jLKw3TCar5LUo/B5c=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e1c9213887f54131c37c29935985b8679a55e785", "rev": "46af3303651699dc58cfc251d9b18c0f59d857da",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -110,11 +110,11 @@
}, },
"nixpkgs-master": { "nixpkgs-master": {
"locked": { "locked": {
"lastModified": 1656121142, "lastModified": 1656270636,
"narHash": "sha256-3ATzeaa3YRPFldqX7/8OlZ1K/qzr8gNB4iEOZ4IbbVw=", "narHash": "sha256-gMF++Oe2wZmC63/CwoWtTD9d7XgB4jYeCLNIVOOPny0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f43ff7ef71ead37aebc362a7705236b5f2d2bdd7", "rev": "f3b81e322917818cd31a58f64596cb583da67664",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -126,11 +126,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1655876541, "lastModified": 1656130826,
"narHash": "sha256-eOz1YNclUTobC2f9meWpw+idhzWImdti43OKjLBoDq8=", "narHash": "sha256-dLqquYHvj6/EYPljULXJVUKcizB/8cbgdIL7aEXTDZY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a0edeb02ae5b92eda6efbee4e26d8c33c15063fd", "rev": "72d1b0d0fac131df1ea254b65413c85609bdd2ee",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -27,14 +27,16 @@
# Configuration for `nixpkgs` # Configuration for `nixpkgs`
nixpkgsConfig = { nixpkgsConfig = {
config = { allowUnfree = true; }; config = { allowUnfree = true; };
overlays = attrValues self.overlays ++ singleton ( overlays = attrValues self.overlays ++ singleton
final: prev: optionalAttrs (
(prev.stdenv.system == "aarch64-darwin") final: prev: optionalAttrs
{ (prev.stdenv.system == "aarch64-darwin")
# Sub in x86 version of packages that don't build on Apple Silicon yet {
# inherit (final.pkgs-x86) foo; # Sub in x86 version of packages that don't build on Apple Silicon yet
} inherit (final.pkgs-x86);
); inherit (final.patched) python310 kitty;
}
);
}; };
# Shared home-manager configs # Shared home-manager configs
@ -169,6 +171,19 @@
system = "x86_64-darwin"; system = "x86_64-darwin";
inherit (nixpkgsConfig) config; inherit (nixpkgsConfig) config;
}; };
patched = {
python310 = prev.python310.override {
packageOverrides = python-self: python-super: {
pyopenssl = python-super.pyopenssl.overrideAttrs (_: {
meta.broken = false;
});
};
};
kitty = prev.kitty.overrideAttrs (_: {
doCheck = false;
doInstallCheck = false;
});
};
}; };
}; };

View File

@ -81,7 +81,7 @@ rec {
cursor_text_color = background; cursor_text_color = background;
# Selection # Selection
selection_background = "#101014"; selection_background = "#fafbff";
selection_foreground = "none"; selection_foreground = "none";
# Tab bar # Tab bar