diff --git a/common/default.nix b/common/default.nix index ce13a05..e9e24c7 100644 --- a/common/default.nix +++ b/common/default.nix @@ -25,7 +25,7 @@ boot.tmp.useTmpfs = true; nix = { - package = pkgs.nixVersions.latest; + package = pkgs.nixVersions.nix_2_22; # Edit nix.conf settings = { diff --git a/devices/nos/modules/arion/forgejo/images/act_runner.nix b/devices/nos/modules/arion/forgejo/images/act_runner.nix index 27cd8d5..2ad2dea 100644 --- a/devices/nos/modules/arion/forgejo/images/act_runner.nix +++ b/devices/nos/modules/arion/forgejo/images/act_runner.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage { imageName = "vegardit/gitea-act-runner"; - imageDigest = "sha256:030b54decbe81f56e35916726adde03cc626080c44ea7acf41ff7a72a6364115"; - sha256 = "1yv1s79z79zqjffq7pg9j68y8d1dpaxns11cphbs38pdm8ij6ks5"; + imageDigest = "sha256:7ea2b97aeb277559240781b5f4d774fa53422affd1e0e9c1bef7dd2520bbdf23"; + sha256 = "1x66sh1jz6jnjj5xkx0lgs81zm4ilm8hh9yiimc4z7gj1k89b2cx"; finalImageName = "vegardit/gitea-act-runner"; finalImageTag = "dind-latest"; } diff --git a/devices/nos/modules/arion/freshrss/images/rss-bridge.nix b/devices/nos/modules/arion/freshrss/images/rss-bridge.nix index 8bf58e5..efbadb4 100644 --- a/devices/nos/modules/arion/freshrss/images/rss-bridge.nix +++ b/devices/nos/modules/arion/freshrss/images/rss-bridge.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage { imageName = "rssbridge/rss-bridge"; - imageDigest = "sha256:e21675968e9b9518fc83ba023a1acb38d013997de9013cf2a49d811c7bab567f"; - sha256 = "0zy957yzrpzaxf9spwdhql5f340cxaak96rg8lyn1yvln3zi76cx"; + imageDigest = "sha256:17f1153c64d56eea234638d991fcfe60ea47cef6d6db0772ef04f010269ec301"; + sha256 = "07vci6fl95rakqadw548bmj7hv7y15sjw5wcw21dlhv0cw37qxm5"; finalImageName = "rssbridge/rss-bridge"; finalImageTag = "latest"; } diff --git a/devices/nos/modules/arion/media/bazarr/images/bazarr.nix b/devices/nos/modules/arion/media/bazarr/images/bazarr.nix index 7e68d14..1ce0845 100644 --- a/devices/nos/modules/arion/media/bazarr/images/bazarr.nix +++ b/devices/nos/modules/arion/media/bazarr/images/bazarr.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage { imageName = "ghcr.io/linuxserver/bazarr"; - imageDigest = "sha256:d2ec8002f118b22f03ed314cf866a196464ad4977142457c9401b542cf192bd7"; - sha256 = "071zynq1nsg624kk2cn9d8qicfkhwp4108q250aca7367cmax1qa"; + imageDigest = "sha256:6fb83511c0dca70a400fde79cb45ed59c4f66ea30dcba8c6f9274f01d77e5aef"; + sha256 = "05vyjlbrmcsrdz0gjqaxd8wgkch3hrq7dq740qzyqi8xlfxbiq62"; finalImageName = "ghcr.io/linuxserver/bazarr"; finalImageTag = "latest"; } diff --git a/devices/nos/modules/arion/media/calibre/images/calibre.nix b/devices/nos/modules/arion/media/calibre/images/calibre.nix index d369413..96192d7 100644 --- a/devices/nos/modules/arion/media/calibre/images/calibre.nix +++ b/devices/nos/modules/arion/media/calibre/images/calibre.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage { imageName = "ghcr.io/linuxserver/calibre"; - imageDigest = "sha256:06dea3ef2e60d055cebea101c3e64a924d822736e9a91e804599e1f8eaaebdf7"; - sha256 = "1w38y23kmdvqj06s0yzwz0c5nrjy0jspnk0n1p6nc71v4a74v101"; + imageDigest = "sha256:7cef47ba7fd105e2352b48fcff50c43a78415511beee2f742000cf9de5609331"; + sha256 = "1lx3bcffqs0dn55826xx4jdysa36g7dy5hakhazfyxzv7wixkh62"; finalImageName = "ghcr.io/linuxserver/calibre"; finalImageTag = "latest"; } diff --git a/devices/nos/modules/arion/nextcloud/images/onlyoffice.nix b/devices/nos/modules/arion/nextcloud/images/onlyoffice.nix index 063602b..98afd7f 100644 --- a/devices/nos/modules/arion/nextcloud/images/onlyoffice.nix +++ b/devices/nos/modules/arion/nextcloud/images/onlyoffice.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage { imageName = "onlyoffice/documentserver"; - imageDigest = "sha256:3b53dc7da559cdfa7e0c1c2f64aedce0b7ba868080b07c338ef5794a8046ca85"; - sha256 = "023ip2iimlm9h0bhmwwylpwhl2230qjql0z8m96c2365nx0nsv70"; + imageDigest = "sha256:423328ee377374c48a30c2aa416e4afedf621faff068f97966cb9b87a28550bd"; + sha256 = "0jdd8h5piiy9hdssb873kn35a3ragl90qmll5rcd3z0k14ab182v"; finalImageName = "onlyoffice/documentserver"; finalImageTag = "latest"; } diff --git a/devices/nos/modules/arion/resume/images/postgres.nix b/devices/nos/modules/arion/resume/images/postgres.nix index 04b468b..0fd70b7 100644 --- a/devices/nos/modules/arion/resume/images/postgres.nix +++ b/devices/nos/modules/arion/resume/images/postgres.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage { imageName = "postgres"; - imageDigest = "sha256:1158769d52c0ca272ced2bba4acfea3da625d5262b7321cf742dfd3d909719cf"; - sha256 = "1wpfcwhjjxl3xmv30vh6drq0da58ws0jr5j4vbfgbc0gpnh9xa19"; + imageDigest = "sha256:72b0091097472ae5c36ab51d646bc57fa1fc7b01bdf58686411a326a84a4ae78"; + sha256 = "1jqwpc0i75ra1wcw4gcbpiahyql7gjgdhz46pjps3mcgdw6dk9sg"; finalImageName = "postgres"; finalImageTag = "15-alpine"; } diff --git a/flake.in.nix b/flake.in.nix index 9fa85b2..54a4995 100644 --- a/flake.in.nix +++ b/flake.in.nix @@ -6,7 +6,7 @@ nixpkgs = mkInput { owner = "NixOS"; repo = "nixpkgs"; - ref = "nixos-unstable-small"; + ref = "nixos-unstable"; }; home-manager = mkDep { diff --git a/flake.lock b/flake.lock index 499accd..8869010 100644 --- a/flake.lock +++ b/flake.lock @@ -126,11 +126,11 @@ ] }, "locked": { - "lastModified": 1718500544, - "narHash": "sha256-UHv0025b77Av6IUvB93d01I1r6RlID50rbtUYVELcNg=", + "lastModified": 1718811416, + "narHash": "sha256-IuCFMxMiES2o2Zhkg4jFN6GPimF1ufGZmdj2FwH/lY4=", "owner": "matt1432", "repo": "nixos-caddy-cloudflare", - "rev": "e3709fd877877a50a1d00c33075c64317acce66c", + "rev": "e64888083f1136765fbbd05a90403f9caa5b5305", "type": "github" }, "original": { @@ -625,11 +625,11 @@ "gpu-screen-recorder-src": { "flake": false, "locked": { - "lastModified": 1718323554, - "narHash": "sha256-MVf6/2PCyHuATpeJ+TX55IzZpUvnP8rEtgsiOeaif30=", + "lastModified": 1718819379, + "narHash": "sha256-BkczVHWycNLzk0eScltK8+nzP7hnDmLBxksny1kdVKQ=", "ref": "refs/heads/master", - "rev": "3e2e2444d9fa65ae404604542689cf7829c99cfa", - "revCount": 618, + "rev": "4bfb095f8d4250e94a64be53858f5d0544944999", + "revCount": 620, "type": "git", "url": "https://repo.dec05eba.com/gpu-screen-recorder" }, @@ -682,11 +682,11 @@ "gtk-theme-src": { "flake": false, "locked": { - "lastModified": 1718141070, - "narHash": "sha256-azwkng3JTTBlSaisbJUdh9NlMZfDbD3OvTQP++J0oO8=", + "lastModified": 1718826758, + "narHash": "sha256-WQsPn5s8xZ/wdVJUJb1aCTAjOskj/qthZ48HHDVIcNk=", "owner": "dracula", "repo": "gtk", - "rev": "4a5fe924a2b17f82a617f79ef661f1783cacc988", + "rev": "91b9c8572d7cfa06b24eee72d415cc8931c04934", "type": "github" }, "original": { @@ -783,11 +783,11 @@ ] }, "locked": { - "lastModified": 1718526747, - "narHash": "sha256-sKrD/utGvmtQALvuDj4j0CT3AJXP1idOAq2p+27TpeE=", + "lastModified": 1718788307, + "narHash": "sha256-SqiOz0sljM0GjyQEVinPXQxaGcbOXw5OgpCWGPgh/vo=", "owner": "nix-community", "repo": "home-manager", - "rev": "0a7ffb28e5df5844d0e8039c9833d7075cdee792", + "rev": "d7830d05421d0ced83a0f007900898bdcaf2a2ca", "type": "github" }, "original": { @@ -863,11 +863,11 @@ ] }, "locked": { - "lastModified": 1718368322, - "narHash": "sha256-VfMg3RsnRLQzbq0hFIh1dCM09b5C/F/qPFUOgU/CRi0=", + "lastModified": 1718450675, + "narHash": "sha256-jpsns6buS4bK+1sF8sL8AaixAiCRjA+nldTKvcwmvUs=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "dd3a853c8239d1c3f3f37de7d2b8ae4b4f3840df", + "rev": "66d5b46ff94efbfa6fa3d1d1b66735f1779c34a6", "type": "github" }, "original": { @@ -909,11 +909,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1718639631, - "narHash": "sha256-N8bT29SDZUAQcLQsEvUeCFOvV2R69j/dTQtOj5DSgRg=", + "lastModified": 1718835324, + "narHash": "sha256-U5eKTPAXppfSIqKqMIgbyuTBy1gr2seSOUl8sUSR8FE=", "ref": "refs/heads/main", - "rev": "d1340bd1d8eedd274283e0cb2568a3ed67b58c81", - "revCount": 4858, + "rev": "fabc30df52ab5d2c369fc8acd4ff909a6ba3b8ac", + "revCount": 4870, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -938,11 +938,11 @@ ] }, "locked": { - "lastModified": 1691753796, - "narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=", + "lastModified": 1714869498, + "narHash": "sha256-vbLVOWvQqo4n1yvkg/Q70VTlPbMmTiCQfNTgcWDCfJM=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03", + "rev": "e06482e0e611130cd1929f75e8c1cf679e57d161", "type": "github" }, "original": { @@ -992,11 +992,11 @@ ] }, "locked": { - "lastModified": 1718271409, - "narHash": "sha256-8KvVqtApNt4FWTdn1TqVvw00rpqyG9UuUPA2ilPVD1U=", + "lastModified": 1718804078, + "narHash": "sha256-CqRZne63BpYlPd/i8lXV0UInUt59oKogiwdVtBRHt60=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "8e10e0626fb26a14b859b3811b6ed7932400c86e", + "rev": "4f1351295c55a8f51219b25aa4a6497a067989d0", "type": "github" }, "original": { @@ -1037,11 +1037,11 @@ ] }, "locked": { - "lastModified": 1718677604, - "narHash": "sha256-h5pVfeq0JgrNxFymgIyBEeEo64ur8GeVlYskQ1U5uqk=", + "lastModified": 1718811823, + "narHash": "sha256-vU9mRIYjTm2ZGFp3m/mHlEfUVPfDVLfXKDpr6Osf8HM=", "owner": "matt1432", "repo": "nixos-jellyfin", - "rev": "ddb3fc6e602cb2d038304a15f26bb4004ccba620", + "rev": "2faf75f738b11c3864aa10a35f0c1bbc0679ddda", "type": "github" }, "original": { @@ -1199,11 +1199,11 @@ ] }, "locked": { - "lastModified": 1718661512, - "narHash": "sha256-IvjK5cTa3jrotvxc0cQhQI8LiUElkjKHO+OVSp0SfMc=", + "lastModified": 1718775905, + "narHash": "sha256-1o1A/esIIRAkXfd20TmYU6jJTF3YHUlcAUNezQnizM4=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "aa24668815f0a4643483922e67d88e41c823fee3", + "rev": "42261b7220526fb7fd72912ab3e647019e1d1148", "type": "github" }, "original": { @@ -1215,11 +1215,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1718577731, - "narHash": "sha256-NupFlZo/ye996eDgf6fQ+eAxsbwOCrWP0yj/TZI4MLg=", + "lastModified": 1718749922, + "narHash": "sha256-DAx1WRYBHL9AkPKrJP0aBEtvoH3VgAXJTfALRlkD8ds=", "owner": "neovim", "repo": "neovim", - "rev": "20a7eebec086129e605041d32916f36df50890de", + "rev": "a2d510e1015d57f28ab20c5d2897527cae15b9c4", "type": "github" }, "original": { @@ -1490,16 +1490,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1718632497, - "narHash": "sha256-YtlyfqOdYMuu7gumZtK0Kg7jr4OKfHUhJkZfNUryw68=", + "lastModified": 1718530797, + "narHash": "sha256-pup6cYwtgvzDpvpSCFh1TEUjw2zkNpk8iolbKnyFmmU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c58b4a9118498c1055c5908a5bbe666e56abe949", + "rev": "b60ebf54c15553b393d144357375ea956f89e9a9", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable-small", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -1651,11 +1651,11 @@ ] }, "locked": { - "lastModified": 1718666287, - "narHash": "sha256-ruaJgdvO08vEtqoJz5e6+WnSEKNNO/IDsJacT+KBrFg=", + "lastModified": 1718824488, + "narHash": "sha256-38B8aLuI2qiPMZj+NmHPVmbkWTYEj1B3B/RUd+kFM9c=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "09229094326b2b41f0ac5e637276820a2968291d", + "rev": "43d24cef11b3cee62b6bdb88ab2b8fd9612142e9", "type": "github" }, "original": { @@ -1793,11 +1793,11 @@ "ocf-resource-agents-src": { "flake": false, "locked": { - "lastModified": 1718607826, - "narHash": "sha256-D00VxU8Sz/iYv9gMOy5Yp2pgS6hOqeHGTbSg1oO/asc=", + "lastModified": 1718798751, + "narHash": "sha256-2EpcqPFvO/tON/Ybw0+NLz0SbqPsyVKzwXuxR0d3nfk=", "owner": "ClusterLabs", "repo": "resource-agents", - "rev": "7e9e38f9ef9b61f9af7f509dadf7da9635826021", + "rev": "5a44fb668ea69fb2c2a537d3340e5a9f81c96883", "type": "github" }, "original": { @@ -1809,11 +1809,11 @@ "pacemaker-src": { "flake": false, "locked": { - "lastModified": 1718340520, - "narHash": "sha256-VFyhT/xaVfDoZuJcOQbQHsmwhKcH4uPrD3rFRg/Ig2Q=", + "lastModified": 1718744016, + "narHash": "sha256-nEefO8h+wPpXpXwOSVIqAU1DJvP3Lir+w4voemZcvyQ=", "owner": "ClusterLabs", "repo": "pacemaker", - "rev": "9a6fc531ee245c9e3fc821f8ea86872b3687ecd0", + "rev": "abc25ce4b81fa15d61cf898ed770c95b4fde09bd", "type": "github" }, "original": { @@ -1857,11 +1857,11 @@ "pcs-web-ui-src": { "flake": false, "locked": { - "lastModified": 1717058924, - "narHash": "sha256-EuZw2YaJeqiEdBWLJ6jT2wnFMy7dBmKusxfEEgp3YY4=", + "lastModified": 1718809213, + "narHash": "sha256-+4FRaei5UebK84/FvuvhJlNNs0MTYWhgQbo2UTFkb7U=", "owner": "ClusterLabs", "repo": "pcs-web-ui", - "rev": "41cf27aea25d42d20008fcd2bbb4cdc45eb75445", + "rev": "ae0e7f62a4b818d56b198a056978626fa4a609bb", "type": "github" }, "original": { @@ -1882,11 +1882,11 @@ "pyagentx-src": "pyagentx-src" }, "locked": { - "lastModified": 1718607898, - "narHash": "sha256-3L+S9SGeLraxSbpI+SK8lbxfmwKxeoiedPNit6ziazU=", + "lastModified": 1718826719, + "narHash": "sha256-GUDxzPz02GHOHlmao1cBGnpYATDlITSAjnhY6cZo0TA=", "owner": "matt1432", "repo": "nixos-pcsd", - "rev": "ed953beac399aecdb24b55ebb1e94002fd9872e8", + "rev": "f760b88cb53997547bf664a8e37512c270d67e64", "type": "github" }, "original": { @@ -2431,11 +2431,11 @@ "systems": "systems_7" }, "locked": { - "lastModified": 1718643458, - "narHash": "sha256-Z9s0xNmY4ELI+gyaHb0hR7qa+mggvH+0pqRw+QS41hU=", + "lastModified": 1718794850, + "narHash": "sha256-HJX49FVqbRWa3HwN5fVbPVLZ7lvrtni0nuiY2SRwhP4=", "owner": "danyspin97", "repo": "wpaperd", - "rev": "7e9d01e180809e27054fc5e7adb0782fa56769a0", + "rev": "d4a9cd8b751bed47bf57a93a7ee63054ba43e63b", "type": "github" }, "original": { @@ -2461,11 +2461,11 @@ ] }, "locked": { - "lastModified": 1718272114, - "narHash": "sha256-KsX7sAwkEFpXiwyjt0HGTnnrUU58wW1jlzj5IA/LRz8=", + "lastModified": 1718619174, + "narHash": "sha256-FWW68AVYmB91ZDQnhLMBNCUUTCjb1ZpO2k2KIytHtkA=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "24be4a26f0706e456fca1b61b8c79f7486a9e86d", + "rev": "c7894aa54f9a7dbd16df5cd24d420c8af22d5623", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 07e1832..494b8cc 100644 --- a/flake.nix +++ b/flake.nix @@ -232,7 +232,7 @@ }; nixpkgs = { owner = "NixOS"; - ref = "nixos-unstable-small"; + ref = "nixos-unstable"; repo = "nixpkgs"; type = "github"; }; diff --git a/home/firefox/addons/generated-firefox-addons.nix b/home/firefox/addons/generated-firefox-addons.nix index 9b9de8a..7cf8dcf 100644 --- a/home/firefox/addons/generated-firefox-addons.nix +++ b/home/firefox/addons/generated-firefox-addons.nix @@ -6,10 +6,10 @@ }: { "bitwarden" = buildFirefoxXpiAddon { pname = "bitwarden"; - version = "2024.4.2"; + version = "2024.6.2"; addonId = "{446900e4-71c2-419f-a6a7-df9c091e268b}"; - url = "https://addons.mozilla.org/firefox/downloads/file/4282854/bitwarden_password_manager-2024.4.2.xpi"; - sha256 = "19caac7131a37e558204c1f61cf1459502cc624b0284dc5837112c4742917da0"; + url = "https://addons.mozilla.org/firefox/downloads/file/4305759/bitwarden_password_manager-2024.6.2.xpi"; + sha256 = "c064e2d6601cb921ecd154e0d3bfd54d71af43da1947aa51666877ef0afd1436"; 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.";