chore(3p/sources): Bump channels & overlays r/6361

* //3p/sources: switch stable channel from 21.11 (!) to 23.05

* //users: adapt to emacsUnstable to emacs-unstable rename

* //users/grfn: use default Linux kernel version everywhere,
  as 5.15 has broken in this version of nixos-unstable.

* //3p/cgit: adapt to git 2.41.0

  The committed changes are the same as the [patch1] I've submitted
  to cgit-pink which is in turn based on Christian Hesse's [patch2].

patch1: https://causal.agency/list/thread/20230624144033.802270-1-sternenseemann%40systemli.org.html#20230624144033.802270-2-sternenseemann@systemli.org>
patch2: https://lists.zx2c4.com/pipermail/cgit/2023-June/004843.html

Co-authored-by: Christian Hesse <mail@eworm.de>

Change-Id: I549a62e7c85c66d772edda997819a40f2d5835d7
Reviewed-on: https://cl.tvl.fyi/c/depot/+/8855
Autosubmit: sterni <sternenseemann@systemli.org>
Reviewed-by: tazjin <tazjin@tvl.su>
Tested-by: BuildkiteCI
Reviewed-by: flokli <flokli@flokli.de>
Reviewed-by: grfn <grfn@gws.fyi>

5 files changed, 3 insertions, 7 deletions

diff --git a/users/grfn/system/home/modules/emacs.nix b/users/grfn/system/home/modules/emacs.nix
index b84b36843781..4130379c3d1f 100644
--- a/users/grfn/system/home/modules/emacs.nix
+++ b/users/grfn/system/home/modules/emacs.nix
@@ -65,7 +65,7 @@ in
 
       programs.emacs = {
         enable = true;
-        package = pkgs.emacsUnstable;
+        package = pkgs.emacs-unstable;
         extraPackages = (epkgs:
           (with epkgs; [
             tvlPackages.dottime
diff --git a/users/grfn/system/system/machines/ogopogo.nix b/users/grfn/system/system/machines/ogopogo.nix
index eb799621c3d2..82c0163bc8f4 100644
--- a/users/grfn/system/system/machines/ogopogo.nix
+++ b/users/grfn/system/system/machines/ogopogo.nix
@@ -23,8 +23,6 @@
       kernelModules = [ ];
     };
 
-    kernelPackages = pkgs.linuxPackages_5_15;
-
     kernelModules = [ "kvm-amd" ];
     blacklistedKernelModules = [ ];
     extraModulePackages = [ ];
diff --git a/users/grfn/system/system/machines/yeren.nix b/users/grfn/system/system/machines/yeren.nix
index f104debfc85d..de1734e039b6 100644
--- a/users/grfn/system/system/machines/yeren.nix
+++ b/users/grfn/system/system/machines/yeren.nix
@@ -34,8 +34,6 @@
       };
     };
 
-    kernelPackages = pkgs.linuxPackages_5_15;
-
     kernelModules = [ "kvm-intel" ];
     blacklistedKernelModules = [ "psmouse" ];
     extraModulePackages = [
diff --git a/users/tazjin/emacs/default.nix b/users/tazjin/emacs/default.nix
index 23a0f2bed12f..fb8128dc97fb 100644
--- a/users/tazjin/emacs/default.nix
+++ b/users/tazjin/emacs/default.nix
@@ -3,7 +3,7 @@
 { lib, pkgs, ... }:
 
 pkgs.makeOverridable
-  ({ emacs ? pkgs.emacsUnstable }:
+  ({ emacs ? pkgs.emacs-unstable }:
   let
     emacsWithPackages = (pkgs.emacsPackagesFor emacs).emacsWithPackages;
 
diff --git a/users/tazjin/nixos/modules/physical.nix b/users/tazjin/nixos/modules/physical.nix
index 0105d9f3a2a1..b9e06c3cd725 100644
--- a/users/tazjin/nixos/modules/physical.nix
+++ b/users/tazjin/nixos/modules/physical.nix
@@ -24,7 +24,7 @@ in
       direnv
       dnsutils
       electrum
-      emacsUnstable # emacsclient
+      emacs-unstable # emacsclient
       exa
       fd
       file