diff --git a/bathtub/hardware.nix b/bathtub/hardware.nix index 8b44066..a49e2e1 100644 --- a/bathtub/hardware.nix +++ b/bathtub/hardware.nix @@ -20,6 +20,13 @@ }; graphics.enable = true; + graphics.package = + assert pkgs.mesa.version == "26.0.5"; + (import (fetchTarball { + url = "https://github.com/NixOS/nixpkgs/archive/df26bc59d3c7cd52e4005dfe9843b1e7b0554de1.tar.gz"; + sha256 = "sha256-Tmp0nu2JTMHHOuV20ElkPduB0IuZaG3pBjrYPDx79u8="; + }) { localSystem = pkgs.stdenv.hostPlatform; }).mesa; + asahi = { peripheralFirmwareDirectory = ../files/asahi-firmware; setupAsahiSound = true; diff --git a/flake.lock b/flake.lock index b483f25..b649aab 100644 --- a/flake.lock +++ b/flake.lock @@ -133,11 +133,11 @@ ] }, "locked": { - "lastModified": 1772408722, - "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=", + "lastModified": 1775087534, + "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3", + "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", "type": "github" }, "original": { @@ -193,11 +193,11 @@ ] }, "locked": { - "lastModified": 1775781825, - "narHash": "sha256-L5yKTpR+alrZU2XYYvIxCeCP4LBHU5jhwSj7H1VAavg=", + "lastModified": 1776454077, + "narHash": "sha256-7zSUFWsU0+jlD7WB3YAxQ84Z/iJurA5hKPm8EfEyGJk=", "owner": "nix-community", "repo": "home-manager", - "rev": "e35c39fca04fee829cecdf839a50eb9b54d8a701", + "rev": "565e5349208fe7d0831ef959103c9bafbeac0681", "type": "github" }, "original": { @@ -310,11 +310,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1775877135, - "narHash": "sha256-nAqtUMy22olwyiOJB0CASVrbu5XB5+43GjlbIJ1KuvQ=", + "lastModified": 1776509722, + "narHash": "sha256-oHVMjAMBukYnGeEE0EtCQsx8cNRv8WadHD8ZV3oZFSM=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "f943da038fd668d435c2d17916577f295faa8839", + "rev": "f8cc32a3aba29fdacd06d80b0986028cfd413a22", "type": "github" }, "original": { @@ -343,11 +343,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1775561155, - "narHash": "sha256-TK2IrqQivRcwqJa0suZMbcsN17CtA8Uu0v7CDnLATb0=", + "lastModified": 1776505268, + "narHash": "sha256-+hK+EgAwuRG+lhqwOkKfXlqMEdELIoTMdjfVosIlLb0=", "owner": "YaLTeR", "repo": "niri", - "rev": "599db847f857b8a7ff78ce02f15acab5d5d9fee1", + "rev": "9e5716a9dbf7dbf9622a95a5bd23a898867759c6", "type": "github" }, "original": { @@ -385,11 +385,11 @@ ] }, "locked": { - "lastModified": 1775887459, - "narHash": "sha256-aUC+iK8zpMxdZLMhQpmUz9XBzKrQnFWzveB9IK18n3w=", + "lastModified": 1776370524, + "narHash": "sha256-0Gt5qnjNkIZJdOBfu2u47zgyhYL3WmgUrguUhGSxUdk=", "owner": "nix-community", "repo": "nixos-apple-silicon", - "rev": "b6d1d07d55831902cb188a40692a5c7b5529e9e0", + "rev": "f9f0650b45e31b3f6c3e2a0405fa198a286e2741", "type": "github" }, "original": { @@ -401,11 +401,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1775814348, - "narHash": "sha256-wW/U49vd2vEVwnpSN122BAR0uRFz6U6NaPVeVdA5ghg=", + "lastModified": 1776544041, + "narHash": "sha256-ryzOZLvuS/4ZbYJzR8+wYZpyG/Ssp6BAe6oTQ8ttAqU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3ec049d0d1b13a6bda5232e00f1c6c25c5fa373a", + "rev": "f731538cdf1410a3c53d3a75a6a1142afc08e3af", "type": "github" }, "original": { @@ -417,11 +417,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1775811116, - "narHash": "sha256-t+HZK42pB6N+i5RGbuy7Xluez/VvWbembBdvzsc23Ss=", + "lastModified": 1776434932, + "narHash": "sha256-gyqXNMgk3sh+ogY5svd2eNLJ6oEwzbAeaoBrrxD0lKk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "54170c54449ea4d6725efd30d719c5e505f1c10e", + "rev": "c7f47036d3df2add644c46d712d14262b7d86c0c", "type": "github" }, "original": { @@ -456,11 +456,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1775837497, - "narHash": "sha256-L17VI03w/wVXvc1SK7EI1muLqHxD3+esYPPzgQvvdOE=", + "lastModified": 1776452249, + "narHash": "sha256-tpCsY9kIEfcitiV3JwUqYTmxwewwZKQlZSNUBqb9kF0=", "owner": "nix-community", "repo": "nixvim", - "rev": "a587a96a48c705609bfd2ad23f9ae5961eb0d373", + "rev": "698d17490e19e2e360a6ce49b1af9134d1c6eacd", "type": "github" }, "original": { @@ -507,11 +507,11 @@ ] }, "locked": { - "lastModified": 1775682595, - "narHash": "sha256-0E9PohY/VuESLq0LR4doaH7hTag513sDDW5n5qmHd1Q=", + "lastModified": 1776119890, + "narHash": "sha256-Zm6bxLNnEOYuS/SzrAGsYuXSwk3cbkRQZY0fJnk8a5M=", "owner": "Mic92", "repo": "sops-nix", - "rev": "d2e8438d5886e92bc5e7c40c035ab6cae0c41f76", + "rev": "d4971dd58c6627bfee52a1ad4237637c0a2fb0cd", "type": "github" }, "original": { diff --git a/home/desktop/sioyek.nix b/home/desktop/sioyek.nix index e137d2a..d865389 100644 --- a/home/desktop/sioyek.nix +++ b/home/desktop/sioyek.nix @@ -14,8 +14,8 @@ "next_item" = "k"; "previous_item" = "K"; # misc - "set_mark" = "h"; "toggle_custom_color" = ""; + "toggle_statusbar" = ""; }; config = { custom_background_color = "0.18 0.14 0.16"; @@ -27,7 +27,6 @@ status_bar_color = "0.18 0.14 0.16"; ui_font = "Victor Mono"; visual_mark_color = "1.0 1.0 1.0 0.8"; - show_statusbar_only_when_hovered = "1"; }; }; } diff --git a/justfile b/justfile index 0dcd284..efede14 100644 --- a/justfile +++ b/justfile @@ -1,7 +1,9 @@ +jobs := `nproc` + build host: - nixos-rebuild build --flake .#{{host}} -L + nixos-rebuild build --flake .#{{host}} -L -j{{jobs}} build-vm host: - nixos-rebuild build-vm --flake .#{{host}} -L + nixos-rebuild build-vm --flake .#{{host}} -L -j{{jobs}} install host: nixos-install --flake .#{{host}} --no-root-passwd deploy host: (partition host) (install host) (sops host) diff --git a/modules/core/nix.nix b/modules/core/nix.nix index 9d57fdb..7156471 100644 --- a/modules/core/nix.nix +++ b/modules/core/nix.nix @@ -8,6 +8,12 @@ }; settings = { experimental-features = "nix-command flakes"; + extra-substituters = [ + "https://nixos-apple-silicon.cachix.org" + ]; + extra-trusted-public-keys = [ + "nixos-apple-silicon.cachix.org-1:8psDu5SA5dAD7qA0zMy5UT292TxeEPzIz8VVEr2Js20=" + ]; trusted-users = [ "@wheel" ];