From 1d08715f79e5554fd3948c52387397f2a3dba59b Mon Sep 17 00:00:00 2001
From: Ricard Illa <rilla@monotremata.xyz>
Date: Sat, 21 Jan 2023 17:01:08 +0100
Subject: [PATCH] updated flake lock

---
 flake.lock             | 24 ++++++++++++------------
 home/dav/default.nix   |  1 -
 home/maker/default.nix |  4 ++--
 home/music/default.nix |  4 ++--
 home/nixos-common.nix  |  4 +---
 nixos/common.nix       |  8 +++++---
 6 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/flake.lock b/flake.lock
index 184b0b0..eac1301 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1671891118,
-        "narHash": "sha256-+GJYiT7QbfA306ex4sGMlFB8Ts297pn3OdQ9kTd4aDw=",
+        "lastModified": 1673295039,
+        "narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "267040e7a2b8644f1fdfcf57b7e808c286dbdc7b",
+        "rev": "87b9d090ad39b25b2400029c64825fc2a8868943",
         "type": "github"
       },
       "original": {
@@ -29,11 +29,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1672318366,
-        "narHash": "sha256-DBUVFooXtE4boZk1LvJ8sTg3nxMmJvNAJQ4lpjxDH5U=",
+        "lastModified": 1674250603,
+        "narHash": "sha256-SBolFspxBHpW3hCCDNAFXUiO2mucmkVmf17UmSIK3Cs=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "cbacdaba3c7b361defb36e1cdfa03ae4e74eb4a8",
+        "rev": "275ab728912006eecb549338a50f24f294a7cfb7",
         "type": "github"
       },
       "original": {
@@ -60,11 +60,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1672322014,
-        "narHash": "sha256-HEYUb2pxm9SUgqvg8eDpFUl6UPXmd7USNWAew115zL4=",
+        "lastModified": 1673803274,
+        "narHash": "sha256-zaJDlHFXewT4KUsidMpRcPE+REymGH1Y3Eoc3Pjv4Xs=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "e2f9c6f7360f3e0f7b0bc2a3e7193a290c5d4c81",
+        "rev": "7bd6b87b3712e68007823e8dd5c37ee9b114fee3",
         "type": "github"
       },
       "original": {
@@ -76,11 +76,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1672262501,
-        "narHash": "sha256-ZNXqX9lwYo1tOFAqrVtKTLcJ2QMKCr3WuIvpN8emp7I=",
+        "lastModified": 1674120619,
+        "narHash": "sha256-xLT1FQl7/jNPOEq5q/vmc3AExt1V9LtcjM+QY2+MUpA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e182da8622a354d44c39b3d7a542dc12cd7baa5f",
+        "rev": "d7705c01ef0a39c8ef532d1033bace8845a07d35",
         "type": "github"
       },
       "original": {
diff --git a/home/dav/default.nix b/home/dav/default.nix
index 8df8e84..a0bbc42 100644
--- a/home/dav/default.nix
+++ b/home/dav/default.nix
@@ -8,7 +8,6 @@ let
   };
 in {
   imports = [ ./common.nix ];
-  # home.packages = [ davsync pkgs.vdirsyncer pkgs.khal pkgs.khard pkgs.abook ];
   home.packages =
     [ davsync pkgs.vdirsyncer stablePkgs.khal pkgs.khard pkgs.abook ];
 }
diff --git a/home/maker/default.nix b/home/maker/default.nix
index 3733f0a..b9f2bd0 100644
--- a/home/maker/default.nix
+++ b/home/maker/default.nix
@@ -2,12 +2,12 @@
 
 {
   home.packages = [
-    pkgs.esphome
+    stablePkgs.esphome
     pkgs.freecad
     pkgs.kicad-small
     pkgs.meshlab
     pkgs.openscad
-    pkgs.platformio
+    stablePkgs.platformio
     pkgs.printrun
     pkgs.slic3r
   ];
diff --git a/home/music/default.nix b/home/music/default.nix
index 9e5f182..c3c3579 100644
--- a/home/music/default.nix
+++ b/home/music/default.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, pkgs, stablePkgs, ... }:
 
 #let
 #  ardour-windows-vst = pkgs.ardour.overrideAttrs (old: {
@@ -14,7 +14,7 @@
     pkgs.fluidsynth
     pkgs.haskellPackages.tidal
     pkgs.helm
-    pkgs.helvum
+    stablePkgs.helvum
     pkgs.hydrogen
     pkgs.jack2
     pkgs.lmms
diff --git a/home/nixos-common.nix b/home/nixos-common.nix
index 6d77481..c1ca3d1 100644
--- a/home/nixos-common.nix
+++ b/home/nixos-common.nix
@@ -136,8 +136,6 @@
     TERMINAL = "${pkgs.alacritty}/bin/alacritty";
     CM_LAUNCHER = "rofi"; # for clipmenu
     LEDGER_FILE = "${config.home.homeDirectory}/finance/2021.journal";
-    QT_QPA_PLATFORMTHEME = "qt5ct";
-
   };
 
   home.packages = with pkgs; [
@@ -176,7 +174,7 @@
     shellcheck
     signify
     unzip
-    vagrant
+    stablePkgs.vagrant
     virt-manager
     wget
   ];
diff --git a/nixos/common.nix b/nixos/common.nix
index 65b8b56..428ceda 100644
--- a/nixos/common.nix
+++ b/nixos/common.nix
@@ -216,8 +216,10 @@
 
   services.openssh = {
     enable = true;
-    passwordAuthentication = false;
-    permitRootLogin = "no";
+    settings = {
+        PermitRootLogin = "no";
+        PasswordAuthentication = false;
+    };
 
     hostKeys = [{
       path = "/etc/ssh/ssh_host_ed25519_key";
@@ -243,7 +245,7 @@
     docker.enable = true;
     podman = {
       enable = true;
-      defaultNetwork.dnsname.enable = true;
+      defaultNetwork.settings.dns_enabled = true;
     };
     libvirtd.enable = true;
     spiceUSBRedirection.enable = true;