Skip to content

Commit

Permalink
refactor: Move to ./nix
Browse files Browse the repository at this point in the history
  • Loading branch information
srid committed Jun 26, 2024
1 parent b9f22be commit 2490f2a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
outputs = inputs: {
flakeModule = ./flake-module.nix;
flakeModule = ./nix/flake-module.nix;

templates =
let
Expand Down
6 changes: 3 additions & 3 deletions flake-module.nix → nix/flake-module.nix
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ in
};

# New-style activate app that can also activately remotely over SSH.
activate = import ./activate { inherit self inputs' pkgs lib system; };
activate = import ../activate { inherit self inputs' pkgs lib system; };

activate-home =
if hasNonEmptyAttr [ "homeConfigurations" ] self || hasNonEmptyAttr [ "legacyPackages" system "homeConfigurations" ] self
Expand All @@ -72,7 +72,7 @@ in

config = {
flake = {
nixosModules.nixosFlake = ./nix/nixos-module.nix;
nixosModules.nixosFlake = ./nixos-module.nix;
# Linux home-manager module
nixosModules.home-manager = {
imports = [
Expand All @@ -85,7 +85,7 @@ in
];
};

darwinModules_.nixosFlake = ./nix/nixos-module.nix;
darwinModules_.nixosFlake = ./nixos-module.nix;
# macOS home-manager module
# This is named with an underscope, because flake-parts segfaults otherwise!
# See https://github.com/srid/nixos-config/issues/31
Expand Down

0 comments on commit 2490f2a

Please sign in to comment.