diff --git a/home-manager/profiles/asahi/default.nix b/home-manager/asahi/default.nix similarity index 80% rename from home-manager/profiles/asahi/default.nix rename to home-manager/asahi/default.nix index 9f555d8..f4914a9 100644 --- a/home-manager/profiles/asahi/default.nix +++ b/home-manager/asahi/default.nix @@ -22,7 +22,7 @@ ); }; perSystem = { - pre-commit.settings.excludes = [ "home-manager/profiles/asahi/vencord.nix" ]; - treefmt.settings.global.excludes = [ "home-manager/profiles/asahi/vencord.nix" ]; + pre-commit.settings.excludes = [ "home-manager/asahi/vencord.nix" ]; + treefmt.settings.global.excludes = [ "home-manager/asahi/vencord.nix" ]; }; } diff --git a/home-manager/profiles/asahi/home.nix b/home-manager/asahi/home.nix similarity index 99% rename from home-manager/profiles/asahi/home.nix rename to home-manager/asahi/home.nix index b26c809..9c4cf48 100644 --- a/home-manager/profiles/asahi/home.nix +++ b/home-manager/asahi/home.nix @@ -22,7 +22,7 @@ in secrets = { openrouter_api_key = { }; }; - defaultSopsFile = ../../../sops/secrets.yaml; + defaultSopsFile = ../../sops/secrets.yaml; age.keyFile = /home/${username}/.config/sops/age/keys.txt; }; # https://nix.catppuccin.com/search/rolling/ diff --git a/home-manager/profiles/asahi/vencord.nix b/home-manager/asahi/vencord.nix similarity index 100% rename from home-manager/profiles/asahi/vencord.nix rename to home-manager/asahi/vencord.nix diff --git a/home-manager/default.nix b/home-manager/default.nix index de8c662..2e2a168 100644 --- a/home-manager/default.nix +++ b/home-manager/default.nix @@ -3,43 +3,14 @@ # SPDX-License-Identifier: MIT { inputs, withSystem, ... }: +let + entries = builtins.attrNames (builtins.readDir ./.); + modules = builtins.filter (dir: builtins.pathExists (./. + "/${dir}/default.nix")) entries; +in { imports = [ inputs.home-manager.flakeModules.home-manager - ./profiles - ]; - # https://nix-community.github.io/home-manager/options.xhtml - # flake.homeConfigurations = { - # asahi = withSystem "aarch64-linux" ( - # { pkgs, ... }: - # inputs.home-manager.lib.homeManagerConfiguration { - # inherit pkgs; - # extraSpecialArgs = { inherit inputs pkgs; }; - # modules = [ - # { nixpkgs.overlays = [ inputs.nur.overlays.default ]; } - # inputs.lix-module.nixosModules.default - # inputs.sops-nix.homeManagerModules.sops - # inputs.stylix.homeModules.stylix - # inputs.catppuccin.homeModules.catppuccin - # ./home.nix - # ]; - # } - # ); - # raspi = withSystem "aarch64-linux" ( - # { pkgs, ... }: - # inputs.home-manager.lib.homeHamagerConfiguration { - # inherit pkgs; - # extraSpecialArgs = { inherit inputs pkgs; }; - # modules = [ - # inputs.lix-module.nixosModules.default - # inputs.sops-nix.homeManagerModules.sops - # inputs.stylix.homeModules.stylix - # inputs.catppuccin.homeModules.catppuccin - # ./home.nix - # ]; - # } - # ); - # }; + ] ++ builtins.map (name: (./. + "/${name}")) modules; perSystem = { config, system, ... }: let @@ -54,14 +25,29 @@ { _module.args.pkgs = pkgs; devshells.default = { - commands = [ - { - help = "󰘥 show home-manager documentation"; - name = "man-home"; - command = "${pkgs.man}/bin/man home-configuration.nix"; - category = " home-manager"; - } - ]; + commands = + [ + { + help = "󰘥 show home-manager documentation"; + name = "man-home"; + command = "${pkgs.man}/bin/man home-configuration.nix"; + category = " home-manager"; + } + ] + ++ builtins.concatMap (name: [ + { + help = " `home-manager switch` for ${name}"; + name = "hm-${name}"; + command = "${pkgs.home-manager}/bin/home-manager switch --flake .#${name}"; + category = " home-manager (${name})"; + } + { + help = "󰸨 `home-manager switch` for ${name} with backup"; + name = "hm-${name}-backup"; + command = "${pkgs.home-manager}/bin/home-manager switch --flake .#${name} -b backup"; + category = " home-manager (${name})"; + } + ]) modules; packages = [ pkgs.home-manager ]; }; }; diff --git a/home-manager/profiles/default.nix b/home-manager/profiles/default.nix deleted file mode 100644 index 63a9b73..0000000 --- a/home-manager/profiles/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-FileCopyrightText: 2025 Ethan Reece -# -# SPDX-License-Identifier: MIT - -{ ... }: -let - entries = builtins.attrNames (builtins.readDir ./.); - modules = builtins.filter (dir: builtins.pathExists (./. + "/${dir}/default.nix")) entries; -in -{ - imports = builtins.map (name: (./. + "/${name}")) modules; - perSystem = - { config, pkgs, ... }: - { - devshells.default.commands = builtins.concatMap (name: [ - { - help = " `home-manager switch` for ${name}"; - name = "hm-${name}"; - command = "${pkgs.home-manager}/bin/home-manager switch --flake .#${name}"; - category = " home-manager (${name})"; - } - { - help = "󰸨 `home-manager switch` for ${name} with backup"; - name = "hm-${name}-backup"; - command = "${pkgs.home-manager}/bin/home-manager switch --flake .#${name} -b backup"; - category = " home-manager (${name})"; - } - ]) modules; - }; -}