diff --git a/apps/update/src/misc.ts b/apps/update/src/misc.ts index e3513569..00256117 100644 --- a/apps/update/src/misc.ts +++ b/apps/update/src/misc.ts @@ -9,7 +9,8 @@ const FLAKE = process.env.FLAKE; export const updateFlakeInputs = () => { const output = spawnSync( - `nix flake update --flake ${FLAKE} |& grep -v "warning: updating lock file"`, + `git restore flake.lock &> /dev/null; nix flake update --flake ${FLAKE}` + + ' |& grep -v "warning: updating lock file"', [], { shell: true }, ).stdout diff --git a/devices/nos/modules/docker/forgejo/images/forgejo.nix b/devices/nos/modules/docker/forgejo/images/forgejo.nix index d1d12bfc..68d044c9 100644 --- a/devices/nos/modules/docker/forgejo/images/forgejo.nix +++ b/devices/nos/modules/docker/forgejo/images/forgejo.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage { imageName = "codeberg.org/forgejo/forgejo"; - imageDigest = "sha256:6f4620d8fb4bb8288315b07ca65286da958745d623fc9eaef4bb4e0e34c68b3d"; - sha256 = "0k9nx7z20b60kavyawdhp7lk3abgy40lsbxl5p2qzgkhrc67bb31"; + imageDigest = "sha256:f3ec5c63038cf2ce31a71e50e48b24c334ba0a5233808d1a5a60d45203f84f02"; + sha256 = "1s6kw4kj7yhl57nzvny8w5d9y8ni0r7h9a1d0wjlqkvz9lxmhvmv"; finalImageName = "codeberg.org/forgejo/forgejo"; - finalImageTag = "7.0.5"; + finalImageTag = "8.0.0"; } diff --git a/devices/nos/modules/docker/freshrss/images/rss-bridge.nix b/devices/nos/modules/docker/freshrss/images/rss-bridge.nix index ddf024a7..1e203d6e 100644 --- a/devices/nos/modules/docker/freshrss/images/rss-bridge.nix +++ b/devices/nos/modules/docker/freshrss/images/rss-bridge.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage { imageName = "rssbridge/rss-bridge"; - imageDigest = "sha256:5d8906da7276396e077e054eb7e646f4f02d639be60a0b3bded97ec751fc0700"; - sha256 = "0wgj3w5dvhc0xa5p8c6gik0bc1c6q45yy8ngc37rixkyi677qgn0"; + imageDigest = "sha256:6161fe1fef70ad077dcae364164d7739c9c0d76bbc7f154dd64a2352fc93f291"; + sha256 = "1yx2wgr32y4dfjf317ks0rvqf863bvsvw5ydl8y55dbbshp6s916"; finalImageName = "rssbridge/rss-bridge"; finalImageTag = "latest"; } diff --git a/devices/nos/modules/docker/immich/images/machine-learning.nix b/devices/nos/modules/docker/immich/images/machine-learning.nix index b117b465..3a782e5e 100644 --- a/devices/nos/modules/docker/immich/images/machine-learning.nix +++ b/devices/nos/modules/docker/immich/images/machine-learning.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage { imageName = "ghcr.io/immich-app/immich-machine-learning"; - imageDigest = "sha256:794c3fc4a1da9925f1fdd4ac13fd0646f11a5f682bd50e1cd7e2283f3332ac65"; - sha256 = "02p0acynz8sc78dbm62dnwdd9hjrrd9y82c0zcmy38sbh9s6a3rd"; + imageDigest = "sha256:d4a5db2c7cda2897abea98a3d5fd0c3cc76618fff271708075faeee426fe1b64"; + sha256 = "1rwbp94r8lnb2pv7vam9kkvk0ibv4q8p0qy91q7n243y3bdmhic3"; finalImageName = "ghcr.io/immich-app/immich-machine-learning"; - finalImageTag = "v1.110.0"; + finalImageTag = "v1.111.0"; } diff --git a/devices/nos/modules/docker/immich/images/server.nix b/devices/nos/modules/docker/immich/images/server.nix index 00ec15ad..62bc8ed6 100644 --- a/devices/nos/modules/docker/immich/images/server.nix +++ b/devices/nos/modules/docker/immich/images/server.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage { imageName = "ghcr.io/immich-app/immich-server"; - imageDigest = "sha256:9de91632ea5c0aabcd5558cab8b270f6bde00679fc6bdc35806fb49367e4a583"; - sha256 = "13fpv1gjl04shczi3vbzj4sqpzpmyxw8bqldpgd8h7rhmvs6gjzi"; + imageDigest = "sha256:14ad5881f5afbea1dbf751e14acaafe00e6b012ffb18a56e9f117b00eb067d1d"; + sha256 = "0wxdcag6bhbzcxmbygw4qmh9j3h32yhgh93d0fy33xh6j3akjkyb"; finalImageName = "ghcr.io/immich-app/immich-server"; - finalImageTag = "v1.110.0"; + finalImageTag = "v1.111.0"; } diff --git a/devices/nos/modules/docker/media/bazarr/images/bazarr.nix b/devices/nos/modules/docker/media/bazarr/images/bazarr.nix index a5898ba1..8397a117 100644 --- a/devices/nos/modules/docker/media/bazarr/images/bazarr.nix +++ b/devices/nos/modules/docker/media/bazarr/images/bazarr.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage { imageName = "ghcr.io/linuxserver/bazarr"; - imageDigest = "sha256:25f0d19ba9226fdf15aec0fc7fa134ba89fc6f77f09d7bd45b33c5960c47821e"; - sha256 = "0q21k8msilcyknwad58zdmz9zrwwiy2gd6a5k4mzz5i6x0fr61fc"; + imageDigest = "sha256:e70de8a714ac57395d45052392001ec433b8f48aa1c204f13dae312cbcbe43af"; + sha256 = "15fbrxc0f8c5bab1g6k3i36lrca8fg4vyaqjaa3gq2wj8inb202p"; finalImageName = "ghcr.io/linuxserver/bazarr"; finalImageTag = "latest"; } diff --git a/flake.in.nix b/flake.in.nix index ab92ef7c..93b1075c 100644 --- a/flake.in.nix +++ b/flake.in.nix @@ -6,7 +6,7 @@ nixpkgs = mkInput { owner = "NixOS"; repo = "nixpkgs"; - ref = "nixos-unstable"; + ref = "nixos-unstable-small"; }; home-manager = mkDep { diff --git a/flake.lock b/flake.lock index 76046f5e..d4bf8032 100644 --- a/flake.lock +++ b/flake.lock @@ -77,11 +77,11 @@ ] }, "locked": { - "lastModified": 1722100913, - "narHash": "sha256-75Hcx5Zu0f+BeCkZxN1frkYacjbkwgCq+z3doVgr4Hw=", + "lastModified": 1722347739, + "narHash": "sha256-rAoh+K6KG+b1DwSWtqRVocdojnH6nGk6q07mNltoUSM=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "4918e57979bbdbd05aabb20f63e1cb5dc289bcbd", + "rev": "7c3565f9bedc7cb601cc0baa14792247e4dc1d5a", "type": "github" }, "original": { @@ -153,11 +153,11 @@ ] }, "locked": { - "lastModified": 1720076837, - "narHash": "sha256-PnT5CCO6lpdcwpNHBeBIZ9CNi/YbhJqM5Z5QTeKxEAk=", + "lastModified": 1722386418, + "narHash": "sha256-BXKjZIyBdK89JxSXVlmVKyB3lCiRYPUBLzpBb4qSEeU=", "owner": "matt1432", "repo": "nixos-caddy-cloudflare", - "rev": "3e6819b53a1ee75858b84ab0995d9335106d631a", + "rev": "f2a856f5a990466db989c4109bdb5e67cd8272b7", "type": "github" }, "original": { @@ -211,11 +211,11 @@ ] }, "locked": { - "lastModified": 1722236850, - "narHash": "sha256-UFct+Re7ve4AVwC8qFQ7KZ+t0hFk2U38VVJnnAlIT4A=", + "lastModified": 1722369226, + "narHash": "sha256-LyCsZNjAS+BE4Y1iYiOKiajrPXi3/6FF/wUCuFcgWMU=", "owner": "matt1432", "repo": "discord-nightly-overlay", - "rev": "4df152b32e8560e92a395dc46ff64b5cc2f7d711", + "rev": "a9c387d387fbdfd09289ae3aa30d71249ff4f66b", "type": "github" }, "original": { @@ -606,11 +606,11 @@ ] }, "locked": { - "lastModified": 1722226883, - "narHash": "sha256-bCCH8YDJ8Ws623VDQo9/PW8jb3hh5yrRuYFayDx/ZZQ=", + "lastModified": 1722321190, + "narHash": "sha256-WeVWVRqkgrbLzmk6FfJoloJ7Xe7HWD27Pv950IUG2kI=", "owner": "nix-community", "repo": "home-manager", - "rev": "89670e27e101b9b30f5900fc1eb6530258d316b1", + "rev": "4fcd54df7cbb1d79cbe81209909ee8514d6b17a4", "type": "github" }, "original": { @@ -703,11 +703,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1722274148, - "narHash": "sha256-Hw4QoNWBI1aMbohZOt7azFgDnk7QCRj6YS25M+fLJpM=", + "lastModified": 1722375236, + "narHash": "sha256-8yrkwPN3TbCrtZSD/7GSV2kW9hruIZUQymnpyV15TI4=", "ref": "refs/heads/main", - "rev": "e67322034037fef22079c8e480be38c1d04b5a4a", - "revCount": 5019, + "rev": "3b9b5346b830554aa7470ccf1202a7f3be72d1b4", + "revCount": 5029, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -861,11 +861,11 @@ ] }, "locked": { - "lastModified": 1721977287, - "narHash": "sha256-/CARXCCzLqcDQEqrqQfGeoaU2SOKGFbJqWMsDmweLOs=", + "lastModified": 1722369382, + "narHash": "sha256-J/91pJmTY5jGJLRZXBKtj+ToN53xaT7oINkui4UF7zg=", "owner": "matt1432", "repo": "nixos-jellyfin", - "rev": "4b8f98349be7603332a58be4769185f2e6413a02", + "rev": "7253d43cf185a43fea3f8925663999ec4e55dc54", "type": "github" }, "original": { @@ -902,11 +902,11 @@ ] }, "locked": { - "lastModified": 1721857031, - "narHash": "sha256-TNKuxqleANTVhpUECw/305y0MYO+9KZAx/8fyhNl4fU=", + "lastModified": 1722369519, + "narHash": "sha256-Lw8WlL69Y3h7dL3pgCrQKJIbUvdyXpe6QPQTdwLeNtM=", "owner": "matt1432", "repo": "khepri", - "rev": "52d9b7ed7dc5df538cdbdc8d69b98f234757b898", + "rev": "a7d1a516adefa4cd8c34829ac7c5d8c72cba42c8", "type": "github" }, "original": { @@ -958,11 +958,11 @@ ] }, "locked": { - "lastModified": 1720836836, - "narHash": "sha256-2jkzfa6+LfCIJvXxt1gRtYABeoM8OSs4ZCaEQahWzH8=", + "lastModified": 1722367901, + "narHash": "sha256-f4zoGQFYe5ErhuOV5AA5vxscAU7s727m6fz0psqvayQ=", "owner": "matt1432", "repo": "Minix", - "rev": "7537fb893d9485da8313df19db87f710dc4f13ce", + "rev": "d3f8c44374897f69293cc8b9e50c421b1225dea4", "type": "github" }, "original": { @@ -1301,16 +1301,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1722062969, - "narHash": "sha256-QOS0ykELUmPbrrUGmegAUlpmUFznDQeR4q7rFhl8eQg=", + "lastModified": 1722309256, + "narHash": "sha256-Eqlu/hisMWE51b9YeKqehNaHLPhZOmkFkrx+VzI5YcM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b73c2221a46c13557b1b3be9c2070cc42cf01eb3", + "rev": "3fcada1050e3820241590679838954bacf7d38f8", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-unstable-small", "repo": "nixpkgs", "type": "github" } @@ -1462,11 +1462,11 @@ ] }, "locked": { - "lastModified": 1722171028, - "narHash": "sha256-NWY1LnxdZOGFt5/VHcL4GPGSP6iBniOZBHz3WCxwhZI=", + "lastModified": 1722346555, + "narHash": "sha256-32XSW4hicoXnVAA8hQ77u6AgtWXiXsPIC2H52WckWXk=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "6642ef653bf2fcd39b118ada1371ba4519bdcc7b", + "rev": "8badd76557356d94681c0547a4f6ffe7dfd42597", "type": "github" }, "original": { @@ -1588,11 +1588,11 @@ ] }, "locked": { - "lastModified": 1722063923, - "narHash": "sha256-KUsh8lakyl2v8SHIhnYMMIx2G4SsFUGq+zHbXIdS3rQ=", + "lastModified": 1722392202, + "narHash": "sha256-3r/fp4goKQEdaDoXQXfszHCvuUE3VNAw6vop+sUzmF8=", "owner": "matt1432", "repo": "nixos-pcsd", - "rev": "62b44c2e183e1ebb9446d3773069166d953e81ac", + "rev": "3fa85783fa9e5139a8a96ad7313ce676dec74e52", "type": "github" }, "original": { @@ -1659,11 +1659,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1722313053, - "narHash": "sha256-pLhDp1QF2DdX7h151izNXUQhP0ODfTw60+it8RmOsEc=", + "lastModified": 1722383702, + "narHash": "sha256-1ZXmEuIAwPAbbL1uEawKdIWUE7hab/VC/U9mEiNkbu8=", "owner": "matt1432", "repo": "pr-tracker", - "rev": "c0df7315b471c2033513a20c0402b6596c7e23e9", + "rev": "8e93c30f3a35a656d8b18d3d75718833b3216d5f", "type": "github" }, "original": { @@ -2187,11 +2187,11 @@ ] }, "locked": { - "lastModified": 1722181019, - "narHash": "sha256-Lj/g1UzrsTZUixtveQix6eB3pon2j23qv5/5pzTx0LQ=", + "lastModified": 1722365976, + "narHash": "sha256-Khdm+mDzYA//XaU0M+hftod+rKr5q9SSHSEuiQ0/9ow=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "0e2f3b9c85f7bab3983098a01366876d34daf383", + "rev": "7f2a77ddf60390248e2a3de2261d7102a13e5341", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index f37f00a4..e84aa8df 100644 --- a/flake.nix +++ b/flake.nix @@ -1,5 +1,4 @@ # Do not modify! This file is generated. - { inputs = { Hyprspace = { @@ -227,7 +226,7 @@ }; nixpkgs = { owner = "NixOS"; - ref = "nixos-unstable"; + ref = "nixos-unstable-small"; repo = "nixpkgs"; type = "github"; }; @@ -335,4 +334,4 @@ }; }; outputs = inputs: inputs.flakegen ./flake.in.nix inputs; -} \ No newline at end of file +} diff --git a/legacyPackages/firefox-addons/generated-firefox-addons.nix b/legacyPackages/firefox-addons/generated-firefox-addons.nix index 20ef03d6..2c36c3cc 100644 --- a/legacyPackages/firefox-addons/generated-firefox-addons.nix +++ b/legacyPackages/firefox-addons/generated-firefox-addons.nix @@ -29,10 +29,10 @@ }; "bitwarden" = buildFirefoxXpiAddon { pname = "bitwarden"; - version = "2024.6.3"; + version = "2024.7.1"; addonId = "{446900e4-71c2-419f-a6a7-df9c091e268b}"; - url = "https://addons.mozilla.org/firefox/downloads/file/4307738/bitwarden_password_manager-2024.6.3.xpi"; - sha256 = "d3c052e66a9daa390707c4481ec50c09bc3b6253cb222792c9a55aa4b5f4045a"; + url = "https://addons.mozilla.org/firefox/downloads/file/4326285/bitwarden_password_manager-2024.7.1.xpi"; + sha256 = "28c505df3b615f6a3c829afdcff74584ddc5eb1d3fb35f9848c18470fad93772"; meta = with lib; { homepage = "https://bitwarden.com"; description = "At home, at work, or on the go, Bitwarden easily secures all your passwords, passkeys, and sensitive information."; @@ -47,6 +47,7 @@ "clipboardRead" "clipboardWrite" "idle" + "alarms" "webRequest" "webRequestBlocking" "webNavigation" diff --git a/modules/nvidia.nix b/modules/nvidia.nix index eaddb277..6e0c8a37 100644 --- a/modules/nvidia.nix +++ b/modules/nvidia.nix @@ -60,19 +60,14 @@ in { open = false; - package = + package = let + inherit (config.boot.kernelPackages.nvidiaPackages) stable beta; + in if !cfg.enableWayland - then config.boot.kernelPackages.nvidiaPackages.stable + then stable else # Get newest beta driver version for better Wayland support - config.boot.kernelPackages.nvidiaPackages.mkDriver { - version = "555.58.02"; - sha256_64bit = "sha256-xctt4TPRlOJ6r5S54h5W6PT6/3Zy2R4ASNFPu8TSHKM="; - sha256_aarch64 = "sha256-wb20isMrRg8PeQBU96lWJzBMkjfySAUaqt4EgZnhyF8="; - openSha256 = "sha256-8hyRiGB+m2hL3c9MDA/Pon+Xl6E788MZ50WrrAGUVuY="; - settingsSha256 = "sha256-ZpuVZybW6CFN/gz9rx+UJvQ715FZnAOYfHn5jt5Z2C8="; - persistencedSha256 = "sha256-a1D7ZZmcKFWfPjjH1REqPM5j/YLWKnbkP9qfRyIyxAw="; - }; + beta; }; environment.systemPackages =