diff --git a/_ubuntu/flake.lock b/_ubuntu/flake.lock index f59a4fc..b27be90 100644 --- a/_ubuntu/flake.lock +++ b/_ubuntu/flake.lock @@ -1,25 +1,5 @@ { "nodes": { - "darwin": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1598257228, - "narHash": "sha256-HyaM+tAZfpwhYgvQduCqrooLIHWoRi4VqbGvDnuwZSY=", - "owner": "lnl7", - "repo": "nix", - "rev": "2530cc68272b176841f8cf2ec0da1c88a13d9137", - "type": "github" - }, - "original": { - "owner": "lnl7", - "repo": "nix", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -59,7 +39,6 @@ }, "root": { "inputs": { - "darwin": "darwin", "home-manager": "home-manager", "nixpkgs": "nixpkgs" } diff --git a/_ubuntu/flake.nix b/_ubuntu/flake.nix index 192c4b1..1b965ff 100644 --- a/_ubuntu/flake.nix +++ b/_ubuntu/flake.nix @@ -5,15 +5,14 @@ nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; - darwin.url = "github:lnl7/nix"; - darwin.inputs.nixpkgs.follows = "nixpkgs"; }; - outputs = { self, nixpkgs, home-manager, darwin }: { + outputs = { self, nixpkgs, home-manager} : { defaultPackage.x86_64-linux = home-manager.defaultPackage.x86_64-linux; homeConfigurations = { "tyrel" = home-manager.lib.homeManagerConfiguration { - system = "x86_64"; + targets.genericLinux.enable = true; + system = "x86_64-linux"; homeDirectory = "/home/tyrel"; username = "tyrel"; configuration.imports = [ diff --git a/rebuild-ubuntu.sh b/rebuild-ubuntu.sh index 377ae25..62cadc8 100755 --- a/rebuild-ubuntu.sh +++ b/rebuild-ubuntu.sh @@ -1,4 +1,5 @@ #!/bin/bash -git add . # YOLO -nix build ./_ubuntu --extra-experimental-features "nix-command flakes" +#git add . # YOLO +#nix build ./_ubuntu --extra-experimental-features "nix-command flakes" -vvv +nix run _ubuntu switch