[NixOS] Remove duplication of dependencies

This commit is contained in:
Ivan Malison 2023-06-17 10:27:47 -06:00
parent 3047c1dc38
commit 402053e3f9
No known key found for this signature in database
GPG Key ID: 62530EFBE99DC2F8
2 changed files with 212 additions and 1425 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1,41 +1,116 @@
{ {
inputs = { inputs = {
nixos-hardware.url = github:NixOS/nixos-hardware; nixos-hardware = { url = github:NixOS/nixos-hardware; };
nixpkgs = {
# url = github:IvanMalison/nixpkgs/my-unstable; nixpkgs = { url = path:./nixpkgs; };
url = path:./nixpkgs;
};
home-manager = { home-manager = {
url = github:nix-community/home-manager/master; url = github:nix-community/home-manager;
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
xmonad-contrib = { xmonad-contrib = {
url = github:IvanMalison/xmonad-contrib/withMyChanges; url = github:IvanMalison/xmonad-contrib/withMyChanges;
inputs.nixpkgs.follows = "nixpkgs"; inputs = {
nixpkgs.follows = "nixpkgs";
flake-utils.follows = "flake-utils";
git-ignore-nix.follows = "git-ignore-nix";
xmonad.follows = "xmonad";
}; };
};
xmonad = { xmonad = {
url = path:../dotfiles/config/xmonad/xmonad; url = path:../dotfiles/config/xmonad/xmonad;
inputs.nixpkgs.follows = "nixpkgs"; inputs = {
nixpkgs.follows = "nixpkgs";
flake-utils.follows = "flake-utils";
git-ignore-nix.follows = "git-ignore-nix";
}; };
};
taffybar = { taffybar = {
url = path:../dotfiles/config/taffybar/taffybar; url = path:../dotfiles/config/taffybar/taffybar;
inputs.nixpkgs.follows = "nixpkgs"; inputs = {
nixpkgs.follows = "nixpkgs";
flake-utils.follows = "flake-utils";
git-ignore-nix.follows = "git-ignore-nix";
xmonad.follows = "xmonad";
gtk-sni-tray.follows = "gtk-sni-tray";
gtk-strut.follows = "gtk-strut";
}; };
};
imalison-taffybar = { imalison-taffybar = {
url = path:../dotfiles/config/taffybar; url = path:../dotfiles/config/taffybar;
inputs.nixpkgs.follows = "nixpkgs"; inputs = {
nixpkgs.follows = "nixpkgs";
flake-utils.follows = "flake-utils";
git-ignore-nix.follows = "git-ignore-nix";
xmonad.follows = "xmonad";
gtk-sni-tray.follows = "gtk-sni-tray";
gtk-strut.follows = "gtk-strut";
taffybar.follows = "taffybar";
}; };
};
notifications-tray-icon = { notifications-tray-icon = {
url = github:IvanMalison/notifications-tray-icon/master; url = github:IvanMalison/notifications-tray-icon;
}; inputs.flake-utils.follows = "flake-utils";
nix = { inputs.git-ignore-nix.follows = "git-ignore-nix";
url = github:IvanMalison/nix/master;
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nix = {
url = github:IvanMalison/nix;
inputs.nixpkgs.follows = "nixpkgs";
}; };
flake-utils = {
url = github:numtide/flake-utils;
inputs.systems.follows = "systems";
};
systems = { url = github:nix-systems/default; };
git-ignore-nix = {
url = github:hercules-ci/gitignore.nix;
inputs.nixpkgs.follows = "nixpkgs";
};
gtk-sni-tray = {
url = github:taffybar/gtk-sni-tray;
inputs = {
nixpkgs.follows = "nixpkgs";
flake-utils.follows = "flake-utils";
git-ignore-nix.follows = "git-ignore-nix";
status-notifier-item.follows = "status-notifier-item";
};
};
status-notifier-item = {
url = github:taffybar/status-notifier-item;
inputs = {
nixpkgs.follows = "nixpkgs";
flake-utils.follows = "flake-utils";
git-ignore-nix.follows = "git-ignore-nix";
};
};
gtk-strut = {
url = github:taffybar/gtk-strut;
inputs = {
nixpkgs.follows = "nixpkgs";
flake-utils.follows = "flake-utils";
git-ignore-nix.follows = "git-ignore-nix";
};
};
nixpkgs-regression = { url = github:NixOS/nixpkgs; };
};
outputs = inputs@{ outputs = inputs@{
self, nixpkgs, nixos-hardware, home-manager, taffybar, xmonad, self, nixpkgs, nixos-hardware, home-manager, taffybar, xmonad,
xmonad-contrib, notifications-tray-icon, nix, imalison-taffybar, xmonad-contrib, notifications-tray-icon, nix, imalison-taffybar, ...
}: }:
let let
mkConfig = mkConfig =