diff options
| -rw-r--r-- | ops/modules/tvl-users.nix | 6 | ||||
| -rw-r--r-- | third_party/gerrit/default.nix | 2 | ||||
| -rw-r--r-- | third_party/sources/sources.json | 24 | ||||
| -rw-r--r-- | users/tazjin/nixos/modules/hidpi.nix | 4 | ||||
| -rw-r--r-- | users/tazjin/nixos/polyanka/default.nix | 2 |
5 files changed, 21 insertions, 17 deletions
diff --git a/ops/modules/tvl-users.nix b/ops/modules/tvl-users.nix index 0e6bcec280ab..004bc5cbfff0 100644 --- a/ops/modules/tvl-users.nix +++ b/ops/modules/tvl-users.nix @@ -84,12 +84,12 @@ }; }; + programs.fish.enable = true; + environment.systemPackages = with pkgs; [ alacritty.terminfo foot.terminfo rxvt-unicode-unwrapped.terminfo - - # TODO(sterni): re-enable when the kitty build is fixed upstreams - # kitty.terminfo + kitty.terminfo ]; } diff --git a/third_party/gerrit/default.nix b/third_party/gerrit/default.nix index f6127a9dd300..3c2f0aec5767 100644 --- a/third_party/gerrit/default.nix +++ b/third_party/gerrit/default.nix @@ -55,7 +55,7 @@ pkgs.lib.makeOverridable pkgs.buildBazelPackage { fetchConfigured = true; fetchAttrs = { - sha256 = "sha256:1z0j09mz7ycf0kmiinv4879jvx25rp6sn2da2hqw8a9rf5rf6ias"; + sha256 = "sha256:1bvcijcc083cbkzlc243bklnghnpj1knfnnbvvfhbmpmasm1svyn"; preBuild = '' rm .bazelversion ''; diff --git a/third_party/sources/sources.json b/third_party/sources/sources.json index f370337ac0bc..d7929feba11d 100644 --- a/third_party/sources/sources.json +++ b/third_party/sources/sources.json @@ -29,10 +29,10 @@ "homepage": "https://nix-community.github.io/home-manager/", "owner": "nix-community", "repo": "home-manager", - "rev": "2f8d24b7f57fdd404defe84626b08f3318612f8c", - "sha256": "1q52qjjcwr6k36jkrfbqcppvan3a25djfmbxgm64zjbzbq26hkzn", + "rev": "67b97020b6970d39b4126a7870063d11337ecb80", + "sha256": "0g59760avrmsd1x9kasfpd2lh8mv78f60nl5vlfnpwibs386p2gd", "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" }, "impermanence": { @@ -77,10 +77,10 @@ "homepage": "", "owner": "NixOS", "repo": "nixpkgs", - "rev": "19cf008bb18e47b6e3b4e16e32a9a4bdd4b45f7e", - "sha256": "0myq7fnykna5qazbk6hdgahy148yd7f5l8nrxhzllj67y86a5sxw", + "rev": "9a6aabc4740790ef3bbb246b86d029ccf6759658", + "sha256": "0m8cid2n6zfnbia7kkan9vw8n5dvwn8sv7cmrap46rckpzbahnls", "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" }, "nixpkgs-stable": { @@ -101,10 +101,10 @@ "homepage": "", "owner": "oxalica", "repo": "rust-overlay", - "rev": "afbdcf305fd6f05f708fe76d52f24d37d066c251", - "sha256": "0vzbfcn291hp2ksw4anrddqhqsz75ydwzc2z2gswv695m58yl862", + "rev": "aa480d799023141e1b9e5d6108700de63d9ad002", + "sha256": "03d65g4qshqm7qv14np4h004p3fg3h4b0sc7n3f62lla4x034jpm", "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" }, "rustsec-advisory-db": { @@ -113,10 +113,10 @@ "homepage": "https://rustsec.org", "owner": "RustSec", "repo": "advisory-db", - "rev": "cda37f498ab8bfc07abc234c1ec7d6cf09867b5a", - "sha256": "19rd6xyr4ih3ai1gdx2kpxmwcpvh0l5025zawsimr30bw00r29hp", + "rev": "719587479aa1814df822a3a4dd4067cd4b37a8ab", + "sha256": "1y04k4f4dclqbaqh5j2i1d5bwmcf3y67h4p86ggamm78b277ixyv", "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" } } diff --git a/users/tazjin/nixos/modules/hidpi.nix b/users/tazjin/nixos/modules/hidpi.nix index 7fa3e4193341..2ff61d499a2e 100644 --- a/users/tazjin/nixos/modules/hidpi.nix +++ b/users/tazjin/nixos/modules/hidpi.nix @@ -7,8 +7,10 @@ # screen settings to do conditional initialisation (mostly for Emacs). 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. - hardware.video.hidpi.enable = true; + # hardware.video.hidpi.enable = true; # Bump DPI across the board. # TODO(tazjin): This should actually be set per monitor, but I diff --git a/users/tazjin/nixos/polyanka/default.nix b/users/tazjin/nixos/polyanka/default.nix index 261071849514..eed36d656a34 100644 --- a/users/tazjin/nixos/polyanka/default.nix +++ b/users/tazjin/nixos/polyanka/default.nix @@ -80,6 +80,8 @@ in group = "quassel"; }; + programs.fish.enable = true; + users.users.tazjin = { isNormalUser = true; extraGroups = [ "wheel" ]; |