Skip to content

Commit

Permalink
nixos/common/
Browse files Browse the repository at this point in the history
  • Loading branch information
srid committed Sep 28, 2024
1 parent d88e133 commit 7f6fc20
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 9 deletions.
File renamed without changes.
File renamed without changes.
7 changes: 7 additions & 0 deletions nixos/common/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
imports = [
./nix.nix
./primary-as-admin.nix
./caches
];
}
5 changes: 4 additions & 1 deletion nixos/nix.nix → nixos/common/nix.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
{ flake, pkgs, lib, ... }:

let
inherit (flake.inputs) self;
in
{
nixpkgs = {
config = {
Expand All @@ -9,7 +12,7 @@
};
overlays = [
flake.inputs.nuenv.overlays.default
(import ../packages/overlay.nix { inherit flake; inherit (pkgs) system; })
(import "${self}/packages/overlay.nix" { inherit flake; inherit (pkgs) system; })
];
};

Expand Down
File renamed without changes.
8 changes: 2 additions & 6 deletions nixos/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,7 @@
nixosModules = {
# NixOS modules that are known to work on nix-darwin.
# Thsi is shared with nix-darwin/default.nix
common.imports = [
./nix.nix
./caches
./self/primary-as-admin.nix
];
common = ./common;

default.imports = [
{
Expand All @@ -24,7 +20,7 @@
self.nixosModules.common
inputs.ragenix.nixosModules.default
inputs.github-nix-ci.nixosModules.default
./self/self-ide.nix
./self-ide.nix
./current-location.nix
];
};
Expand Down
File renamed without changes.
3 changes: 1 addition & 2 deletions systems/ax41.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ in
inputs.disko.nixosModules.disko
self.nixosModules.default
"${self}/nixos/disko/trivial.nix"
"${self}/nixos/nix.nix"
"${self}/nixos/self/primary-as-admin.nix"
"${self}/nixos/common/primary-as-admin.nix"
"${self}/nixos/docker.nix"
"${self}/nixos/actualism-app.nix"
"${self}/nixos/hedgedoc.nix"
Expand Down

0 comments on commit 7f6fc20

Please sign in to comment.