From 7ef1b0a63d5c2992fb945361365de920a399c7fe Mon Sep 17 00:00:00 2001 From: Nettika Date: Mon, 8 Jul 2024 16:46:43 -0700 Subject: [PATCH] Remove Home Manager and revert to NixOS Stable --- flake.lock | 29 ++++------------------------- flake.nix | 13 +++---------- hosts/marauder/default.nix | 2 -- hosts/marauder/home.nix | 8 -------- 4 files changed, 7 insertions(+), 45 deletions(-) delete mode 100644 hosts/marauder/home.nix diff --git a/flake.lock b/flake.lock index 5509e46..3e44bbf 100644 --- a/flake.lock +++ b/flake.lock @@ -1,44 +1,23 @@ { "nodes": { - "home-manager": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1720188602, - "narHash": "sha256-lC3byBmhVZFzWl/dCic8+cKUEEAXAswWOYjq4paFmbo=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "e3582e5151498bc4d757e8361431ace8529e7bb7", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, "nixpkgs": { "locked": { - "lastModified": 1720031269, - "narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=", + "lastModified": 1720386169, + "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9f4128e00b0ae8ec65918efeba59db998750ead6", + "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } }, "root": { "inputs": { - "home-manager": "home-manager", "nixpkgs": "nixpkgs" } } diff --git a/flake.nix b/flake.nix index 6953a80..03289e3 100644 --- a/flake.nix +++ b/flake.nix @@ -2,24 +2,17 @@ description = "Nettika NixOS Configurations"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - home-manager = { - url = "github:nix-community/home-manager"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; }; - outputs = { self, nixpkgs, home-manager } @inputs: { + outputs = { self, nixpkgs } @inputs: { nixosConfigurations = { marauder = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = { inherit inputs; }; - modules = [ - ./hosts/marauder - home-manager.nixosModules.default - ]; + modules = [ ./hosts/marauder ]; }; }; }; diff --git a/hosts/marauder/default.nix b/hosts/marauder/default.nix index b71d661..1669741 100644 --- a/hosts/marauder/default.nix +++ b/hosts/marauder/default.nix @@ -13,7 +13,5 @@ "flakes" ]; - home-manager.users.nettika = import ./home.nix; - system.stateVersion = "24.05"; } diff --git a/hosts/marauder/home.nix b/hosts/marauder/home.nix deleted file mode 100644 index 06866b8..0000000 --- a/hosts/marauder/home.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ ... }: -{ - home = { - username = "nettika"; - homeDirectory = "/home/nettika"; - stateVersion = "24.05"; - }; -}