diff --git a/fixups.nix b/fixups.nix index 81e966c..155b140 100644 --- a/fixups.nix +++ b/fixups.nix @@ -1,14 +1,2 @@ (pkgs: super: { - electrum = super.electrum.overrideAttrs (o: { - # todo: remove (194112) - postPatch = '' - # make compatible with protobuf4 by easing dependencies ... - substituteInPlace ./contrib/requirements/requirements.txt \ - --replace "protobuf>=3.12,<4" "protobuf>=3.12" - # ... and regenerating the paymentrequest_pb2.py file - protoc --python_out=. electrum/paymentrequest.proto - - ''; - }); - nginxStable = super.nginxStable.override { openssl = pkgs.openssl_1_1; }; }) diff --git a/flake.lock b/flake.lock index 4cac802..78bdd34 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1664140963, - "narHash": "sha256-pFxDtOLduRFlol0Y4ShE+soRQX4kbhaCNBtDOvx7ykw=", + "lastModified": 1665870395, + "narHash": "sha256-Tsbqb27LDNxOoPLh0gw2hIb6L/6Ow/6lIBvqcHzEKBI=", "owner": "ryantm", "repo": "agenix", - "rev": "6acb1fe5f8597d5ce63fc82bc7fcac7774b1cdf0", + "rev": "a630400067c6d03c9b3e0455347dc8559db14288", "type": "github" }, "original": { @@ -36,22 +36,6 @@ "type": "gitlab" } }, - "cachix": { - "locked": { - "lastModified": 1659446231, - "narHash": "sha256-hekabNdTdgR/iLsgce5TGWmfIDZ86qjPhxDg/8TlzhE=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "eabc38219184cc3e04a974fe31857d8e0eac098d", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-21.11", - "repo": "nixpkgs", - "type": "github" - } - }, "emacs-overlay": { "inputs": { "flake-utils": "flake-utils", @@ -60,11 +44,11 @@ ] }, "locked": { - "lastModified": 1664860004, - "narHash": "sha256-1+FKMhZH7se1Xobo8wRW6CW0Yz4isT9lkZcvYuwVfbs=", + "lastModified": 1668861223, + "narHash": "sha256-Y7Jc7n79h7vl7WGDohiSTpc4xdUx/B2n19+zMNjj0js=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "20dc7a0a1ea9c40201c8fe1e29b91a50b5ecba9b", + "rev": "909b090c1181644ef3def6a37a18e9e3d08d1b07", "type": "github" }, "original": { @@ -75,11 +59,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", + "lastModified": 1668681692, + "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", "owner": "edolstra", "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", + "rev": "009399224d5e398d03b22badca40a37ac85412a1", "type": "github" }, "original": { @@ -90,11 +74,11 @@ }, "flake-utils": { "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "type": "github" }, "original": { @@ -105,11 +89,11 @@ }, "flake-utils_2": { "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "type": "github" }, "original": { @@ -119,11 +103,26 @@ }, "flake-utils_3": { "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_4": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "type": "github" }, "original": { @@ -140,11 +139,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1664783440, - "narHash": "sha256-KlMwR7mUf5h8MPnzV7nGFUAt6ih/euW5xgvZ5x+hwvI=", + "lastModified": 1668788863, + "narHash": "sha256-FsdUG+YkRX7JZKZm6T44J2h+0pXB1sWA9AobyiozFK0=", "owner": "nix-community", "repo": "home-manager", - "rev": "e4e639dd4dc3e431aa5b5f95325f9a66ac7e0dd9", + "rev": "948d1f8a5cef55a281d4f5d17f3b79df6c82fce1", "type": "github" }, "original": { @@ -158,11 +157,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1664107902, - "narHash": "sha256-58SzPL6ZhSkijl8J+HNTgZc2IManB5CYouuoWlulf8k=", + "lastModified": 1668341496, + "narHash": "sha256-RztQBdjzVOG8TRoWikG62//kPcC1JSHaqYeM+UFl46k=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "d838f91d10773418622421e8580ddb862cde3ff0", + "rev": "0d285b79d0478307e5e180161174169263bea84a", "type": "github" }, "original": { @@ -171,13 +170,35 @@ "type": "github" } }, + "nix-eval-jobs": { + "inputs": { + "flake-utils": "flake-utils_4", + "nixpkgs": [ + "nixpkgs-wayland", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1668649443, + "narHash": "sha256-gYeK4JgEMldDfM4wiHUEhLW9l+RZlR54GCo8kzRb9a8=", + "owner": "nix-community", + "repo": "nix-eval-jobs", + "rev": "55bf77092362b801df81ad66edfdb6d50baf1839", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-eval-jobs", + "type": "github" + } + }, "nixos-hardware": { "locked": { - "lastModified": 1664628729, - "narHash": "sha256-A1J0ZPhBfZZiWI6ipjKJ8+RpMllzOMu/An/8Tk3t4oo=", + "lastModified": 1668334946, + "narHash": "sha256-omMbUj4r5DVBWh7KxkoO/Z/1V1shVR6Ls4jXNB4mr3U=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "3024c67a2e9a35450558426c42e7419ab37efd95", + "rev": "e0452b33ab0ef16ffe075e980644ed92a6a200bb", "type": "github" }, "original": { @@ -210,11 +231,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1664780719, - "narHash": "sha256-Oxe6la5dSqRfJogjtY4sRzJjDDqvroJIVkcGEOT87MA=", + "lastModified": 1668765800, + "narHash": "sha256-rC40+/W6Hio7b/RsY8SvQPKNx4WqNcTgfYv8cUMAvJk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fd54651f5ffb4a36e8463e0c327a78442b26cbe7", + "rev": "52b2ac8ae18bbad4374ff0dd5aeee0fdf1aea739", "type": "github" }, "original": { @@ -241,11 +262,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1664067728, - "narHash": "sha256-uUhnCcjlx99GA+PEN1EyDobrBFeVFIcdL6aBnhV7oB4=", + "lastModified": 1668300937, + "narHash": "sha256-E9/ir9++M58btaHOqugyrE4lfVnM0gIq5M9QWhGX0aM=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "b627e4dc7430fa35fd4710987077f96c7b5623f5", + "rev": "41386dc5b4915d0d5716e9d09dbf372ea3bd24f3", "type": "github" }, "original": { @@ -287,19 +308,19 @@ }, "nixpkgs-wayland": { "inputs": { - "cachix": "cachix", "flake-compat": "flake-compat", "lib-aggregate": "lib-aggregate", + "nix-eval-jobs": "nix-eval-jobs", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1664302111, - "narHash": "sha256-1f6Jg887PM9F91+HjIewp6aAPNK3ySj96kfLh9rS4IM=", + "lastModified": 1668785759, + "narHash": "sha256-NpvIlLdWHdofGj9h3r/V9iHuB2jIGpFtrBl8ZpcY8kw=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "4370a181d2c7cbefa4cd1c8bbae2e4a16b2573ae", + "rev": "58e628130f7b2906121478d5a006a35be7af8a5a", "type": "github" }, "original": { @@ -324,11 +345,11 @@ }, "utils": { "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "type": "github" }, "original": { diff --git a/home-manager/desktop.nix b/home-manager/desktop.nix index 081d256..dd16801 100644 --- a/home-manager/desktop.nix +++ b/home-manager/desktop.nix @@ -164,10 +164,7 @@ in { programs.firefox = { enable = true; - package = pkgs.wrapFirefox pkgs.firefox-bin.unwrapped { - forceWayland = true; - applicationName = "firefox"; - }; + package = pkgs.firefox-bin; }; home.sessionVariables = { MOZ_USE_XINPUT2 = "1"; diff --git a/nixos/machines/frumar/default.nix b/nixos/machines/frumar/default.nix index ddf11ca..c8cba91 100644 --- a/nixos/machines/frumar/default.nix +++ b/nixos/machines/frumar/default.nix @@ -111,14 +111,16 @@ }; services.grafana = { enable = true; - addr = "0.0.0.0"; - domain = "grafana.yori.cc"; - rootUrl = "https://grafana.yori.cc/"; - extraOptions = { - AUTH_BASIC_ENABLED = "false"; - AUTH_DISABLE_LOGIN_FORM = "true"; - AUTH_GOOGLE_ENABLED = "true"; - AUTH_GOOGLE_ALLOW_SIGN_UP = "false"; + settings = { + server.http_addr = "0.0.0.0"; + server.domain = "grafana.yori.cc"; + server.rootUrl = "https://grafana.yori.cc/"; + "auth.basic".enabled = false; + "auth.google" = { + enabled = true; + allow_sign_up = false; + }; + auth.disable_login_form = true; }; }; services.zigbee2mqtt = { diff --git a/nixos/roles/workstation.nix b/nixos/roles/workstation.nix index 29fca5b..3bf6fe9 100644 --- a/nixos/roles/workstation.nix +++ b/nixos/roles/workstation.nix @@ -47,9 +47,9 @@ # development services.postgresql = { - enable = true; + enable = false; enableTCPIP = true; - package = pkgs.postgresql_10; + package = pkgs.postgresql_11; }; # git @@ -61,8 +61,6 @@ security.rtkit.enable = true; services.pipewire = { enable = true; - # TODO (segfaults, 192044) - package = pkgs.pipewire.override { libcameraSupport = false; }; alsa.enable = true; alsa.support32Bit = true; # todo: support32bit? pulse.enable = true;