androi
This commit is contained in:
parent
fdbb91fec4
commit
d4d4f9e946
4 changed files with 30 additions and 28 deletions
48
flake.lock
generated
48
flake.lock
generated
|
|
@ -30,12 +30,12 @@
|
||||||
"nixpkgs": "nixpkgs_3"
|
"nixpkgs": "nixpkgs_3"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1780083956,
|
"lastModified": 1780941588,
|
||||||
"narHash": "sha256-hhPxK9t1ofQnId9vcrtW2C7sC+fB6EJx6Q7RtqUAtKo=",
|
"narHash": "sha256-cXxaBtTSYEYVtSxw4IH0hPa+p+VFxS0i+66GwxVFk7o=",
|
||||||
"rev": "efa5aa3cc1a40cf3dab8c07bfbc07f5edd44d4a6",
|
"rev": "70c28bcdd4dde10d04f39e7accb5738a1f5d5298",
|
||||||
"revCount": 420,
|
"revCount": 421,
|
||||||
"type": "tarball",
|
"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": {
|
"original": {
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
|
|
@ -45,37 +45,37 @@
|
||||||
"determinate-nixd-aarch64-darwin": {
|
"determinate-nixd-aarch64-darwin": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"narHash": "sha256-LNvx0qZsH8tbdgNfaig/x5Cf4r4UrXfU1m+0bO3D0E4=",
|
"narHash": "sha256-ctwRrPKWBSFkTqlCHRGz6MHBSWRkbSAEVGoelsxdr2g=",
|
||||||
"type": "file",
|
"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": {
|
"original": {
|
||||||
"type": "file",
|
"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": {
|
"determinate-nixd-aarch64-linux": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"narHash": "sha256-rKg7uVAEK8X3TTFGaWp8CVZuCAr3wHkMnuJOndhXJF0=",
|
"narHash": "sha256-qYFrMN6lSMRYV87D/uK5L2CUBvOpoLZAAfSYXvcp9cc=",
|
||||||
"type": "file",
|
"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": {
|
"original": {
|
||||||
"type": "file",
|
"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": {
|
"determinate-nixd-x86_64-linux": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"narHash": "sha256-vBCUEVPfY4+nxGDM62evpxJYEVqLTqdBGbCkmZ2sQhk=",
|
"narHash": "sha256-BxzPf6fT1ekyvD5JA0vvDJOTPtIyjrzVg3Puuo0ftbg=",
|
||||||
"type": "file",
|
"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": {
|
"original": {
|
||||||
"type": "file",
|
"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": {
|
"disko": {
|
||||||
|
|
@ -295,12 +295,12 @@
|
||||||
"nixpkgs-regression": "nixpkgs-regression"
|
"nixpkgs-regression": "nixpkgs-regression"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1779472733,
|
"lastModified": 1780939209,
|
||||||
"narHash": "sha256-nV5OHwivEf392cB5MDwoVdDHSvy6Q+rRYZBHd9sePj4=",
|
"narHash": "sha256-/JuW5C6sWuC836Y9b7hga3ZvhRiY4k4Zs73RRg5KVWM=",
|
||||||
"rev": "11f3aff904f84ae612e36e8bc578ac421fca74fa",
|
"rev": "952beffe9c45ed245d30209d4f17cf1d26654a2a",
|
||||||
"revCount": 25967,
|
"revCount": 26044,
|
||||||
"type": "tarball",
|
"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": {
|
"original": {
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
|
|
@ -437,12 +437,12 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_3": {
|
"nixpkgs_3": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1778869304,
|
"lastModified": 1780336545,
|
||||||
"narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=",
|
"narHash": "sha256-vhVhuXzFrIOfcssC/9hDHx7MHzDKjF3keHuREOQqQiQ=",
|
||||||
"rev": "d233902339c02a9c334e7e593de68855ad26c4cb",
|
"rev": "4df1b885d76a54e1aa1a318f8d16fd6005b6401f",
|
||||||
"revCount": 998534,
|
"revCount": 1008784,
|
||||||
"type": "tarball",
|
"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": {
|
"original": {
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
|
|
|
||||||
|
|
@ -51,6 +51,7 @@
|
||||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||||
boot.kernelParams = [
|
boot.kernelParams = [
|
||||||
"amdgpu.abmlevel=1"
|
"amdgpu.abmlevel=1"
|
||||||
|
"amdgpu.dcdebugmask=0x400"
|
||||||
];
|
];
|
||||||
boot.kernelModules = ["amdgpu"];
|
boot.kernelModules = ["amdgpu"];
|
||||||
powerManagement.cpuFreqGovernor = "powersave";
|
powerManagement.cpuFreqGovernor = "powersave";
|
||||||
|
|
|
||||||
|
|
@ -7,13 +7,13 @@
|
||||||
}: let
|
}: let
|
||||||
pkgs-last-building = inputs.nixpkgs-last-building.legacyPackages.${pkgs.system};
|
pkgs-last-building = inputs.nixpkgs-last-building.legacyPackages.${pkgs.system};
|
||||||
in {
|
in {
|
||||||
|
programs.gphoto2.enable = true;
|
||||||
users.users.tao.packages =
|
users.users.tao.packages =
|
||||||
(with pkgs-last-building; [
|
(with pkgs-last-building; [
|
||||||
# oculante # https://nixpk.gs/pr-tracker.html?pr=502921
|
# oculante # https://nixpk.gs/pr-tracker.html?pr=502921
|
||||||
])
|
])
|
||||||
++ (with pkgs; [
|
++ (with pkgs; [
|
||||||
# keep-sorted start sticky_comments=no
|
# keep-sorted start sticky_comments=no
|
||||||
# android-tools
|
|
||||||
# bottles
|
# bottles
|
||||||
# boxxy
|
# boxxy
|
||||||
# carapace
|
# carapace
|
||||||
|
|
@ -29,6 +29,7 @@ in {
|
||||||
# texlab
|
# texlab
|
||||||
# thunderbird
|
# thunderbird
|
||||||
# wkhtmltopdf
|
# wkhtmltopdf
|
||||||
|
android-tools
|
||||||
appimage-run
|
appimage-run
|
||||||
aspell
|
aspell
|
||||||
aspellDicts.en
|
aspellDicts.en
|
||||||
|
|
@ -149,7 +150,7 @@ in {
|
||||||
users.users.tao = {
|
users.users.tao = {
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
# hashedPasswordFile = config.age.secrets.password-tao.path;
|
# 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;
|
shell = pkgs.nushell;
|
||||||
};
|
};
|
||||||
age.secrets = {
|
age.secrets = {
|
||||||
|
|
|
||||||
|
|
@ -68,8 +68,8 @@ export def bump [...rest] {
|
||||||
}
|
}
|
||||||
let r = jj log -r @ --no-pager --no-graph --template 'change_id'
|
let r = jj log -r @ --no-pager --no-graph --template 'change_id'
|
||||||
sudo nix flake update
|
sudo nix flake update
|
||||||
let build_status = rebuild boot
|
let build_success = rebuild boot
|
||||||
if $build_status {
|
if $build_success {
|
||||||
jj desc -r $r -m $"bump (date now | format date "%Y-%m-%d")"
|
jj desc -r $r -m $"bump (date now | format date "%Y-%m-%d")"
|
||||||
jj bookmark set main -r $r
|
jj bookmark set main -r $r
|
||||||
jj git push --allow-empty-description
|
jj git push --allow-empty-description
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue