From c52c7f314ccadcc2fcd91e28c8fd1b88f6d5ce0c Mon Sep 17 00:00:00 2001
From: Benedikt Peetz <benedikt.peetz@b-peetz.de>
Date: Fri, 18 Oct 2024 17:07:46 +0200
Subject: refactor(modules): Move all system modules to `by-name`

From now on all modules should be added to the new `by-name` directory.
This should help remove the (superficial and utterly useless)
distinction between `home-manager` and `NixOS` modules.
---
 flake/nixosConfigurations/default.nix | 3 +--
 flake/packages/default.nix            | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'flake')

diff --git a/flake/nixosConfigurations/default.nix b/flake/nixosConfigurations/default.nix
index c15d7fdd..c4353d5f 100644
--- a/flake/nixosConfigurations/default.nix
+++ b/flake/nixosConfigurations/default.nix
@@ -35,8 +35,7 @@
     lanzaboote.nixosModules.lanzaboote
     serverphone.nixosModules.default
 
-    # Deduplicate some code in the host files
-    ../../modules/system
+    ../../modules
   ];
 
   specialArgs = {
diff --git a/flake/packages/default.nix b/flake/packages/default.nix
index cdc45c64..d4258bfa 100644
--- a/flake/packages/default.nix
+++ b/flake/packages/default.nix
@@ -18,7 +18,7 @@
     builtins.mapAttrs (
       name: value: let
         nvim_config =
-          import ../../modules/home/conf/nvim/default.nix
+          import ../../modules/home.legacy/conf/nvim/default.nix
           build_args;
         build_args = let
           inherit (value._module.args) pkgs;
@@ -80,7 +80,7 @@
         myPkgs
       )));
 
-  firefox = (import ../../modules/home/conf/firefox/scripts) {inherit pkgs sysLib;};
+  firefox = (import ../../modules/home.legacy/conf/firefox/scripts) {inherit pkgs sysLib;};
 in
   {
     # install-iso = nixos-generators.nixosGenerate {
-- 
cgit 1.4.1