From 671700e45d36c5c1d08cd0ff6f5b805febd33e65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Fri, 10 May 2024 23:21:26 +0200 Subject: [PATCH] [fix] flake.nix: dedup flake inputs --- flake.lock | 92 ++++++++++++++++++-------------------------------- flake.nix | 99 +++++++++++++++++++++++++++++++++--------------------- 2 files changed, 92 insertions(+), 99 deletions(-) diff --git a/flake.lock b/flake.lock index fd3e213..49e3dd3 100644 --- a/flake.lock +++ b/flake.lock @@ -136,11 +136,8 @@ }, "devshell": { "inputs": { - "flake-utils": "flake-utils_3", - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1713532798, @@ -157,20 +154,6 @@ } }, "flake-compat": { - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "revCount": 57, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" - } - }, - "flake-compat_2": { "flake": false, "locked": { "lastModified": 1696426674, @@ -186,7 +169,7 @@ "type": "github" } }, - "flake-compat_3": { + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1673956053, @@ -260,24 +243,6 @@ "inputs": { "systems": "systems_2" }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { - "inputs": { - "systems": "systems_3" - }, "locked": { "lastModified": 1701680307, "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", @@ -292,9 +257,9 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_3": { "inputs": { - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1710146030, @@ -459,7 +424,10 @@ }, "neovim-flake": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": [ + "lix-module", + "flake-utils" + ], "nixpkgs": [ "nixpkgs" ] @@ -510,10 +478,29 @@ "type": "indirect" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1715220225, + "narHash": "sha256-X0xvboLSjfC5s/M1yuPdSdc6yzKV8536hTTWCSKF5Xc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "ac34158a823c7596e0106c806d0b7df47885fa73", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixvim": { "inputs": { "devshell": "devshell", - "flake-compat": "flake-compat", + "flake-compat": [ + "stylix", + "flake-compat" + ], "flake-parts": "flake-parts", "flake-root": "flake-root", "home-manager": [ @@ -542,8 +529,8 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_4", + "flake-compat": "flake-compat", + "flake-utils": "flake-utils_3", "gitignore": "gitignore", "nixpkgs": [ "nixvim", @@ -591,7 +578,7 @@ "base16-kitty": "base16-kitty", "base16-tmux": "base16-tmux", "base16-vim": "base16-vim", - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_2", "gnome-shell": "gnome-shell", "home-manager": [ "home-manager" @@ -660,21 +647,6 @@ "type": "github" } }, - "systems_4": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index 27a915f..dd816c2 100644 --- a/flake.nix +++ b/flake.nix @@ -2,42 +2,61 @@ { # A helpful description of your flake description = "My NixOS configuration"; - # Flake inputs - inputs.stylix.url = "github:jalil-salame/stylix/fallback-fonts-v2"; - inputs.stylix.inputs.nixpkgs.follows = "nixpkgs"; - inputs.stylix.inputs.home-manager.follows = "home-manager"; - - inputs.nixpkgs.url = "nixpkgs/nixos-unstable"; - - inputs.jpassmenu.url = "github:jalil-salame/jpassmenu"; - inputs.jpassmenu.inputs.nixpkgs.follows = "nixpkgs"; - - inputs.audiomenu.url = "github:jalil-salame/audiomenu"; - inputs.audiomenu.inputs.nixpkgs.follows = "nixpkgs"; - - inputs.nixvim.url = "github:nix-community/nixvim"; - inputs.nixvim.inputs.nixpkgs.follows = "nixpkgs"; - inputs.nixvim.inputs.home-manager.follows = "home-manager"; - # disable MacOS stuff - inputs.nixvim.inputs.nix-darwin.follows = ""; - - # WARN: Flakehub is outdated (39 days out of date) - # inputs.home-manager.url = "https://flakehub.com/f/nix-community/home-manager/0.1.*.tar.gz"; - inputs.home-manager.url = "github:nix-community/home-manager"; - inputs.home-manager.inputs.nixpkgs.follows = "nixpkgs"; - - inputs.nixos-hardware.url = "github:NixOS/nixos-hardware"; - - inputs.neovim-flake.url = "github:neovim/neovim?dir=contrib"; - inputs.neovim-flake.inputs.nixpkgs.follows = "nixpkgs"; - - # Lix - inputs.lix.url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz"; - inputs.lix.flake = false; - inputs.lix-module.url = "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz"; - inputs.lix-module.inputs.lix.follows = "lix"; - inputs.lix-module.inputs.nixpkgs.follows = "nixpkgs"; + inputs = { + nixpkgs.url = "nixpkgs/nixos-unstable"; + # Software + jpassmenu = { + url = "github:jalil-salame/jpassmenu"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + audiomenu = { + url = "github:jalil-salame/audiomenu"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + neovim-flake = { + url = "github:neovim/neovim?dir=contrib"; + inputs = { + nixpkgs.follows = "nixpkgs"; + flake-utils.follows = "lix-module/flake-utils"; + }; + }; + # Lix + lix = { + url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz"; + flake = false; + }; + lix-module = { + url = "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz"; + inputs = { + lix.follows = "lix"; + nixpkgs.follows = "nixpkgs"; + }; + }; + # Modules + home-manager = { + url = "github:nix-community/home-manager"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + nixos-hardware.url = "github:NixOS/nixos-hardware"; + stylix = { + url = "github:jalil-salame/stylix/fallback-fonts-v2"; + inputs = { + nixpkgs.follows = "nixpkgs"; + home-manager.follows = "home-manager"; + }; + }; + nixvim = { + url = "github:nix-community/nixvim"; + inputs = { + nixpkgs.follows = "nixpkgs"; + home-manager.follows = "home-manager"; + # disable MacOS stuff + nix-darwin.follows = ""; + flake-compat.follows = "stylix/flake-compat"; + }; + }; + }; # Flake outputs that other flakes can use outputs = { @@ -205,10 +224,12 @@ homeManagerModuleSandalone = import ./home {inherit overlays nvim-config stylix;}; homeManagerModuleNixOS = import ./home {inherit overlays nvim-config;}; nixosModule = { - imports = [ - (import ./system {inherit stylix;}) - home-manager.nixosModules.home-manager - ] ++ nixpkgs.lib.optional (lix != null && lix-module != null) lix-module.nixosModules.default; + imports = + [ + (import ./system {inherit stylix;}) + home-manager.nixosModules.home-manager + ] + ++ nixpkgs.lib.optional (lix != null && lix-module != null) lix-module.nixosModules.default; home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true;