refactor: make overlay default.nix nix-on-droid friendly
All checks were successful
Discord / discord commits (push) Has been skipped
All checks were successful
Discord / discord commits (push) Has been skipped
This commit is contained in:
parent
3ef10bd568
commit
a7956d6185
4 changed files with 20 additions and 21 deletions
|
@ -7,12 +7,11 @@
|
||||||
nurl,
|
nurl,
|
||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}: {
|
} @ inputs: {
|
||||||
imports = [
|
imports = [
|
||||||
./vars.nix
|
./vars.nix
|
||||||
|
|
||||||
./modules
|
./modules
|
||||||
./overlays
|
|
||||||
./pkgs
|
./pkgs
|
||||||
|
|
||||||
nur.nixosModules.nur
|
nur.nixosModules.nur
|
||||||
|
@ -20,7 +19,10 @@
|
||||||
home-manager.nixosModules.home-manager
|
home-manager.nixosModules.home-manager
|
||||||
];
|
];
|
||||||
|
|
||||||
nixpkgs.config.allowUnfree = true;
|
nixpkgs = {
|
||||||
|
config.allowUnfree = true;
|
||||||
|
overlays = import ./overlays inputs;
|
||||||
|
};
|
||||||
boot.tmp.cleanOnBoot = true;
|
boot.tmp.cleanOnBoot = true;
|
||||||
|
|
||||||
nix = {
|
nix = {
|
||||||
|
|
|
@ -2,8 +2,7 @@
|
||||||
neovim-flake,
|
neovim-flake,
|
||||||
nixpkgs-wayland,
|
nixpkgs-wayland,
|
||||||
...
|
...
|
||||||
} @ inputs: {
|
} @ inputs: [
|
||||||
nixpkgs.overlays = [
|
|
||||||
(import ./dracula-theme inputs)
|
(import ./dracula-theme inputs)
|
||||||
(import ./plymouth inputs)
|
(import ./plymouth inputs)
|
||||||
(import ./spotifywm inputs)
|
(import ./spotifywm inputs)
|
||||||
|
@ -11,5 +10,4 @@
|
||||||
|
|
||||||
neovim-flake.overlay
|
neovim-flake.overlay
|
||||||
nixpkgs-wayland.overlay
|
nixpkgs-wayland.overlay
|
||||||
];
|
]
|
||||||
}
|
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
{
|
{
|
||||||
home-manager,
|
home-manager,
|
||||||
neovim-flake,
|
|
||||||
nix-on-droid,
|
|
||||||
nixpkgs,
|
nixpkgs,
|
||||||
...
|
...
|
||||||
} @ inputs: {
|
} @ inputs: {
|
||||||
|
@ -9,11 +7,7 @@
|
||||||
home-manager-path = home-manager.outPath;
|
home-manager-path = home-manager.outPath;
|
||||||
pkgs = import nixpkgs {
|
pkgs = import nixpkgs {
|
||||||
system = "aarch64-linux";
|
system = "aarch64-linux";
|
||||||
overlays = [
|
overlays = import ../../common/overlays inputs;
|
||||||
nix-on-droid.overlays.default
|
|
||||||
neovim-flake.overlay
|
|
||||||
(import ../../common/overlays/dracula-theme inputs)
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
|
|
||||||
modules = [
|
modules = [
|
||||||
|
|
|
@ -28,6 +28,9 @@
|
||||||
]
|
]
|
||||||
++ mods;
|
++ mods;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# Nix-On-Droid
|
||||||
|
inherit (nix-on-droid.lib) nixOnDroidConfiguration;
|
||||||
in {
|
in {
|
||||||
nixosConfigurations = {
|
nixosConfigurations = {
|
||||||
wim = mkNixOS [
|
wim = mkNixOS [
|
||||||
|
@ -53,7 +56,9 @@
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
nixOnDroidConfigurations.default = nix-on-droid.lib.nixOnDroidConfiguration (import ./devices/android inputs);
|
nixOnDroidConfigurations.default = nixOnDroidConfiguration (
|
||||||
|
import ./devices/android inputs
|
||||||
|
);
|
||||||
|
|
||||||
formatter = perSystem (_: pkgs: pkgs.alejandra);
|
formatter = perSystem (_: pkgs: pkgs.alejandra);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue