diff --git a/flake.nix b/flake.nix index b89241d9f09bd29e4c544727b4d948cbe8ace560..07a543e0c464c8499f3f3f68ebd43e941a0d670d 100644 --- a/flake.nix +++ b/flake.nix @@ -3,33 +3,31 @@ description = "jolheiser's nixos config"; inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; - home-manager = { - url = "github:nix-community/home-manager"; - inputs.nixpkgs.follows = "nixpkgs"; - }; { -{ + description = "jolheiser's nixos config"; { { + description = "jolheiser's nixos config"; description = "jolheiser's nixos config"; { + description = "jolheiser's nixos config"; { + description = "jolheiser's nixos config"; inputs = { { + description = "jolheiser's nixos config"; nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; + darwin.follows = ""; }; flake-utils.url = "github:numtide/flake-utils"; { + description = "jolheiser's nixos config"; url = "github:nix-community/home-manager"; jolheiser-nur.url = "git+https://git.jojodev.com/jolheiser/nur"; nixpkgs-py36.url = "github:nixos/nixpkgs/34f85de51bbc74595e63b22ee089adbb31f7c7a2"; - - # Other flakes - golink.url = "github:tailscale/golink"; - tclip.url = "github:tailscale-dev/tclip"; }; outputs = { @@ -40,30 +38,24 @@ agenix, jolheiser-nur, nixpkgs-py36, -{ - tclip, - } @ inputs: let - overlays = [ - (final: prev: { - nur = import inputs.nur { - + inputs = { inputs.nixpkgs.follows = "nixpkgs"; - + inputs = { }; - inputs = { + nixpkgs.follows = "nixpkgs"; - inputs = { + nixpkgs.follows = "nixpkgs"; { - inputs = { + nixpkgs.follows = "nixpkgs"; description = "jolheiser's nixos config"; - inputs = { + nixpkgs.follows = "nixpkgs"; inputs = { - inputs = { + - inputs = { +{ nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; - ]; + }; commonConfig = {gui ? true}: { config, pkgs, @@ -75,7 +67,7 @@ owner = username; }; in { config = { - nixpkgs.overlays = overlays; + nixpkgs.overlays = [overlays]; home-manager = { useGlobalPkgs = true; useUserPackages = true; @@ -147,7 +139,6 @@ system = "x86_64-linux"; modules = [ home-manager.nixosModules.home-manager agenix.nixosModules.default - golink.nixosModule.default ./machines/dragonwell (commonConfig {gui = false;}) ];