mirror of
https://github.com/srid/nixos-config.git
synced 2026-01-16 04:17:54 +08:00
Refactor
This commit is contained in:
parent
de14784eb3
commit
cd72d51003
1 changed files with 7 additions and 10 deletions
17
flake.nix
17
flake.nix
|
|
@ -11,7 +11,6 @@
|
|||
|
||||
# Supportive inputs
|
||||
flake-utils.url = "github:numtide/flake-utils";
|
||||
flake-utils.inputs.nixpkgs.follows = "nixpkgs";
|
||||
nixos-shell.url = "github:Mic92/nixos-shell";
|
||||
nixos-hardware.url = github:NixOS/nixos-hardware/master;
|
||||
|
||||
|
|
@ -33,13 +32,15 @@
|
|||
|
||||
outputs = inputs@{ self, home-manager, nixpkgs, darwin, ... }:
|
||||
let
|
||||
overlayModule =
|
||||
userName = "srid";
|
||||
platformIndependentModules = [
|
||||
./nixos/caches
|
||||
{
|
||||
nixpkgs.overlays = [
|
||||
(inputs.neovim-nightly-overlay.overlay)
|
||||
];
|
||||
};
|
||||
userName = "srid";
|
||||
}
|
||||
];
|
||||
in
|
||||
{
|
||||
# Configurations for Linux (NixOS) systems
|
||||
|
|
@ -48,11 +49,9 @@
|
|||
system = "x86_64-linux";
|
||||
pkgs = nixpkgs.legacyPackages.${system};
|
||||
# Configuration common to all Linux systems
|
||||
commonFeatures = [
|
||||
overlayModule
|
||||
commonFeatures = platformIndependentModules ++ [
|
||||
./nixos/self-ide.nix
|
||||
./nixos/takemessh
|
||||
./nixos/caches
|
||||
./nixos/current-location.nix
|
||||
];
|
||||
homeFeatures = [
|
||||
|
|
@ -140,10 +139,8 @@
|
|||
inherit inputs system;
|
||||
rosettaPkgs = import nixpkgs { system = "x86_64-darwin"; };
|
||||
};
|
||||
modules = [
|
||||
overlayModule
|
||||
modules = platformIndependentModules ++ [
|
||||
./systems/darwin.nix
|
||||
./nixos/caches
|
||||
home-manager.darwinModules.home-manager
|
||||
{
|
||||
home-manager.useGlobalPkgs = true;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue