From 28b2f25aa15a14946435f2b805d939f5f0ddc003 Mon Sep 17 00:00:00 2001
From: Konstantin Nazarov <mail@knazarov.com>
Date: Mon, 21 Aug 2023 23:42:02 +0100
Subject: [PATCH] Switch to a stable nixos channel (23.05)

---
 configuration.nix                   | 28 ++++++++++++----------------
 flake.lock                          | 20 +++++++++++---------
 flake.nix                           |  4 ++--
 nodes/knazarovcom/configuration.nix |  3 ++-
 4 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index 09b98d1..61dd0ef 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -320,20 +320,16 @@ in
 
   services.keyd = {
     enable = true;
-    keyboards = {
-      default = {
-        ids = [ "*" ];
-        settings = {
-          main = {
-            capslock = "overload(control, esc)";
-            leftalt = "layer(meta_mac)";
-            leftmeta = "layer(alt)";
-          };
-          "meta_mac:M" = {
-            c = "C-insert";
-            v = "S-insert";
-          };
-        };
+    ids = [ "*" ];
+    settings = {
+      main = {
+        capslock = "overload(control, esc)";
+        leftalt = "layer(meta_mac)";
+        leftmeta = "layer(alt)";
+      };
+      "meta_mac:M" = {
+        c = "C-insert";
+        v = "S-insert";
       };
     };
   };
@@ -377,7 +373,7 @@ in
   services.pcscd.enable = true;
 
   fonts.fontDir.enable = true;
-  fonts.packages = with pkgs; [
+  fonts.fonts = with pkgs; [
     dejavu_fonts
     source-code-pro
     font-awesome # for waybar indicators
@@ -536,7 +532,7 @@ in
       };
       extraConfig = ''
         for_window [title="mylauncher"] floating enable
-        for_window [title="Firefox.*Sharing Indicator"] kill;
+        for_window [title="Firefox.*Sharing Indicator"] floating enable;
         default_border pixel 3
       '';
     };
diff --git a/flake.lock b/flake.lock
index be96b08..e3d8116 100755
--- a/flake.lock
+++ b/flake.lock
@@ -69,15 +69,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1691856649,
-        "narHash": "sha256-1/KYCwNyOPpUoyno9Yj3zMHITQaW+wPzVlJFPOPPCo4=",
+        "lastModified": 1692099905,
+        "narHash": "sha256-/pSusGhmIdSdAaywQRFA5dVbfdIzlWQTecM+E46+cJ0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "406d34d919e9e8b831b531782cf5ef6995188566",
+        "rev": "2a6679aa9cc3872c29ba2a57fe1b71b3e3c5649f",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
+        "ref": "release-23.05",
         "repo": "home-manager",
         "type": "github"
       }
@@ -89,11 +90,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1692466573,
-        "narHash": "sha256-edhooKG7fVDyzOV1ZNTcf5FBisffEeV62Ez25/Mmzds=",
+        "lastModified": 1692564691,
+        "narHash": "sha256-v8wXjqYnWsTjXAi+sOPsAoxWXQumsAM6K9c6N2dlEIQ=",
         "owner": "~knazarov",
         "repo": "knazarov.com",
-        "rev": "6415e2fdd494e2aac7fa958f7eaabd54e06d854b",
+        "rev": "7ff545d3eea9d49f7f9fb633fd14fa9d4b06643a",
         "type": "sourcehut"
       },
       "original": {
@@ -104,15 +105,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1692378602,
-        "narHash": "sha256-N19F6FB3DwMReFke8XX2Mx02g+wtrMbg9rEVM+BsGSI=",
+        "lastModified": 1692525914,
+        "narHash": "sha256-MUgZ9/9mE/EbEQA6JPdcQHkjoR5fgvaKhpy6UO67uEc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2f4e3f6fa553264d3b8bcf4d3561c0134b625afa",
+        "rev": "475d5ae2c4cb87b904545bdb547af05681198fcc",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
+        "ref": "nixos-23.05",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 417e4e2..8bb27d6 100755
--- a/flake.nix
+++ b/flake.nix
@@ -3,9 +3,9 @@
 
 {
   inputs = {
-    nixpkgs.url = github:NixOS/nixpkgs;
+    nixpkgs.url = github:NixOS/nixpkgs/nixos-23.05;
     nixpkgs-stable.url = github:NixOS/nixpkgs/nixos-23.05;
-    home-manager.url = github:nix-community/home-manager;
+    home-manager.url = github:nix-community/home-manager/release-23.05;
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
     emacs-overlay.url = github:nix-community/emacs-overlay;
     emacs-overlay.inputs.nixpkgs.follows = "nixpkgs";
diff --git a/nodes/knazarovcom/configuration.nix b/nodes/knazarovcom/configuration.nix
index 928dd55..c4a1375 100644
--- a/nodes/knazarovcom/configuration.nix
+++ b/nodes/knazarovcom/configuration.nix
@@ -42,7 +42,8 @@
         default 0;
         ~*(AhrefsBot|PetalBot|bingbot|gptbot|ZoominfoBot|BLEXBot|Bytespider) 1;
         ~*(DecompilationBot|Amazonbot|Barkrowler|SeznamBot|SemrushBot) 1;
-        ~*(MJ12bot) 1;
+        ~*(MJ12bot|IonCrawl|webprosbot|Sogou|paloaltonetworks|CensysInspect) 1;
+        ~*(DotBot|ev-crawler) 1;
       }
     '';
     virtualHosts = {