bcachefs: add bcachefs-tools from upstream

Signed-off-by: John Titor <[email protected]>
JohnRTitor · Aug 2, 2024 · bdd55fe · bdd55fe
1 parent 9ae26ff
commit bdd55fe
Show file tree

Hide file tree

Showing 3 changed files with 186 additions and 7 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -8,14 +8,18 @@
 
 {
   description = "Unstable NixOS custom installation media";
-  inputs.nixpkgs.url = "nixpkgs/nixos-unstable";
+  inputs = {
+    nixpkgs.url = "nixpkgs/nixos-unstable";
+    bcachefs-tools.url = "github:koverstreet/bcachefs-tools";
+  };
   outputs =
-    { self, nixpkgs }:
+    { self, nixpkgs, ... }@inputs:
     let
       system = "x86_64-linux"; # change arch here
 
       specialArgs = {
         inherit system;
+        inherit inputs;
       };
     in
     {

diff --git a/graphical-configuration.nix b/graphical-configuration.nix
@@ -9,6 +9,7 @@
   lib,
   pkgs,
   system,
+  inputs,
   ...
 }:
 
@@ -36,7 +37,6 @@
 
   # Enable NetworkManager to manage network connections.
   networking.networkmanager.enable = true;
-  sound.enable = true; # Enable sound
   hardware.bluetooth.enable = true; # enables support for Bluetooth
 
   nixpkgs.config.allowUnfree = true;
@@ -53,4 +53,12 @@
     google-chrome
     firefox
   ];
+
+  systemd.enableUnifiedCgroupHierarchy = lib.mkForce false;
+
+  nixpkgs.overlays = [
+    (final: prev: {
+      bcachefs-tools = inputs.bcachefs-tools.packages.${pkgs.system}.bcachefs-tools;
+    })
+  ];
 }