From 9d2d722bc670c4374828aa70fe6dac3c529d503b Mon Sep 17 00:00:00 2001 From: kenji Date: Wed, 13 Aug 2025 08:39:37 -0500 Subject: [PATCH] organized --- flake.nix | 2 +- modules/default.nix | 6 +++++ modules/desktop/default.nix | 10 --------- modules/desktop/desktop.nix | 3 --- modules/terminal/terminal.nix | 41 +++++++++++++++++++++++++++++++++++ 5 files changed, 48 insertions(+), 14 deletions(-) create mode 100644 modules/default.nix delete mode 100644 modules/desktop/default.nix create mode 100644 modules/terminal/terminal.nix diff --git a/flake.nix b/flake.nix index 40929658c..fcc22491e 100644 --- a/flake.nix +++ b/flake.nix @@ -52,7 +52,7 @@ in { homeManagerModules = rec { default = illogical-impulse; - illogical-impulse = import ./modules/desktop/default.nix; + illogical-impulse = import ./modules/default.nix; }; legacyPackages = eachSupportedSystem (pkgs: { diff --git a/modules/default.nix b/modules/default.nix new file mode 100644 index 000000000..1c394895d --- /dev/null +++ b/modules/default.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ./desktop/desktop.nix + ./terminal/terminal.nix + ]; +} diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix deleted file mode 100644 index dcbad4b08..000000000 --- a/modules/desktop/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ - inputs, - self, - pkgs, - ... -}: { - imports = [ - ./desktop.nix - ]; -} diff --git a/modules/desktop/desktop.nix b/modules/desktop/desktop.nix index cb3b75625..1e2ef989d 100644 --- a/modules/desktop/desktop.nix +++ b/modules/desktop/desktop.nix @@ -32,9 +32,6 @@ in { }; }; config = mkIf cfg.enable { - imports = lib.optionals cfg.simpleStarship [ - ../terminal/simple-starship.nix - ]; # programs.hyprland = { # enable = true; # package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; diff --git a/modules/terminal/terminal.nix b/modules/terminal/terminal.nix new file mode 100644 index 000000000..3e66a25a5 --- /dev/null +++ b/modules/terminal/terminal.nix @@ -0,0 +1,41 @@ +{ + config, + lib, + inputs, + pkgs, + ... +}: let + inherit + (lib) + mkIf + mkOption + types + ; + cfg = config.programs.illogical-impulse; +in { + options = { + programs.illogical-impulse = { + settings = { + simpleStarship = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Uses Pure starship. + ''; + }; + }; + }; + }; + }; + imports = lib.mkIf cfg.settings.simpleStarship [ + ./simple-starship.nix + ]; + config = mkIf cfg.enable { + home.file = { + ".config/starship.toml" = mkIf (!cfg.simpleStarship) { + source = builtins.path {path = ../../.config/starship.toml;}; + }; + }; + }; +}