From c9780f9f010f54eae1226d68325c296dfecc3b85 Mon Sep 17 00:00:00 2001
From: Christoph Heiss <christoph@c8h4.io>
Date: Wed, 3 Jul 2024 16:56:59 +0200
Subject: [PATCH] flake: bump nixpkgs, home-manager, et al. to ~30-06-2024

Signed-off-by: Christoph Heiss <christoph@c8h4.io>
---
 .prettierrc.json               |  2 +-
 flake.nix                      | 29 ++++++++++++++---------------
 system/desktop.nix             |  2 +-
 system/home-manager/common.nix | 12 +-----------
 4 files changed, 17 insertions(+), 28 deletions(-)

diff --git a/.prettierrc.json b/.prettierrc.json
index 8db60ca..544138b 100644
--- a/.prettierrc.json
+++ b/.prettierrc.json
@@ -1,3 +1,3 @@
 {
-    "singleQuote": true
+  "singleQuote": true
 }
diff --git a/flake.nix b/flake.nix
index f447f1f..a99131c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,26 +7,26 @@
       owner = "NixOS";
       repo = "nixpkgs";
       rev =
-        "0de0253ffbd88526af1b15ab281bd4cc17ef0d4f"; # nixos-unstable; 31-05-2024
+        "3b93a4d28af851867c4321b2b0d3bc20107a0920"; # nixos-unstable; 30-06-2024
     };
     home-manager = {
       type = "github";
       owner = "nix-community";
       repo = "home-manager";
-      rev = "9b53a10f4c91892f5af87cf55d08fba59ca086af"; # master; 02-06-2024
+      rev = "59ce796b2563e19821361abbe2067c3bb4143a7d"; # master; 01-07-2024
       inputs.nixpkgs.follows = "nixpkgs";
     };
     nixos-hardware = {
       type = "github";
       owner = "NixOS";
       repo = "nixos-hardware";
-      rev = "7b49d3967613d9aacac5b340ef158d493906ba79"; # master; 01-06-2024
+      rev = "a59f00f5ac65b19382617ba00f360f8bc07ed3ac"; # master; 29-06-2024
     };
     # Can be removed when we pull in
-    # https://github.com/NixOS/nixpkgs/commit/af4ac075a3e97cb239078e187112afdf380cd47b
-    # and
     # https://github.com/NixOS/nixpkgs/commit/7f993cdf26ccef564eabf31fdb40d140821e12bc
-    # through regular nixpkgs
+    # and
+    # https://github.com/NixOS/nixpkgs/commit/cba702ada89fe0bdb92e9e9c080a4502ddd8e90f
+    # through regular nixpkgs above
     nixpkgs-latest.url = "github:NixOS/nixpkgs?ref=master";
     simple-nixos-mailserver = {
       type = "gitlab";
@@ -56,7 +56,7 @@
       type = "github";
       owner = "Mic92";
       repo = "sops-nix";
-      rev = "ab2a43b0d21d1d37d4d5726a892f714eaeb4b075"; # master; 02-06-2024
+      rev = "b5974d4331fb6c893e808977a2e1a6d34b3162d6"; # master; 30-06-2024
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.nixpkgs-stable.follows = "nixpkgs";
     };
@@ -154,22 +154,21 @@
 
         packages = (import ./pkgs) null pkgs;
       }) // (let
-        overlays = [
+        overlays = system: [
           (import ./pkgs)
           (self: super: {
             vimPlugins = super.vimPlugins
               // (import ./pkgs/vim-plugins.nix self super);
-            inherit (import nixpkgs-latest { inherit (super) system; })
-              forgejo openssh;
+            inherit (import nixpkgs-latest { inherit system; }) openssh;
           })
         ];
         machines = {
           back = { };
           fort = { };
           tank.extraModules = [{
-            disabledModules = [ "services/misc/forgejo.nix" ];
+            disabledModules = [ "system/boot/initrd-ssh.nix" ];
             imports =
-              [ "${nixpkgs-latest}/nixos/modules/services/misc/forgejo.nix" ];
+              [ "${nixpkgs-latest}/nixos/modules/system/boot/initrd-ssh.nix" ];
           }];
           trek.extraModules =
             [ nixos-hardware.nixosModules.framework-12th-gen-intel ];
@@ -198,7 +197,7 @@
                 };
 
                 imports = [ (./machines + "/${name}.nix") ];
-                nixpkgs = { inherit overlays; };
+                nixpkgs = { overlays = overlays system; };
                 networking.hostName = name;
                 sops.age = {
                   sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
@@ -210,9 +209,9 @@
           };
       in {
         homeConfigurations.maui = home-manager.lib.homeManagerConfiguration {
-          pkgs = import nixpkgs {
+          pkgs = import nixpkgs rec {
             system = "x86_64-linux";
-            overlays = overlays ++ [ nixgl.overlay ];
+            overlays = (overlays system) ++ [ nixgl.overlay ];
           };
 
           modules = [ ./machines/maui.nix lix-module.nixosModules.default ];
diff --git a/system/desktop.nix b/system/desktop.nix
index 1ab1f26..0a140d2 100644
--- a/system/desktop.nix
+++ b/system/desktop.nix
@@ -20,7 +20,7 @@
   fonts.enableDefaultPackages = true;
 
   hardware.keyboard.zsa.enable = true;
-  hardware.opengl.enable = true;
+  hardware.graphics.enable = true;
 
   home-manager.users.christoph.imports = [ ./home-manager/desktop.nix ];
 
diff --git a/system/home-manager/common.nix b/system/home-manager/common.nix
index 73df1f9..aae9bf4 100644
--- a/system/home-manager/common.nix
+++ b/system/home-manager/common.nix
@@ -30,7 +30,7 @@ let
 in {
   home.stateVersion = "23.05";
 
-  # `programs.home-manager.enable = true` does not seem to work correcly ..
+  # `programs.home-manager.enable = true` does not seem to work correctly ..
   home.packages = with pkgs; [
     bc
     bmon
@@ -96,16 +96,6 @@ in {
 
   programs.tmux = {
     enable = true;
-    package = pkgs.tmux.overrideAttrs (oldAttrs: {
-      patches = oldAttrs.patches ++ [
-        # Fix for https://github.com/tmux/tmux/issues/3983
-        (pkgs.fetchpatch {
-          url =
-            "https://github.com/tmux/tmux/commit/aa17f0e0c1c8b3f1d6fc8617613c74f07de66fae.patch";
-          hash = "sha256-jhWGnC9tsGqTTA5tU+i4G3wlwZ7HGz4P0UHl17dVRU4=";
-        })
-      ];
-    });
     aggressiveResize = true;
     baseIndex = 1;
     escapeTime = 0;