ctucx.git: nixfiles

flake.nix: update to 22.11

diff --git a/configurations/common/default.nix b/configurations/common/default.nix
@@ -38,7 +38,7 @@
 
   nix = {
     nixPath      = lib.mkForce [ "nixpkgs=${lib.cleanSource pkgs.path}" ];
-    package      = pkgs.unstable.nix;
+    package      = pkgs.nix;
     extraOptions = ''
       experimental-features = nix-command flakes
     '';

diff --git a/configurations/common/programs/mcfly.nix b/configurations/common/programs/mcfly.nix
@@ -7,7 +7,7 @@
         enable                = true;
         enableBashIntegration = true;
         enableZshIntegration  = true;
-        enableFuzzySearch     = true;
+        fuzzySearchFactor     = 2;
       };
     };
   };

diff --git a/configurations/common/programs/utilities.nix b/configurations/common/programs/utilities.nix
@@ -27,9 +27,6 @@
         unzip
 
         smartmontools
-
-        phockup
-        garminexport
       ] ++ (if pkgs.stdenv.isLinux then [
         usbutils
         pciutils

@@ -37,7 +34,10 @@
         lm_sensors
 
         gptfdisk
-      ] else []);
+      ] else [
+        phockup
+        garminexport
+      ]);
     };
 
     programs = {

diff --git a/configurations/linux/default.nix b/configurations/linux/default.nix
@@ -12,11 +12,12 @@
   networking.hostName = lib.mkDefault args.name;
   networking.domain   = lib.mkDefault "ctu.cx";
 
-  i18n.defaultLocale  = "en_US.UTF-8";
+  i18n.defaultLocale    = "en_US.UTF-8";
+  i18n.supportedLocales = ["de_DE.UTF-8/UTF-8" "en_US.UTF-8/UTF-8"];
 
   nix = {
-    trustedUsers      = [ "@wheel" ];
-    autoOptimiseStore = true;
+    settings.trusted-users       = [ "@wheel" ];
+    settings.auto-optimise-store = true;
     optimise     = {
       automatic = true;
       dates     = [ "12:00" "15:00" "18:00" "21:00" ];

diff --git a/flake.lock b/flake.lock
@@ -48,11 +48,11 @@
         "stable": "stable"
       },
       "locked": {
-        "lastModified": 1667072567,
-        "narHash": "sha256-z8ciml6BOzVDX3MbRY22C5GonJrDxi2xrVuS6Gyxorc=",
+        "lastModified": 1668384235,
+        "narHash": "sha256-bt2drRd1v+efic9MLnO3KI2x96g+J4TxhKiQQKqvyik=",
         "owner": "zhaofengli",
         "repo": "colmena",
-        "rev": "5432fe488ebec7ee30aaea5fb18a759e30e59612",
+        "rev": "fff97f729086b4fc463e30d33d3350bcfa2838bb",
         "type": "github"
       },
       "original": {

@@ -69,11 +69,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1667419884,
-        "narHash": "sha256-oLNw87ZI5NxTMlNQBv1wG2N27CUzo9admaFlnmavpiY=",
+        "lastModified": 1668784520,
+        "narHash": "sha256-gGgVAMwYPPmrfnvnoRi6OkEB5KRsNTb9uYzEceLdO/g=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "cfc0125eafadc9569d3d6a16ee928375b77e3100",
+        "rev": "6349b99bc2b96ded34d068a88c7c5ced406b7f7f",
         "type": "github"
       },
       "original": {

@@ -155,19 +155,20 @@
       "inputs": {
         "nixpkgs": [
           "nixpkgs"
-        ]
+        ],
+        "utils": "utils"
       },
       "locked": {
-        "lastModified": 1667907331,
-        "narHash": "sha256-bHkAwkYlBjkupPUFcQjimNS8gxWSWjOTevEuwdnp5m0=",
+        "lastModified": 1669071065,
+        "narHash": "sha256-KBpgj3JkvlPsJ3duOZqFJe6tgr+wc75t8sFmgRbBSbw=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "6639e3a837fc5deb6f99554072789724997bc8e5",
+        "rev": "f7641a3ff398ccce952e19a199d775934e518c1d",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-22.05",
+        "ref": "release-22.11",
         "repo": "home-manager",
         "type": "github"
       }

@@ -212,11 +213,11 @@
     },
     "nix-std": {
       "locked": {
-        "lastModified": 1666216771,
-        "narHash": "sha256-WQ7+nqnkEPhEkCYwbGxnwXc0Bj/Wy+ndqlLCut2pNrg=",
+        "lastModified": 1669307590,
+        "narHash": "sha256-S6XTgYUoDOt+PBzUPQ5sTgAWwqKTjx0oQnp5MUJLPuI=",
         "owner": "chessai",
         "repo": "nix-std",
-        "rev": "b5d44b75771af26d372cad74a542fb15d7f5c7d8",
+        "rev": "661b635736794e42c450daf0c237866addd298e8",
         "type": "github"
       },
       "original": {

@@ -228,16 +229,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1668016843,
-        "narHash": "sha256-ioBuF+IAhmJO7s4ewEij1LkMxJvCCNCKXxMto/DU02I=",
+        "lastModified": 1669289248,
+        "narHash": "sha256-+ErmUe0ph4nJL2C+xwuIt2TR95fvGDy64jEtism5wps=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "fa842715565307b7e05cdb187b08c05f16ed08f1",
+        "rev": "73463c394af9fed20f3ce8cd491bf7c8271d20d8",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-22.05",
+        "ref": "nixos-22.11",
         "repo": "nixpkgs",
         "type": "github"
       }

@@ -259,11 +260,11 @@
     },
     "nixpkgsUnstable": {
       "locked": {
-        "lastModified": 1668086072,
-        "narHash": "sha256-msFoXI5ThCmhTTqgl27hpCXWhaeqxphBaleJAgD8JYM=",
+        "lastModified": 1669261230,
+        "narHash": "sha256-AjddxRPd5y5jge77281P3O8+Cnafj842Xg59rwV4x+0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "72d8853228c9758820c39b8659415b6d89279493",
+        "rev": "8e8b5f3b1e899bf5d250279578c0283705b8cdb4",
         "type": "github"
       },
       "original": {

@@ -294,7 +295,7 @@
           "nixpkgs"
         ],
         "nixpkgs-22_05": "nixpkgs-22_05",
-        "utils": "utils"
+        "utils": "utils_2"
       },
       "locked": {
         "lastModified": 1655930346,

@@ -329,6 +330,21 @@
     },
     "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"
+      }
+    },
+    "utils_2": {
+      "locked": {
         "lastModified": 1605370193,
         "narHash": "sha256-YyMTf3URDL/otKdKgtoMChu4vfVL3vCMkRqpGifhUn0=",
         "owner": "numtide",

diff --git a/flake.nix b/flake.nix
@@ -7,7 +7,7 @@
       type  = "github";
       owner = "NixOS";
       repo  = "nixpkgs";
-      ref   = "nixos-22.05";
+      ref   = "nixos-22.11";
     };
 
     nixpkgsUnstable = {

@@ -21,7 +21,7 @@
       type  = "github";
       owner = "nix-community";
       repo  = "home-manager";
-      ref   = "release-22.05";
+      ref   = "release-22.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 

diff --git a/machines/blechbuechse/darwin-configuration.nix b/machines/blechbuechse/darwin-configuration.nix
@@ -8,6 +8,7 @@
   networking.hostName     = "blechbuechse";
   networking.computerName = config.networking.hostName;
 
+  home-manager.users.leah.home.stateVersion = "22.05";
   system.stateVersion = 4;
 
 }

diff --git a/machines/lollo/gotosocial.nix b/machines/lollo/gotosocial.nix
@@ -12,6 +12,7 @@
 
   services.gotosocial = {
     enable   = true;
+    package  = pkgs.callPackage ../../pkgs/gotosocial-bin.nix {};
     settings = {
       application-name = "ctucx.gts";
 

diff --git a/machines/lollo/smarthome/zigbee2mqtt.nix b/machines/lollo/smarthome/zigbee2mqtt.nix
@@ -33,7 +33,7 @@
 
     zigbee2mqtt = {
       enable   = true;
-      package  = pkgs.unstable.zigbee2mqtt;
+      package  = pkgs.zigbee2mqtt;
       settings = {
         homeassistant = false;
         permit_join   = false;

diff --git a/modules/linux/gotosocial.nix b/modules/linux/gotosocial.nix
@@ -70,7 +70,9 @@ in {
     };
   };
 
-  config = lib.mkIf cfg.enable {
+  config = lib.mkIf cfg.enable (let
+    configFile = settingsFormat.generate "gotosocial-config.yaml" cfg.settings;
+  in {
     assertions = [
       {
         assertion = cfg.settings.host != null;

@@ -99,13 +101,11 @@ in {
 
     environment.systemPackages = [
       (pkgs.writeShellScriptBin "gotosocial" ''
-        exec ${cfg.package}/bin/gotosocial --config-path /etc/gotosocial/config.yaml "$@"
+        exec ${cfg.package}/bin/gotosocial --config-path ${configFile} "$@"
       '')
     ];
 
-    systemd.services = let
-      configFile = settingsFormat.generate "gotosocial-config.yaml" cfg.settings;
-    in {
+    systemd.services = {
       gotosocial-export = {
         description   = "gotosocial export";
 

@@ -179,6 +179,6 @@ in {
       };
     };
 
-  };
+  });
 
 }

diff --git a/pkgs/ctucx-things/default.nix b/pkgs/ctucx-things/default.nix
@@ -16,7 +16,10 @@ mkYarnPackage rec {
   #packageJSON = "${src}/package.json";
   #yarnLock    = "${src}/yarn.lock";
 
-  buildPhase   = "yarn build";
+  buildPhase   = ''
+    export NODE_OPTIONS=--openssl-legacy-provider
+    yarn build
+  '';
   distPhase    = "true";
   installPhase = ''
     mkdir -p $out

diff --git a/pkgs/gotosocial-bin.nix b/pkgs/gotosocial-bin.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
   pname = "gotosocial";
 
-  version = "0.4.0";
+  version = "0.5.2";
 
   src = fetchurl {
     url    = "https://github.com/superseriousbusiness/gotosocial/releases/download/v${version}/gotosocial_${version}_linux_amd64.tar.gz";
-    sha256 = "sha256-CwfePhBN+VPcWASIv0mROH64UksYXWAyZe5LT+/Xn3k=";
+    sha256 = "sha256-RPk75QVkbhsUSJYDK+03mErPHcOgQ1s7t7vINUoGNps";
   };
 
   nativeBuildInputs = [

diff --git a/pkgs/gotosocial/default.nix b/pkgs/gotosocial/default.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, mkYarnPackage, buildGo118Module, lib, pkgs, makeWrapper, installShellFiles, ... }:
+{ fetchFromGitHub, mkYarnPackage, buildGoModule, lib, pkgs, makeWrapper, installShellFiles, ... }:
 
 let
   pname   = "gotosocial";

@@ -29,13 +29,14 @@ let
       cp -r $src/assets/. ./assets
       cp -r $src/source/. ./source
 
+      export NODE_OPTIONS=--openssl-legacy-provider
       BUDO_BUILD=1 node ./source
     '';
     distPhase    = "true";
     installPhase = "cp -r assets $out";
   };
 
-in buildGo118Module rec {
+in buildGoModule rec {
   inherit pname version src;
 
   patches = [