diff --git a/flake.lock b/flake.lock index c89c9a3..e3ada4a 100644 --- a/flake.lock +++ b/flake.lock @@ -30,12 +30,12 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1781815324, - "narHash": "sha256-5pDiPOe2tLKDOH59TkzP3MNiCCCbGxw3giDyRrSdP4E=", - "rev": "fdef7e382e042b1fe418f65770c3acda5933b155", - "revCount": 422, + "lastModified": 1780083956, + "narHash": "sha256-hhPxK9t1ofQnId9vcrtW2C7sC+fB6EJx6Q7RtqUAtKo=", + "rev": "efa5aa3cc1a40cf3dab8c07bfbc07f5edd44d4a6", + "revCount": 420, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/0.1.422%2Brev-fdef7e382e042b1fe418f65770c3acda5933b155/019edc7b-7246-7e91-b54e-dcdac2728f77/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/0.1.420%2Brev-efa5aa3cc1a40cf3dab8c07bfbc07f5edd44d4a6/019e7548-4f1c-7680-9b6c-839f3317a0da/source.tar.gz" }, "original": { "type": "tarball", @@ -45,37 +45,37 @@ "determinate-nixd-aarch64-darwin": { "flake": false, "locked": { - "narHash": "sha256-pQ7YeoB96bBl3iJGRdUWjdOFwahPUMwNN1yl9fwJufY=", + "narHash": "sha256-LNvx0qZsH8tbdgNfaig/x5Cf4r4UrXfU1m+0bO3D0E4=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.2/macOS" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.0/macOS" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.2/macOS" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.0/macOS" } }, "determinate-nixd-aarch64-linux": { "flake": false, "locked": { - "narHash": "sha256-t6Tc358tx16GFely1je18dmrfB8Wv1FkV6nRnU7ITYY=", + "narHash": "sha256-rKg7uVAEK8X3TTFGaWp8CVZuCAr3wHkMnuJOndhXJF0=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.2/aarch64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.0/aarch64-linux" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.2/aarch64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.0/aarch64-linux" } }, "determinate-nixd-x86_64-linux": { "flake": false, "locked": { - "narHash": "sha256-M5e/05UlhljIuqS2ZMozD3OJ2MTTYol9SxQwqrzJdkk=", + "narHash": "sha256-vBCUEVPfY4+nxGDM62evpxJYEVqLTqdBGbCkmZ2sQhk=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.2/x86_64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.0/x86_64-linux" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.2/x86_64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.0/x86_64-linux" } }, "disko": { @@ -85,11 +85,11 @@ ] }, "locked": { - "lastModified": 1781152676, - "narHash": "sha256-RxWs5ND31KzTG7wvMM+PMfUjyNpmIEr999lqNARaM5o=", + "lastModified": 1780290312, + "narHash": "sha256-eTAlX0CwgB84Ts3GaBd944A3DRXVMzgA0EqroZBISUo=", "owner": "nix-community", "repo": "disko", - "rev": "ff8702b4de27f72b4c78573dfb89ec74e36abdf1", + "rev": "115e5211780054d8a890b41f0b7734cafad54dfe", "type": "github" }, "original": { @@ -190,11 +190,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1781971804, - "narHash": "sha256-sZ3m0vu/qNIip9S+fm/6LwvgwJNRNFzdozg95oFKfgg=", + "lastModified": 1780320683, + "narHash": "sha256-fxpL42AirGqicF5FixBge4+tn32GtJu3rnacL7pzSiI=", "owner": "helix-editor", "repo": "helix", - "rev": "d2fdf3f3c788f8fb715caf6d2f94d71b984da6cd", + "rev": "72d583700adf1f0e4e79356662b563cd3a76ab88", "type": "github" }, "original": { @@ -231,11 +231,11 @@ ] }, "locked": { - "lastModified": 1781980822, - "narHash": "sha256-UF4TqfMJCYOKVhLqgWnLZIdFm///wbUGlV0HyB2wHRg=", + "lastModified": 1780099287, + "narHash": "sha256-efIPwVGtIWIjWcznhaop6XN6HxnOL8800hF6CBNvlqQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "8695ecb389cb43449fba0494ffc21065c7cde39d", + "rev": "7d8127d308c3fb9664f7e643eec944be74ebb37d", "type": "github" }, "original": { @@ -252,11 +252,11 @@ ] }, "locked": { - "lastModified": 1781497404, - "narHash": "sha256-9GAF8sSsnkyCVCWkomXR0T+zdSxyUlfPt6neQidimdg=", + "lastModified": 1780099287, + "narHash": "sha256-efIPwVGtIWIjWcznhaop6XN6HxnOL8800hF6CBNvlqQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "1285cd3d6882a9847f2d56ed5541b3350c8a6162", + "rev": "7d8127d308c3fb9664f7e643eec944be74ebb37d", "type": "github" }, "original": { @@ -295,12 +295,12 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1780939209, - "narHash": "sha256-/JuW5C6sWuC836Y9b7hga3ZvhRiY4k4Zs73RRg5KVWM=", - "rev": "952beffe9c45ed245d30209d4f17cf1d26654a2a", - "revCount": 26044, + "lastModified": 1779472733, + "narHash": "sha256-nV5OHwivEf392cB5MDwoVdDHSvy6Q+rRYZBHd9sePj4=", + "rev": "11f3aff904f84ae612e36e8bc578ac421fca74fa", + "revCount": 25967, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.21.1/019ea860-2acd-7680-ae61-10f9574b2694/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.21.0/019e50fb-8633-73d0-b673-b2e265950490/source.tar.gz" }, "original": { "type": "tarball", @@ -309,16 +309,16 @@ }, "nixos": { "locked": { - "lastModified": 1781216227, - "narHash": "sha256-9mUW6gNwoN2SWc/l0fW4svPNOulXLl8ijqKyeSOGgJE=", + "lastModified": 1779796641, + "narHash": "sha256-ZsIrKmhp4vbBXoXXmR/tBXA/UCsAQiJL9vsgZEduhVY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a0374025a863d007d98e3297f6aa46cc3141c2f0", + "rev": "25f538306313eae3927264466c70d7001dcea1df", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-26.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } @@ -343,11 +343,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1781622756, - "narHash": "sha256-JrPh4M6S7aPsEE9tOENuZrxC6o2szSLlK+t4+nLke9s=", + "lastModified": 1780310866, + "narHash": "sha256-fPBRVf6A5xlACYcOI59shGrjURuvwu0lRsDoSCEXt/I=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "08018c72174a4df5657f8d94178ac69fb9c243e5", + "rev": "4ed851c979641e28597a05086332d75cdc9e395f", "type": "github" }, "original": { @@ -437,12 +437,12 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1780930886, - "narHash": "sha256-rppURzHviaQN131F+nLiLdGfcb0uCd9gGP0E5+iw9MI=", - "rev": "8c3cede7ddc26bd659d2d383b5610efbd2c7a16e", - "revCount": 1012902, + "lastModified": 1778869304, + "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=", + "rev": "d233902339c02a9c334e7e593de68855ad26c4cb", + "revCount": 998534, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.1012902%2Brev-8c3cede7ddc26bd659d2d383b5610efbd2c7a16e/019eab22-bd1e-7e40-b919-277db893c789/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.998534%2Brev-d233902339c02a9c334e7e593de68855ad26c4cb/019e3efc-e09a-7ff1-b05f-0c8f85ba7441/source.tar.gz" }, "original": { "type": "tarball", @@ -464,11 +464,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1781577229, - "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=", + "lastModified": 1779560665, + "narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f", + "rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786", "type": "github" }, "original": { @@ -486,11 +486,11 @@ ] }, "locked": { - "lastModified": 1781979923, - "narHash": "sha256-BQHJXHeKPYBQldv06grBZFnChKf3YdR4JLPFmqCB3sI=", + "lastModified": 1780329920, + "narHash": "sha256-1h43rRtAlJw3a2bvNiScnwFGrvDxSOXq1MmkKYyIX40=", "owner": "nix-community", "repo": "NUR", - "rev": "76b40a7a209c3fec96fb9d68f6a2f1f97760e3f2", + "rev": "f7a6f144246366adc7d6a3e20dcd7b4cdd9f2f32", "type": "github" }, "original": { @@ -560,11 +560,11 @@ ] }, "locked": { - "lastModified": 1781932488, - "narHash": "sha256-v7xGsRuuTPyKT1BzZYXfhciGKBRxQiBPn/wyvHDriqM=", + "lastModified": 1780309250, + "narHash": "sha256-XE9QhtahY3C3/6DA0f7CsJ+RWDR4Y0OEucRFeTUpWFo=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "bed09c284f289ad29cd7936e6297c7c16841903a", + "rev": "9c1e768c5cdf4be1db2989d14856022cfedb2fa1", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 674f1d5..7accc21 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "we say NO to shitty OSes"; inputs = { - nixos.url = "github:NixOS/nixpkgs/nixos-26.05"; + nixos.url = "github:NixOS/nixpkgs/nixos-25.11"; nixos-facter-modules.url = "github:numtide/nixos-facter-modules"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; diff --git a/systems/NOlaptop.nix b/systems/NOlaptop.nix index 42cd8a7..45d31ae 100644 --- a/systems/NOlaptop.nix +++ b/systems/NOlaptop.nix @@ -51,7 +51,6 @@ 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 a3cde88..72d4754 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,12 +29,11 @@ in { # texlab # thunderbird # wkhtmltopdf - android-tools appimage-run aspell aspellDicts.en bitwarden-cli - # bitwarden-desktop + bitwarden-desktop calibre darktable deluge @@ -150,7 +149,7 @@ in { users.users.tao = { isNormalUser = true; # hashedPasswordFile = config.age.secrets.password-tao.path; - extraGroups = ["audio" "video" "wheel" "libvirtd" "dialout" "game" "camera"]; + extraGroups = ["audio" "video" "wheel" "libvirtd" "dialout" "game"]; shell = pkgs.nushell; }; age.secrets = { diff --git a/users/tao/nushell/extras/nix.nu b/users/tao/nushell/extras/nix.nu index 8cd02bf..5a22b29 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_success = rebuild boot - if $build_success { + let build_status = rebuild boot + if $build_status { 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