From f025393d6f2a86ae2d2d1abe8c3c28b1330647cf Mon Sep 17 00:00:00 2001
From: Random936 <randomdude936@gmail.com>
Date: Mon, 23 Sep 2024 18:43:17 -0700
Subject: [PATCH] Revert "Switched back to stable following issues (WIP)"

This reverts commit 8c932c039884fa7b4653530203da54355c093f5f.
---
 config/darwin.nix |  2 +-
 config/media.nix  |  5 ++---
 config/omen.nix   |  5 ++---
 flake.lock        | 16 ++++++++--------
 flake.nix         |  4 ++--
 home/hacking.nix  |  2 +-
 6 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/config/darwin.nix b/config/darwin.nix
index 8316839..2db1f37 100644
--- a/config/darwin.nix
+++ b/config/darwin.nix
@@ -6,7 +6,6 @@
 
   nixpkgs.config.allowUnfree = true;
   environment.systemPackages = with pkgs; [
-    nextcloud-client
     git
   ];
 
@@ -22,6 +21,7 @@
       "scroll-reverser"
       "google-chrome"
       "instantview"
+      "nextcloud"
       "tailscale"
       "discord"
       "iterm2"
diff --git a/config/media.nix b/config/media.nix
index 84527b3..885b45b 100644
--- a/config/media.nix
+++ b/config/media.nix
@@ -35,10 +35,9 @@
       nvidiaSettings = true;
     };
 
-    opengl = {
+    graphics = {
       enable = true;
-      driSupport = true;
-      driSupport32Bit = true;
+      enable32Bit = true;
     };
   };
 
diff --git a/config/omen.nix b/config/omen.nix
index 935b72f..151142a 100644
--- a/config/omen.nix
+++ b/config/omen.nix
@@ -43,10 +43,9 @@
   environment.variables.GDK_SCALE = "0.5";
 
   # Install OpenGL
-  hardware.opengl = {
+  hardware.graphics = {
     enable = true;
-    driSupport = true;
-    driSupport32Bit = true;
+    enable32Bit = true;
   };
 
   # Ignore laptop lid closing when connected to power.
diff --git a/flake.lock b/flake.lock
index 7b09fcb..8e37454 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,16 +7,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1726989464,
-        "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=",
+        "lastModified": 1727111745,
+        "narHash": "sha256-EYLvFRoTPWtD+3uDg2wwQvlz88OrIr3zld+jFE5gDcY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176",
+        "rev": "21c021862fa696c8199934e2153214ab57150cb6",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-24.05",
+        "ref": "master",
         "repo": "home-manager",
         "type": "github"
       }
@@ -43,16 +43,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1726969270,
-        "narHash": "sha256-8fnFlXBgM/uSvBlLWjZ0Z0sOdRBesyNdH0+esxqizGc=",
+        "lastModified": 1726937504,
+        "narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "23cbb250f3bf4f516a2d0bf03c51a30900848075",
+        "rev": "9357f4f23713673f310988025d9dc261c20e70c6",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-24.05",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index b699f28..9567558 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,9 +2,9 @@
   description = "Configuration flake for RandomCTF";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     home-manager = {
-      url = "github:nix-community/home-manager/release-24.05";
+      url = "github:nix-community/home-manager/master";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
diff --git a/home/hacking.nix b/home/hacking.nix
index b4d849f..c11fd12 100644
--- a/home/hacking.nix
+++ b/home/hacking.nix
@@ -12,7 +12,6 @@
     wpscan
     openssl
     remmina
-    netexec
     inetutils
     thc-hydra
     exploitdb
@@ -20,6 +19,7 @@
     burpsuite
     evil-winrm
     feroxbuster
+    crackmapexec
     (wordlists.override {
       lists = with pkgs; [
         rockyou