From d4d4f9e946c7f5250b1ef7320701888c454713d2 Mon Sep 17 00:00:00 2001 From: Tao Tien <29749622+taotien@users.noreply.github.com> Date: Thu, 4 Jun 2026 09:22:44 -0700 Subject: [PATCH] androi --- flake.lock | 48 ++++++++++++++++----------------- systems/NOlaptop.nix | 1 + users/tao.nix | 5 ++-- users/tao/nushell/extras/nix.nu | 4 +-- 4 files changed, 30 insertions(+), 28 deletions(-) diff --git a/flake.lock b/flake.lock index e3ada4a..e7f5789 100644 --- a/flake.lock +++ b/flake.lock @@ -30,12 +30,12 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1780083956, - "narHash": "sha256-hhPxK9t1ofQnId9vcrtW2C7sC+fB6EJx6Q7RtqUAtKo=", - "rev": "efa5aa3cc1a40cf3dab8c07bfbc07f5edd44d4a6", - "revCount": 420, + "lastModified": 1780941588, + "narHash": "sha256-cXxaBtTSYEYVtSxw4IH0hPa+p+VFxS0i+66GwxVFk7o=", + "rev": "70c28bcdd4dde10d04f39e7accb5738a1f5d5298", + "revCount": 421, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/0.1.420%2Brev-efa5aa3cc1a40cf3dab8c07bfbc07f5edd44d4a6/019e7548-4f1c-7680-9b6c-839f3317a0da/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/0.1.421%2Brev-70c28bcdd4dde10d04f39e7accb5738a1f5d5298/019ea867-6742-70e1-a0f3-e626d4f3da83/source.tar.gz" }, "original": { "type": "tarball", @@ -45,37 +45,37 @@ "determinate-nixd-aarch64-darwin": { "flake": false, "locked": { - "narHash": "sha256-LNvx0qZsH8tbdgNfaig/x5Cf4r4UrXfU1m+0bO3D0E4=", + "narHash": "sha256-ctwRrPKWBSFkTqlCHRGz6MHBSWRkbSAEVGoelsxdr2g=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.0/macOS" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.1/macOS" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.0/macOS" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.1/macOS" } }, "determinate-nixd-aarch64-linux": { "flake": false, "locked": { - "narHash": "sha256-rKg7uVAEK8X3TTFGaWp8CVZuCAr3wHkMnuJOndhXJF0=", + "narHash": "sha256-qYFrMN6lSMRYV87D/uK5L2CUBvOpoLZAAfSYXvcp9cc=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.0/aarch64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.1/aarch64-linux" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.0/aarch64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.1/aarch64-linux" } }, "determinate-nixd-x86_64-linux": { "flake": false, "locked": { - "narHash": "sha256-vBCUEVPfY4+nxGDM62evpxJYEVqLTqdBGbCkmZ2sQhk=", + "narHash": "sha256-BxzPf6fT1ekyvD5JA0vvDJOTPtIyjrzVg3Puuo0ftbg=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.0/x86_64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.1/x86_64-linux" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.0/x86_64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.1/x86_64-linux" } }, "disko": { @@ -295,12 +295,12 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1779472733, - "narHash": "sha256-nV5OHwivEf392cB5MDwoVdDHSvy6Q+rRYZBHd9sePj4=", - "rev": "11f3aff904f84ae612e36e8bc578ac421fca74fa", - "revCount": 25967, + "lastModified": 1780939209, + "narHash": "sha256-/JuW5C6sWuC836Y9b7hga3ZvhRiY4k4Zs73RRg5KVWM=", + "rev": "952beffe9c45ed245d30209d4f17cf1d26654a2a", + "revCount": 26044, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.21.0/019e50fb-8633-73d0-b673-b2e265950490/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.21.1/019ea860-2acd-7680-ae61-10f9574b2694/source.tar.gz" }, "original": { "type": "tarball", @@ -437,12 +437,12 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1778869304, - "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=", - "rev": "d233902339c02a9c334e7e593de68855ad26c4cb", - "revCount": 998534, + "lastModified": 1780336545, + "narHash": "sha256-vhVhuXzFrIOfcssC/9hDHx7MHzDKjF3keHuREOQqQiQ=", + "rev": "4df1b885d76a54e1aa1a318f8d16fd6005b6401f", + "revCount": 1008784, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.998534%2Brev-d233902339c02a9c334e7e593de68855ad26c4cb/019e3efc-e09a-7ff1-b05f-0c8f85ba7441/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.1008784%2Brev-4df1b885d76a54e1aa1a318f8d16fd6005b6401f/019e8725-c925-7ec1-8f35-3f9effcf169a/source.tar.gz" }, "original": { "type": "tarball", diff --git a/systems/NOlaptop.nix b/systems/NOlaptop.nix index 45d31ae..42cd8a7 100644 --- a/systems/NOlaptop.nix +++ b/systems/NOlaptop.nix @@ -51,6 +51,7 @@ boot.kernelPackages = pkgs.linuxPackages_latest; boot.kernelParams = [ "amdgpu.abmlevel=1" + "amdgpu.dcdebugmask=0x400" ]; boot.kernelModules = ["amdgpu"]; powerManagement.cpuFreqGovernor = "powersave"; diff --git a/users/tao.nix b/users/tao.nix index 72d4754..9184611 100644 --- a/users/tao.nix +++ b/users/tao.nix @@ -7,13 +7,13 @@ }: let pkgs-last-building = inputs.nixpkgs-last-building.legacyPackages.${pkgs.system}; in { + programs.gphoto2.enable = true; users.users.tao.packages = (with pkgs-last-building; [ # oculante # https://nixpk.gs/pr-tracker.html?pr=502921 ]) ++ (with pkgs; [ # keep-sorted start sticky_comments=no - # android-tools # bottles # boxxy # carapace @@ -29,6 +29,7 @@ in { # texlab # thunderbird # wkhtmltopdf + android-tools appimage-run aspell aspellDicts.en @@ -149,7 +150,7 @@ in { users.users.tao = { isNormalUser = true; # hashedPasswordFile = config.age.secrets.password-tao.path; - extraGroups = ["audio" "video" "wheel" "libvirtd" "dialout" "game"]; + extraGroups = ["audio" "video" "wheel" "libvirtd" "dialout" "game" "camera"]; shell = pkgs.nushell; }; age.secrets = { diff --git a/users/tao/nushell/extras/nix.nu b/users/tao/nushell/extras/nix.nu index 5a22b29..8cd02bf 100644 --- a/users/tao/nushell/extras/nix.nu +++ b/users/tao/nushell/extras/nix.nu @@ -68,8 +68,8 @@ export def bump [...rest] { } let r = jj log -r @ --no-pager --no-graph --template 'change_id' sudo nix flake update - let build_status = rebuild boot - if $build_status { + let build_success = rebuild boot + if $build_success { jj desc -r $r -m $"bump (date now | format date "%Y-%m-%d")" jj bookmark set main -r $r jj git push --allow-empty-description