From 19a54f573842200071c1f2dc25afda988edf4cbc Mon Sep 17 00:00:00 2001 From: Aly Raffauf Date: Fri, 1 Mar 2024 21:21:40 -0500 Subject: [PATCH] Revert "added unstable nix and home-manager channels" This reverts commit 2f3c3d6e8939745965180535b9f69a66e5265bdf. --- flake.lock | 41 +---------------------------------------- flake.nix | 11 +---------- 2 files changed, 2 insertions(+), 50 deletions(-) diff --git a/flake.lock b/flake.lock index 6cb2532a..9a69cc9a 100644 --- a/flake.lock +++ b/flake.lock @@ -21,27 +21,6 @@ "type": "github" } }, - "home-manager-unstable": { - "inputs": { - "nixpkgs": [ - "nixpkgs-unstable" - ] - }, - "locked": { - "lastModified": 1709204054, - "narHash": "sha256-U1idK0JHs1XOfSI1APYuXi4AEADf+B+ZU4Wifc0pBHk=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "2f3367769a93b226c467551315e9e270c3f78b15", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "master", - "repo": "home-manager", - "type": "github" - } - }, "nix-flatpak": { "locked": { "lastModified": 1708781964, @@ -89,30 +68,12 @@ "type": "github" } }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1709237383, - "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "root": { "inputs": { "home-manager": "home-manager", - "home-manager-unstable": "home-manager-unstable", "nix-flatpak": "nix-flatpak", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs", - "nixpkgs-unstable": "nixpkgs-unstable" + "nixpkgs": "nixpkgs" } } }, diff --git a/flake.nix b/flake.nix index 98adcdb0..2b94de3c 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,6 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; - nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; # handles flatpaks nix-flatpak.url = "github:gmodena/nix-flatpak"; # unstable branch. Use github:gmodena/nix-flatpak/?ref= to pin releases. # home-manager, used for managing user configuration @@ -15,18 +14,10 @@ # to avoid problems caused by different versions of nixpkgs. inputs.nixpkgs.follows = "nixpkgs"; }; - home-manager-unstable = { - url = "github:nix-community/home-manager/master"; - # The `follows` keyword in inputs is used for inheritance. - # Here, `inputs.nixpkgs` of home-manager is kept consistent with - # the `inputs.nixpkgs` of the current flake, - # to avoid problems caused by different versions of nixpkgs. - inputs.nixpkgs.follows = "nixpkgs-unstable"; - }; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; }; - outputs = inputs@{ nixpkgs, nixpkgs-unstable, nix-flatpak, home-manager, home-manager-unstable, nixos-hardware, ... }: { + outputs = inputs@{ nixpkgs, nix-flatpak, home-manager, nixos-hardware, ... }: { nixosConfigurations = { # T440p with i5-4210M and 16GB RAM.