jalil/configuration.nix
1
1
Fork 0
Code Issues 1 Pull requests Projects Activity Actions

[fix] flake.nix: dedup flake inputs

Browse source
This commit is contained in:
Jalil David Salamé Messina 2024-05-10 23:21:26 +02:00
parent 42484f176f
commit 671700e45d
Signed by: jalil
GPG key ID: F016B9E770737A0B
2 changed files with 92 additions and 99 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

92
flake.lock
View file

@ -136,11 +136,8 @@
}, },
"devshell": { "devshell": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_2",
"nixpkgs": [ "nixpkgs": "nixpkgs_2"
"nixvim",
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1713532798, "lastModified": 1713532798,
@ -157,20 +154,6 @@
} }
}, },
"flake-compat": { "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, "flake": false,
"locked": { "locked": {
"lastModified": 1696426674, "lastModified": 1696426674,
@ -186,7 +169,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat_3": { "flake-compat_2": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1673956053, "lastModified": 1673956053,
@ -260,24 +243,6 @@
"inputs": { "inputs": {
"systems": "systems_2" "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": { "locked": {
"lastModified": 1701680307, "lastModified": 1701680307,
"narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
@ -292,9 +257,9 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_4": { "flake-utils_3": {
"inputs": { "inputs": {
"systems": "systems_4" "systems": "systems_3"
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1710146030,
@ -459,7 +424,10 @@
}, },
"neovim-flake": { "neovim-flake": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_2", "flake-utils": [
"lix-module",
"flake-utils"
],
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
@ -510,10 +478,29 @@
"type": "indirect" "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": { "nixvim": {
"inputs": { "inputs": {
"devshell": "devshell", "devshell": "devshell",
"flake-compat": "flake-compat", "flake-compat": [
"stylix",
"flake-compat"
],
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"flake-root": "flake-root", "flake-root": "flake-root",
"home-manager": [ "home-manager": [
@ -542,8 +529,8 @@
}, },
"pre-commit-hooks": { "pre-commit-hooks": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat",
"flake-utils": "flake-utils_4", "flake-utils": "flake-utils_3",
"gitignore": "gitignore", "gitignore": "gitignore",
"nixpkgs": [ "nixpkgs": [
"nixvim", "nixvim",
@ -591,7 +578,7 @@
"base16-kitty": "base16-kitty", "base16-kitty": "base16-kitty",
"base16-tmux": "base16-tmux", "base16-tmux": "base16-tmux",
"base16-vim": "base16-vim", "base16-vim": "base16-vim",
"flake-compat": "flake-compat_3", "flake-compat": "flake-compat_2",
"gnome-shell": "gnome-shell", "gnome-shell": "gnome-shell",
"home-manager": [ "home-manager": [
"home-manager" "home-manager"
@ -660,21 +647,6 @@
"type": "github" "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": { "treefmt-nix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [

93
flake.nix
View file

@ -2,42 +2,61 @@
{ {
# A helpful description of your flake # A helpful description of your flake
description = "My NixOS configuration"; description = "My NixOS configuration";
# Flake inputs # Flake inputs
inputs.stylix.url = "github:jalil-salame/stylix/fallback-fonts-v2"; inputs = {
inputs.stylix.inputs.nixpkgs.follows = "nixpkgs"; nixpkgs.url = "nixpkgs/nixos-unstable";
inputs.stylix.inputs.home-manager.follows = "home-manager"; # Software
jpassmenu = {
inputs.nixpkgs.url = "nixpkgs/nixos-unstable"; url = "github:jalil-salame/jpassmenu";
inputs.nixpkgs.follows = "nixpkgs";
inputs.jpassmenu.url = "github:jalil-salame/jpassmenu"; };
inputs.jpassmenu.inputs.nixpkgs.follows = "nixpkgs"; audiomenu = {
url = "github:jalil-salame/audiomenu";
inputs.audiomenu.url = "github:jalil-salame/audiomenu"; inputs.nixpkgs.follows = "nixpkgs";
inputs.audiomenu.inputs.nixpkgs.follows = "nixpkgs"; };
neovim-flake = {
inputs.nixvim.url = "github:nix-community/nixvim"; url = "github:neovim/neovim?dir=contrib";
inputs.nixvim.inputs.nixpkgs.follows = "nixpkgs"; inputs = {
inputs.nixvim.inputs.home-manager.follows = "home-manager"; nixpkgs.follows = "nixpkgs";
# disable MacOS stuff flake-utils.follows = "lix-module/flake-utils";
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 # Lix
inputs.lix.url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz"; lix = {
inputs.lix.flake = false; url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz";
inputs.lix-module.url = "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz"; flake = false;
inputs.lix-module.inputs.lix.follows = "lix"; };
inputs.lix-module.inputs.nixpkgs.follows = "nixpkgs"; 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 # Flake outputs that other flakes can use
outputs = { outputs = {
@ -205,10 +224,12 @@
homeManagerModuleSandalone = import ./home {inherit overlays nvim-config stylix;}; homeManagerModuleSandalone = import ./home {inherit overlays nvim-config stylix;};
homeManagerModuleNixOS = import ./home {inherit overlays nvim-config;}; homeManagerModuleNixOS = import ./home {inherit overlays nvim-config;};
nixosModule = { nixosModule = {
imports = [ imports =
[
(import ./system {inherit stylix;}) (import ./system {inherit stylix;})
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
] ++ nixpkgs.lib.optional (lix != null && lix-module != null) lix-module.nixosModules.default; ]
++ nixpkgs.lib.optional (lix != null && lix-module != null) lix-module.nixosModules.default;
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;