From 71f9225dc63b3a218d4ee31569ded8bf946548b2 Mon Sep 17 00:00:00 2001 From: Ingolf Wagner Date: Fri, 30 Aug 2024 08:47:05 +0700 Subject: [PATCH] :recycle: refactored flake.nix inputs to easily sort them --- flake.nix | 121 +++++++++++++++--------------------------------------- 1 file changed, 32 insertions(+), 89 deletions(-) diff --git a/flake.nix b/flake.nix index e2d1057..31729c0 100644 --- a/flake.nix +++ b/flake.nix @@ -1,87 +1,43 @@ { + + # "git+file:///" for fixing an input inputs = { - flake-parts.url = "github:hercules-ci/flake-parts"; + clan-core.inputs.flake-parts.follows = "flake-parts"; + clan-core.inputs.nixpkgs.follows = "nixpkgs"; + clan-core.url = "git+https://git.clan.lol/clan/clan-core"; + clan-fact-generators.inputs.clan-core.follows = "clan-core"; + clan-fact-generators.url = "github:mrvandalo/clan-fact-generators"; flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs"; - - clan-fact-generators = { - url = "github:mrvandalo/clan-fact-generators"; - inputs.clan-core.follows = "clan-core"; - }; - - clan-core = { - url = "git+https://git.clan.lol/clan/clan-core"; - #url = "git+file:///home/palo/dev/clan-core"; - inputs.nixpkgs.follows = "nixpkgs"; # Needed if your configuration uses nixpkgs unstable. - inputs.flake-parts.follows = "flake-parts"; - }; - - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - nixpkgs-unstable-small.url = "github:nixos/nixpkgs/nixos-unstable-small"; + flake-parts.url = "github:hercules-ci/flake-parts"; + home-manager-utils.inputs.home-manager.follows = "home-manager"; + home-manager-utils.url = "github:mrvandalo/home-manager-utils"; + home-manager.inputs.nixpkgs.follows = "nixpkgs"; + home-manager.url = "github:nix-community/home-manager"; + kmonad.inputs.nixpkgs.follows = "nixpkgs"; # fixme: kmonad crashes every now and than and the keyboard is not usable anymore. + kmonad.url = "github:kmonad/kmonad?dir=nix"; # todo: mabye use https://github.com/jtroo/kanata instead + landingpage.url = "github:mrVanDalo/landingpage"; + nixos-anywhere.url = "github:nix-community/nixos-anywhere"; + nixos-hardware.url = "github:nixos/nixos-hardware"; nixpkgs-legacy_2211.url = "github:nixos/nixpkgs/nixos-22.11"; nixpkgs-legacy_2311.url = "github:nixos/nixpkgs/nixos-23.11"; nixpkgs-legacy_2405.url = "github:nixos/nixpkgs/nixos-24.05"; - nixos-hardware.url = "github:nixos/nixos-hardware"; - nixos-anywhere.url = "github:nix-community/nixos-anywhere"; - - home-manager = { - #url = "github:nix-community/home-manager/release-23.11"; - url = "github:nix-community/home-manager"; - #inputs.nixpkgs.follows = "nixpkgs"; - }; - - polygon-art = { - url = "git+https://git.ingolf-wagner.de/palo/polygon-art.git"; - }; - - home-manager-utils = { - url = "github:mrvandalo/home-manager-utils"; - inputs.home-manager.follows = "home-manager"; - }; - - permown = { - url = "github:mrVanDalo/module.permown"; - #url = "git+file:///home/palo/dev/nixos/permown"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - - # only private input - # you should be able to run `nix flake check` removing this input from this flake.nix - private-parts = { - #url = "git+file:///home/palo/dev/nixos/nixos-private-parts"; - url = "git+ssh://forgejo@git.ingolf-wagner.de/palo/nixos-private-parts.git?ref=main"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - - retiolum = { - url = "github:Mic92/retiolum"; - #url = "git+file:///home/palo/dev/nixos/retiolum"; - }; - + nixpkgs-unstable-small.url = "github:nixos/nixpkgs/nixos-unstable-small"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + permown.inputs.nixpkgs.follows = "nixpkgs"; + permown.url = "github:mrVanDalo/module.permown"; + polygon-art.url = "git+https://git.ingolf-wagner.de/palo/polygon-art.git"; + private-parts.inputs.nixpkgs.follows = "nixpkgs"; # only private input + private-parts.url = "git+ssh://forgejo@git.ingolf-wagner.de/palo/nixos-private-parts.git?ref=main"; + retiolum.url = "github:Mic92/retiolum"; srvos.url = "github:nix-community/srvos"; - - treefmt-nix = { - url = "github:numtide/treefmt-nix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - - landingpage = { - #url = "git+file:///home/palo/dev/landingpage"; - url = "github:mrVanDalo/landingpage"; - }; - - # todo: mabye use https://github.com/jtroo/kanata instead - # fixme: kmonad crashes every now and than and the keyboard is not usable anymore. - kmonad = { - url = "github:kmonad/kmonad?dir=nix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - - stylix = { - url = "github:danth/stylix"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.home-manager.follows = "home-manager"; - }; + stylix.inputs.home-manager.follows = "home-manager"; + stylix.inputs.nixpkgs.follows = "nixpkgs"; + stylix.url = "github:danth/stylix"; + taskshell.inputs.nixpkgs.follows = "nixpkgs"; + taskshell.url = "github:mrvandalo/taskshell"; + treefmt-nix.inputs.nixpkgs.follows = "nixpkgs"; + treefmt-nix.url = "github:numtide/treefmt-nix"; # smoke test framwork to trigger tests (enable if I want to use it for real) #smoke = { @@ -89,12 +45,6 @@ # inputs.nixpkgs.follows = "nixpkgs"; #}; - # had to override it to remove colors - taskshell = { - url = "github:mrvandalo/taskshell"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - }; outputs = @@ -324,9 +274,6 @@ { pkgs, ... }: { boot.tmp.useTmpfs = lib.mkDefault true; - environment.systemPackages = [ - pkgs.nixpkgs-fmt - ]; } ) ]; @@ -386,11 +333,7 @@ ... }: { - # We define our own systems below. you can still use this to add system specific outputs to your flake. - # See: https://flake.parts/getting-started systems = [ "x86_64-linux" ]; - - # import clan-core modules imports = [ clan-core.flakeModules.default ./nix/formatter.nix