From 5ee5e5fc52b3e6686d96317cf265772c7b57aca2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Geoffrey=20=E2=80=9CFrogeye=E2=80=9D=20Preud=27homme?=
 <geoffrey@frogeye.fr>
Date: Thu, 30 Nov 2023 19:02:32 +0100
Subject: [PATCH] Upgrade to NixOS 23.11

---
 add_channels.sh | 8 ++++----
 hm/extra.nix    | 2 +-
 hm/style.nix    | 3 ++-
 hm/vim.nix      | 9 ++++-----
 os/common.nix   | 1 -
 os/geoffrey.nix | 2 +-
 6 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/add_channels.sh b/add_channels.sh
index 86094df..5ad032b 100755
--- a/add_channels.sh
+++ b/add_channels.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 
-# TODO Surely there's more elegant?
+# TODO Flakes
 
-nix-channel --add https://nixos.org/channels/nixos-23.05 nixpkgs
-# Below probably only needed on non-NixOS
-nix-channel --add https://github.com/nix-community/home-manager/archive/release-23.05.tar.gz home-manager
+nix-channel --add https://nixos.org/channels/nixos-23.11 nixpkgs
+nix-channel --add https://github.com/nix-community/home-manager/archive/release-23.11.tar.gz home-manager
+nix-channel --add https://github.com/NixOS/nixos-hardware/archive/8772491ed75f150f02552c60694e1beff9f46013.tar.gz nixos-hardware
 nix-channel --update
diff --git a/hm/extra.nix b/hm/extra.nix
index 2a7fa0d..72461e2 100644
--- a/hm/extra.nix
+++ b/hm/extra.nix
@@ -47,7 +47,7 @@
       # TODO wine-gecko wine-mono lib32-libpulse (?)
 
       # gaming
-      steam
+      # steam # FIXME Requires i686-linux or something. IIRC the package says to use the NixOS config and not it directly.
       yuzu-mainline
       minecraft
       # TODO factorio
diff --git a/hm/style.nix b/hm/style.nix
index e177958..ed8362a 100644
--- a/hm/style.nix
+++ b/hm/style.nix
@@ -2,7 +2,8 @@
 let
   stylix = builtins.fetchGit {
     url = "https://github.com/danth/stylix.git";
-    ref = "release-23.05";
+    # No 23.11 branch last I checked
+    rev = "8b3f61727f3b86c27096c3c014ae602aa40670ba";
   };
 in
 {
diff --git a/hm/vim.nix b/hm/vim.nix
index bcad6fc..18be6d7 100644
--- a/hm/vim.nix
+++ b/hm/vim.nix
@@ -2,7 +2,7 @@
 let
   nixvim = import (builtins.fetchGit {
     url = "https://github.com/nix-community/nixvim";
-    ref = "nixos-23.05";
+    ref = "nixos-23.11";
   });
   vim-shot-f = pkgs.vimUtils.buildVimPluginFrom2Nix {
     pname = "vim-shot-f";
@@ -199,8 +199,7 @@ in
               # TODO Could add some, could also remove some
             };
           };
-          # FIXME phpactor. Only from 23.11
-          # phpactor.enable = true; # PHP
+          phpactor.enable = true; # PHP
           rnix-lsp.enable = true; # Nix
           # FIXME sqlls
           yamlls.enable = true; # YAML
@@ -226,7 +225,7 @@ in
         # indent = true; # Not very working last time I tried apparently
       };
       # TODO Investigate https://github.com/nvim-treesitter/nvim-treesitter-textobjects
-      indent-blankline.enable = true; # 23.11 integrate with rainbow-delimiters and use more of the options
+      indent-blankline.enable = true; # TODO integrate with rainbow-delimiters and use more of the options
 
       undotree.enable = true; # Navigate edition history
 
@@ -270,7 +269,7 @@ in
 
       # Treesitter
       nvim-ts-rainbow # Randomly color parenthesis pairs
-      # 23.11: Replace with plugins.rainbow-delimiters
+      # TODO Replace with plugins.rainbow-delimiters
 
       # Snippets
       vim-vsnip
diff --git a/os/common.nix b/os/common.nix
index b65873b..388fe34 100644
--- a/os/common.nix
+++ b/os/common.nix
@@ -55,7 +55,6 @@
     chrony = {
       enable = true;
       servers = map (n: "${toString n}.europe.pool.ntp.org") (lib.lists.range 0 3);
-      extraConfig = "rtcsync"; # See 23.11 release notes
     };
 
     # Prevent power button from shutting down the computer.
diff --git a/os/geoffrey.nix b/os/geoffrey.nix
index d828426..556663d 100644
--- a/os/geoffrey.nix
+++ b/os/geoffrey.nix
@@ -1,7 +1,7 @@
 { pkgs, config, ... }:
 {
   imports = [
-    "${builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/release-23.05.tar.gz"}/nixos"
+    <home-manager/nixos>
   ];
 
   users.users.geoffrey = {