From 191d3c33927021299efcf889f1e06dcf52f83c02 Mon Sep 17 00:00:00 2001 From: lightly-toasted Date: Sat, 23 Aug 2025 23:04:25 +0900 Subject: [PATCH] refactor: automate module imports --- home/toast/home.nix | 36 ++++++++++------------------------- hosts/nixos/configuration.nix | 19 +++++++----------- 2 files changed, 17 insertions(+), 38 deletions(-) diff --git a/home/toast/home.nix b/home/toast/home.nix index fd29734..dd7c9af 100644 --- a/home/toast/home.nix +++ b/home/toast/home.nix @@ -5,30 +5,14 @@ inputs.nixcord.homeModules.nixcord inputs.nix-flatpak.homeManagerModules.nix-flatpak inputs.sops-nix.homeManagerModules.sops - - ./modules/kitty.nix - ./modules/git.nix - ./modules/nixvim - ./modules/fonts.nix - ./modules/hyprland.nix - ./modules/tofi.nix - ./modules/zsh.nix - ./modules/firefox.nix - ./modules/yazi.nix - ./modules/nixcord.nix - ./modules/nodejs.nix - ./modules/btop.nix - ./modules/waybar - ./modules/dunst.nix - ./modules/keepassxc.nix - ./modules/mouse-actions - ./modules/hypridle.nix - ./modules/obsidian.nix - ./modules/xdg.nix - ./modules/sops.nix - ./modules/gemini-cli.nix - ]; - + ] ++ ( + let + modulesPath = ./modules; + moduleFiles = builtins.attrNames (builtins.readDir modulesPath); + in + map (module: modulesPath + ("/" + module)) moduleFiles + ); + home = { username = "toast"; homeDirectory = "/home/toast"; @@ -37,7 +21,7 @@ "bin" = { source = ./bin; recursive = true; }; }; }; - + nixpkgs.config.allowUnfree = true; systemd.user.startServices = "sd-switch"; -} +} \ No newline at end of file diff --git a/hosts/nixos/configuration.nix b/hosts/nixos/configuration.nix index e13bee2..a46cedb 100644 --- a/hosts/nixos/configuration.nix +++ b/hosts/nixos/configuration.nix @@ -6,18 +6,13 @@ inputs.nix-flatpak.nixosModules.nix-flatpak inputs.sops-nix.nixosModules.sops ./hardware-configuration.nix - - ./modules/boot.nix - ./modules/network.nix - ./modules/time.nix - ./modules/users.nix - ./modules/packages.nix - ./modules/services.nix - ./modules/hardware.nix - ./modules/environment.nix - ./modules/programs.nix - ./modules/sops.nix - ]; + ] ++ ( + let + modulesPath = ./modules; + moduleFiles = builtins.attrNames (builtins.readDir modulesPath); + in + map (module: modulesPath + ("/" + module)) moduleFiles + ); system.stateVersion = "25.05"; nix.settings.experimental-features = [ "nix-command" "flakes" ];