From 1cf49d44c6cf800d294e10cb008e4980ce83015a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 2 Dec 2022 14:40:11 -0300 Subject: [PATCH] update to 22.11 --- flake.lock | 82 ++++++++++++++++++++++++---------------- flake.nix | 4 +- overlays/default.nix | 2 +- system/gitlab-runner.nix | 4 +- system/sway.nix | 1 - user/home.nix | 2 +- 6 files changed, 55 insertions(+), 40 deletions(-) diff --git a/flake.lock b/flake.lock index 867df88..f1e85e4 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "alacritty-sixel": { "flake": false, "locked": { - "lastModified": 1666301736, - "narHash": "sha256-hfGwOBDAlBcx+PoitMWihy3TA1PI1g5kdjIPpYwLY/w=", + "lastModified": 1669942690, + "narHash": "sha256-lAnhvb3b53leowRBRKZzNOmGUCNQCQHlh0IsYHDimz0=", "owner": "ayosec", "repo": "alacritty", - "rev": "48a388ad91d268ed97355df629a22e2d476aee2a", + "rev": "fc97c07516658f0a10970189d65e2766fb1071c3", "type": "github" }, "original": { @@ -92,19 +92,20 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ] + ], + "utils": "utils" }, "locked": { - "lastModified": 1667907331, - "narHash": "sha256-bHkAwkYlBjkupPUFcQjimNS8gxWSWjOTevEuwdnp5m0=", + "lastModified": 1669724862, + "narHash": "sha256-GwLonjmyhnTGQRNfKcUCgMSKYj49ZehjjJulaM/yH18=", "owner": "nix-community", "repo": "home-manager", - "rev": "6639e3a837fc5deb6f99554072789724997bc8e5", + "rev": "e891b060e7d11bb8f7dedb86a41d804891a6f5a9", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-22.05", + "ref": "release-22.11", "repo": "home-manager", "type": "github" } @@ -117,11 +118,11 @@ "wlroots": "wlroots" }, "locked": { - "lastModified": 1669309881, - "narHash": "sha256-Au7BTeUe++JCOWwvO4O3xLpWlZlbmsOJK+EurjIbgqE=", + "lastModified": 1669928517, + "narHash": "sha256-15Z0bup25My/e6QdGNoT8yWWqu9CJJAIgH7dkqczUcY=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "379597e78f512ff2d64a83ba3eb21b7a3444d4f9", + "rev": "bf52545a9136bff63fdc2c2856f358197fb2c2c5", "type": "github" }, "original": { @@ -155,11 +156,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1669391194, - "narHash": "sha256-4oWcXqyBYPHF+Wt8AxRhWk70O1qVJPkyBw2IhxJtj6k=", + "lastModified": 1669929738, + "narHash": "sha256-/j33Qvg9ciN8qfrjuEjs1fB61Av0/3HuQxXdLkoAn8E=", "owner": "oxalica", "repo": "nil", - "rev": "afec5fed829ee193de7e8c62e1fb4bd55140f4ac", + "rev": "ef9bdb801e73ffe95bf7dee69f6c78fcaae34c71", "type": "github" }, "original": { @@ -185,11 +186,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1669230746, - "narHash": "sha256-+rU3DixJnygpJsGhhp6OvViruJux4TaiCz4IO+DdtZU=", + "lastModified": 1669791787, + "narHash": "sha256-KBfoA2fOI5+wCrm7PR+j7jHqXeTkVRPQ0m5fcKchyuU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "42337aad353c5efff4382d7bf99deda491459845", + "rev": "e76c78d20685a043d23f5f9e0ccd2203997f1fb1", "type": "github" }, "original": { @@ -200,26 +201,26 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1669196918, - "narHash": "sha256-st3uS3X/qIdyleFN3HUmDJkqIhHfkgxuDK3J8XyQwls=", + "lastModified": 1669834992, + "narHash": "sha256-YnhZGHgb4C3Q7DSGisO/stc50jFb9F/MzHeKS4giotg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f10cdcf31dd2a436edbf7f0ad82c44b911804bc8", + "rev": "596a8e828c5dfa504f91918d0fa4152db3ab5502", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-22.05", + "ref": "nixos-22.11", "type": "indirect" } }, "nur": { "locked": { - "lastModified": 1669288341, - "narHash": "sha256-lGwsFdSDb+IBXSJwKhNLOP2yt7PDXxbL0uxN9ZVOy8I=", + "lastModified": 1669805596, + "narHash": "sha256-g1CPQZ+1jGhY4bsjppk+gH5jfzzqmPlqGHg0zSYS3Hw=", "owner": "nix-community", "repo": "NUR", - "rev": "107aad385e04edf5b4bd4136bf8defcd890ecfc7", + "rev": "c81b1e527f3a220abfa9bf8096153d52784c5007", "type": "github" }, "original": { @@ -307,11 +308,11 @@ ] }, "locked": { - "lastModified": 1669170936, - "narHash": "sha256-TKPH4Pzkjw5gAPo9hejs3O4mWJW6V/RSiOj8UuSFRTs=", + "lastModified": 1669775522, + "narHash": "sha256-6xxGArBqssX38DdHpDoPcPvB/e79uXyQBwpBcaO/BwY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "c90c223c4aef334356029b89c72bb65e26f7efe6", + "rev": "3158e47f6b85a288d12948aeb9a048e0ed4434d6", "type": "github" }, "original": { @@ -336,6 +337,21 @@ "type": "github" } }, + "utils": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "wegank": { "inputs": { "nixpkgs": [ @@ -343,11 +359,11 @@ ] }, "locked": { - "lastModified": 1668857272, - "narHash": "sha256-wsBWW5LfLfDowZTpMc7eq1KtGpo60lVCe2N28IST/W8=", + "lastModified": 1669567481, + "narHash": "sha256-vB3ZDncmy1u2MHaHdFHisg6x8igmzfeLsKCyxcQnUB4=", "owner": "wegank", "repo": "nur-packages", - "rev": "2fa9ddc42791463d331be3c9f7eadb959da82dbd", + "rev": "7d25f2e0f982030dec11d2a9841757fdf5e6cb1b", "type": "github" }, "original": { @@ -360,11 +376,11 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1668785720, - "narHash": "sha256-CX+PYJP2PxZWL380WzyMNsrfRgIb/78brdwvDg/zj28=", + "lastModified": 1669925104, + "narHash": "sha256-xMHfW+/G9MieN/5tXHUA5/ztE8dkE093cNFTEUgcwxI=", "owner": "wlroots", "repo": "wlroots", - "rev": "4ff46e6cf9463e594605928feeb7c55cf323b5e7", + "rev": "c8eb24d30e18c165728b8788a10716611c3b633d", "type": "gitlab" }, "original": { diff --git a/flake.nix b/flake.nix index ae2c97b..e5cd452 100644 --- a/flake.nix +++ b/flake.nix @@ -1,9 +1,9 @@ { description = "My system config"; inputs = { - nixpkgs.url = "nixpkgs/nixos-22.05"; + nixpkgs.url = "nixpkgs/nixos-22.11"; nixpkgs-unstable.url = "nixpkgs/nixos-unstable"; - home-manager.url = "github:nix-community/home-manager/release-22.05"; + home-manager.url = "github:nix-community/home-manager/release-22.11"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; nur.url = "github:nix-community/NUR"; diff --git a/overlays/default.nix b/overlays/default.nix index 26af614..e39f8d0 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -18,7 +18,7 @@ src = inputs.alacritty-sixel; cargoDeps = old-alacritty.cargoDeps.overrideAttrs (prev.lib.const { inherit src; - outputHash = "sha256-svZ/ySK09m4KVJE5LBLtD7ZEoExGwpFn4UP5tfhGKMc="; + outputHash = "sha256-jqjYMVkH32z5EFgafiOYAOc5Q/IYs0jjJeqRb0L6WsY="; }); })); ranger = (prev.ranger.overridePythonAttrs (old-ranger: rec { diff --git a/system/gitlab-runner.nix b/system/gitlab-runner.nix index d243ffd..5670d19 100644 --- a/system/gitlab-runner.nix +++ b/system/gitlab-runner.nix @@ -1,9 +1,9 @@ { config, pkgs, lib, ... }: { boot.kernel.sysctl."net.ipv4.ip_forward" = true; virtualisation.docker.enable = true; - services.gitlab-runner = with lib; { + services.gitlab-runner = { enable = true; - concurrent = 4; + settings.concurrent = 4; services = { ci_test = { registrationConfigFile = "/srv/gitlab-runner/env/ci_test"; diff --git a/system/sway.nix b/system/sway.nix index ee37915..2bd7e85 100644 --- a/system/sway.nix +++ b/system/sway.nix @@ -15,7 +15,6 @@ wlr.enable = true; # gtk portal needed to make gtk apps happy extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; - gtkUsePortal = true; }; services.greetd = let greetd_main_script = pkgs.writeShellScriptBin "main" '' diff --git a/user/home.nix b/user/home.nix index ac4ba70..f613e70 100644 --- a/user/home.nix +++ b/user/home.nix @@ -92,7 +92,7 @@ in { docker-compose gnumake mariadb - php74 + # php74 nodePackages.intelephense nodePackages.typescript-language-server nodejs