From e446d85952cc3718ad315acee2cbdb0f1e7154d9 Mon Sep 17 00:00:00 2001 From: Julian Sutter Date: Sat, 7 Jan 2023 09:53:40 -0800 Subject: [PATCH] Revert "Added home manager" This reverts commit 4166de0850917e101b8d6d902a073d6d59d1136b. --- flake.lock | 37 ----------------------------------- flake.nix | 15 +------------- users/jsutter.nix => home.nix | 0 3 files changed, 1 insertion(+), 51 deletions(-) rename users/jsutter.nix => home.nix (100%) diff --git a/flake.lock b/flake.lock index e63a60d..7c174b6 100644 --- a/flake.lock +++ b/flake.lock @@ -1,26 +1,5 @@ { "nodes": { - "home-manager": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ], - "utils": "utils" - }, - "locked": { - "lastModified": 1672980560, - "narHash": "sha256-Pzx7az57SiUS1xhvKesTb1rhO9w9lWy9mecIqVjcKzo=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "1786883425208d3bf726ab6a1889beddeb46cdbc", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1672791794, @@ -38,24 +17,8 @@ }, "root": { "inputs": { - "home-manager": "home-manager", "nixpkgs": "nixpkgs" } - }, - "utils": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index fb4afa7..a0a5120 100644 --- a/flake.nix +++ b/flake.nix @@ -3,15 +3,9 @@ inputs = { nixpkgs.url = "nixpkgs/nixos-unstable"; - home-manager = { - url = "github:nix-community/home-manager"; - inputs.nixpkgs.follows = "nixpkgs"; - }; }; - outputs = { self, nixpkgs, home-manager}: { - - defaultPackage.x86_64-linux = home-manager.defaultPackage.x86_64-linux; + outputs = { self, nixpkgs }: { nixosConfigurations = { framework = nixpkgs.lib.nixosSystem { @@ -23,12 +17,5 @@ modules = [ ./configuration.nix ]; }; }; - - homeConfigurations = { - "jsutter" = home-manager.lib.homeManagerConfiguration { - pkgs = nixpkgs.legacyPackages.x86_64-darwin; - modules = [ ./users/jsutter.nix ]; - }; - }; }; } diff --git a/users/jsutter.nix b/home.nix similarity index 100% rename from users/jsutter.nix rename to home.nix