chore(3p/sources): Bump channels & overlays
* Satisfy new assert that the corresponding shell needs to be enabled via programs.* if it is as the login shell of at least one user. * //users/tazjin: “Address” removal of hardware.video.hidpi option. * //3p/gerrit: update fetch sha256 Change-Id: Id0988a0ea7f393d6b7848a7104fc3526ee1177f4 Reviewed-on: https://cl.tvl.fyi/c/depot/+/8407 Autosubmit: sterni <sternenseemann@systemli.org> Reviewed-by: tazjin <tazjin@tvl.su> Tested-by: BuildkiteCI
This commit is contained in:
parent
9b78aa1ad6
commit
96d7f4f0ac
5 changed files with 21 additions and 17 deletions
|
@ -84,12 +84,12 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
programs.fish.enable = true;
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
alacritty.terminfo
|
alacritty.terminfo
|
||||||
foot.terminfo
|
foot.terminfo
|
||||||
rxvt-unicode-unwrapped.terminfo
|
rxvt-unicode-unwrapped.terminfo
|
||||||
|
kitty.terminfo
|
||||||
# TODO(sterni): re-enable when the kitty build is fixed upstreams
|
|
||||||
# kitty.terminfo
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
2
third_party/gerrit/default.nix
vendored
2
third_party/gerrit/default.nix
vendored
|
@ -55,7 +55,7 @@ pkgs.lib.makeOverridable pkgs.buildBazelPackage {
|
||||||
fetchConfigured = true;
|
fetchConfigured = true;
|
||||||
|
|
||||||
fetchAttrs = {
|
fetchAttrs = {
|
||||||
sha256 = "sha256:1z0j09mz7ycf0kmiinv4879jvx25rp6sn2da2hqw8a9rf5rf6ias";
|
sha256 = "sha256:1bvcijcc083cbkzlc243bklnghnpj1knfnnbvvfhbmpmasm1svyn";
|
||||||
preBuild = ''
|
preBuild = ''
|
||||||
rm .bazelversion
|
rm .bazelversion
|
||||||
'';
|
'';
|
||||||
|
|
24
third_party/sources/sources.json
vendored
24
third_party/sources/sources.json
vendored
|
@ -29,10 +29,10 @@
|
||||||
"homepage": "https://nix-community.github.io/home-manager/",
|
"homepage": "https://nix-community.github.io/home-manager/",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "2f8d24b7f57fdd404defe84626b08f3318612f8c",
|
"rev": "67b97020b6970d39b4126a7870063d11337ecb80",
|
||||||
"sha256": "1q52qjjcwr6k36jkrfbqcppvan3a25djfmbxgm64zjbzbq26hkzn",
|
"sha256": "0g59760avrmsd1x9kasfpd2lh8mv78f60nl5vlfnpwibs386p2gd",
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://github.com/nix-community/home-manager/archive/2f8d24b7f57fdd404defe84626b08f3318612f8c.tar.gz",
|
"url": "https://github.com/nix-community/home-manager/archive/67b97020b6970d39b4126a7870063d11337ecb80.tar.gz",
|
||||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||||
},
|
},
|
||||||
"impermanence": {
|
"impermanence": {
|
||||||
|
@ -77,10 +77,10 @@
|
||||||
"homepage": "",
|
"homepage": "",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "19cf008bb18e47b6e3b4e16e32a9a4bdd4b45f7e",
|
"rev": "9a6aabc4740790ef3bbb246b86d029ccf6759658",
|
||||||
"sha256": "0myq7fnykna5qazbk6hdgahy148yd7f5l8nrxhzllj67y86a5sxw",
|
"sha256": "0m8cid2n6zfnbia7kkan9vw8n5dvwn8sv7cmrap46rckpzbahnls",
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://github.com/NixOS/nixpkgs/archive/19cf008bb18e47b6e3b4e16e32a9a4bdd4b45f7e.tar.gz",
|
"url": "https://github.com/NixOS/nixpkgs/archive/9a6aabc4740790ef3bbb246b86d029ccf6759658.tar.gz",
|
||||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||||
},
|
},
|
||||||
"nixpkgs-stable": {
|
"nixpkgs-stable": {
|
||||||
|
@ -101,10 +101,10 @@
|
||||||
"homepage": "",
|
"homepage": "",
|
||||||
"owner": "oxalica",
|
"owner": "oxalica",
|
||||||
"repo": "rust-overlay",
|
"repo": "rust-overlay",
|
||||||
"rev": "afbdcf305fd6f05f708fe76d52f24d37d066c251",
|
"rev": "aa480d799023141e1b9e5d6108700de63d9ad002",
|
||||||
"sha256": "0vzbfcn291hp2ksw4anrddqhqsz75ydwzc2z2gswv695m58yl862",
|
"sha256": "03d65g4qshqm7qv14np4h004p3fg3h4b0sc7n3f62lla4x034jpm",
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://github.com/oxalica/rust-overlay/archive/afbdcf305fd6f05f708fe76d52f24d37d066c251.tar.gz",
|
"url": "https://github.com/oxalica/rust-overlay/archive/aa480d799023141e1b9e5d6108700de63d9ad002.tar.gz",
|
||||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||||
},
|
},
|
||||||
"rustsec-advisory-db": {
|
"rustsec-advisory-db": {
|
||||||
|
@ -113,10 +113,10 @@
|
||||||
"homepage": "https://rustsec.org",
|
"homepage": "https://rustsec.org",
|
||||||
"owner": "RustSec",
|
"owner": "RustSec",
|
||||||
"repo": "advisory-db",
|
"repo": "advisory-db",
|
||||||
"rev": "cda37f498ab8bfc07abc234c1ec7d6cf09867b5a",
|
"rev": "719587479aa1814df822a3a4dd4067cd4b37a8ab",
|
||||||
"sha256": "19rd6xyr4ih3ai1gdx2kpxmwcpvh0l5025zawsimr30bw00r29hp",
|
"sha256": "1y04k4f4dclqbaqh5j2i1d5bwmcf3y67h4p86ggamm78b277ixyv",
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://github.com/RustSec/advisory-db/archive/cda37f498ab8bfc07abc234c1ec7d6cf09867b5a.tar.gz",
|
"url": "https://github.com/RustSec/advisory-db/archive/719587479aa1814df822a3a4dd4067cd4b37a8ab.tar.gz",
|
||||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,8 +7,10 @@
|
||||||
# screen settings to do conditional initialisation (mostly for Emacs).
|
# screen settings to do conditional initialisation (mostly for Emacs).
|
||||||
environment.variables.HIDPI_SCREEN = "true";
|
environment.variables.HIDPI_SCREEN = "true";
|
||||||
|
|
||||||
|
# TODO(tazjin): this option has been removed and needs to be replaced
|
||||||
|
# by manual configuration: https://github.com/NixOS/nixpkgs/issues/222805
|
||||||
# Ensure a larger font size in early boot stage.
|
# Ensure a larger font size in early boot stage.
|
||||||
hardware.video.hidpi.enable = true;
|
# hardware.video.hidpi.enable = true;
|
||||||
|
|
||||||
# Bump DPI across the board.
|
# Bump DPI across the board.
|
||||||
# TODO(tazjin): This should actually be set per monitor, but I
|
# TODO(tazjin): This should actually be set per monitor, but I
|
||||||
|
|
|
@ -80,6 +80,8 @@ in
|
||||||
group = "quassel";
|
group = "quassel";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
programs.fish.enable = true;
|
||||||
|
|
||||||
users.users.tazjin = {
|
users.users.tazjin = {
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
extraGroups = [ "wheel" ];
|
extraGroups = [ "wheel" ];
|
||||||
|
|
Loading…
Reference in a new issue