From 59e8ce973e270a55badd877a77d8e242b9be4cc8 Mon Sep 17 00:00:00 2001
From: batvin123 <batvin123@protonmail.com>
Date: Thu, 7 Nov 2024 08:59:26 -0500
Subject: [PATCH] fixing channels

---
 flake.lock                         | 19 +++++++++++++-
 flake.nix                          | 42 ++++++++++++++----------------
 system/susans-hp/configuration.nix |  6 ++---
 system/susans-vm/configuration.nix | 12 ++++-----
 4 files changed, 45 insertions(+), 34 deletions(-)

diff --git a/flake.lock b/flake.lock
index a66b312..defb876 100644
--- a/flake.lock
+++ b/flake.lock
@@ -37,10 +37,27 @@
         "type": "github"
       }
     },
+    "nixpkgs-unstable": {
+      "locked": {
+        "lastModified": 1730785428,
+        "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": "nixpkgs",
+        "nixpkgs-unstable": "nixpkgs-unstable"
       }
     }
   },
diff --git a/flake.nix b/flake.nix
index 8c84f4b..6bd16f7 100755
--- a/flake.nix
+++ b/flake.nix
@@ -2,35 +2,31 @@
   description = "my nixos setup";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
-    home-manager.url = "github:nix-community/home-manager/master";
-    home-manager.inputs.nixpkgs.follows = "nixpkgs";
+    nixpkgs.url = "github:nixos/nixpkgs/release-24.05";
+    nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
   };
 
-  outputs = { nixpkgs, home-manager, ... }:
+  outputs = { self, nixpkgs, ... }:
   let
     system = "x86_64-linux";
-    
-    pkgs = import nixpkgs {
-      inherit system;
-      config = { allowUnfree = true; };
-    };
-    
-    lib = nixpkgs.lib;
-
-  in {
-    homeManagerConfigurations = {
-      vincent = home-manager.lib.homeManagerConfiguration {
-        inherit system pkgs;
-       username = "vincent";
-        homeDirectory = "/home/vincent";
-        configuration = {
-          import = [
-            ./users/vincent/home.nix
-          ];
-        };
+    overlay-unstable = final: prev: {
+      unstable = import nixpkgs-unstable {
+        inherit system;
+        config.allowUnfree = true;
       };
     };
+
+    pkgs = import nixpkgs {
+      inherit system;
+      config = {
+        allowUnfree = true;
+      };
+      overlays = [
+        overlay-unstable
+      ];
+    };
+  in {
+
     nixosConfigurations = {
       vincents-hp = lib.nixosSystem {
         inherit system;
diff --git a/system/susans-hp/configuration.nix b/system/susans-hp/configuration.nix
index 89ed665..ab37781 100755
--- a/system/susans-hp/configuration.nix
+++ b/system/susans-hp/configuration.nix
@@ -5,9 +5,7 @@
 { config, pkgs, lib, ... }:
 
 let
-  unstableTarball =
-    fetchTarball
-      https://github.com/NixOS/nixpkgs/archive/nixos-unstable.tar.gz;
+  unstableTarball = import <nixpkgs-unstable> {};
 in
 
 
@@ -95,7 +93,7 @@ in
   services.printing.drivers = [ pkgs.hplip ];
 
   # Enable sound with pipewire.
-  sound.enable = true;
+  #sound.enable = true;
   hardware.pulseaudio.enable = false;
   security.rtkit.enable = true;
   services.pipewire = {
diff --git a/system/susans-vm/configuration.nix b/system/susans-vm/configuration.nix
index 4c69466..4d1d15c 100755
--- a/system/susans-vm/configuration.nix
+++ b/system/susans-vm/configuration.nix
@@ -4,11 +4,11 @@
 
 { config, pkgs, lib, ... }:
 
-let
-  unstableTarball =
-    fetchTarball
-      https://github.com/NixOS/nixpkgs/archive/nixos-unstable.tar.gz;
-in
+#let
+  #unstableTarball =
+  #  fetchTarball
+  #    https://github.com/NixOS/nixpkgs/archive/nixos-unstable.tar.gz;
+#in
 
 
 {
@@ -95,7 +95,7 @@ in
   services.printing.drivers = [ pkgs.hplip ];
 
   # Enable sound with pipewire.
-  sound.enable = true;
+  #sound.enable = true;
   hardware.pulseaudio.enable = false;
   security.rtkit.enable = true;
   services.pipewire = {