aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsils <sils@sils.li>2023-01-20 18:45:09 +0100
committersils <sils@sils.li>2023-01-20 18:45:09 +0100
commit2343104396e086bd763d994c2372dbfa03ccb85f (patch)
tree2ed068483e1c37d109d0955b8b44bf3c3c493835
parentFix: declare xdg-portal (diff)
downloadnix-config-2343104396e086bd763d994c2372dbfa03ccb85f.zip
Structure: Move configuration.nix into host specific file
This ensures that nixos-rebuild uses flakes and will probably have advantages in case I'll ever want to deploy multiple machines using this config.
Diffstat (limited to '')
-rw-r--r--flake.nix2
-rw-r--r--sysconf/thinklappi.nix (renamed from configuration.nix)18
2 files changed, 10 insertions, 10 deletions
diff --git a/flake.nix b/flake.nix
index 16f49fb..37a7906 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,7 +5,7 @@
}: {
nixosConfigurations.thinklappi = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
- modules = [./configuration.nix];
+ modules = [./sysconf/thinklappi.nix];
};
};
}
diff --git a/configuration.nix b/sysconf/thinklappi.nix
index 819cec8..4904ffd 100644
--- a/configuration.nix
+++ b/sysconf/thinklappi.nix
@@ -4,20 +4,20 @@
...
}: let
compiledLayout = pkgs.runCommand "keyboard-layout" {} ''
- ${pkgs.xorg.xkbcomp}/bin/xkbcomp ${./files/neoqwertz.xkb} $out
+ ${pkgs.xorg.xkbcomp}/bin/xkbcomp ${../files/neoqwertz.xkb} $out
'';
in {
imports = [
- ./hardware/basesystem.nix
- ./env.nix
- ./nix.nix
- ./packages.nix
- ./users.nix
- ./zsh.nix
- ./flatpak.nix # Mainly for minecraft
+ ../hardware/basesystem.nix
+ ../env.nix
+ ../nix.nix
+ ../packages.nix
+ ../users.nix
+ ../zsh.nix
+ ../flatpak.nix # Mainly for minecraft
# Desktop Environment to use
- ./desktop/plasma.nix
+ ../desktop/plasma.nix
];
services = {