organized

modules/desktop/desktop.nix

@@ -1,3 +1,4 @@
+# desktop.nix
 {
   config,
   lib,
@@ -5,31 +6,13 @@
   pkgs,
   ...
 }: let
-  inherit
-    (lib)
-    mkIf
-    mkOption
-    types
-    ;
   cfg = config.programs.illogical-impulse;
 in {
-  options = {
+  imports = [
-    programs.illogical-impulse = {
+    ./options.nix
-      enable = mkOption {
+  ];
-        type = types.bool;
+
-        default = false;
+  config = lib.mkIf cfg.enable {
-        description = ''
-          Enables Illogical-impulse by end4.
-        '';
-      };
-    };
-  };
-  config = mkIf cfg.enable {
-    # programs.hyprland = {
-    #   enable = true;
-    #   package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
-    #   portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
-    # };
     home.file = {
       ".config/quickshell".source = builtins.path {path = ../../.config/quickshell;};
       ".config/hypr".source = builtins.path {path = ../../.config/hypr;};
@@ -46,9 +29,6 @@ in {
     home.packages =
       import ../packages.nix {inherit pkgs;}
       ++ [
-        # inputs.illogical-impulse.legacyPackages.${pkgs.system}.iiShellConfig
-        # inputs.illogical-impulse.legacyPackages.${pkgs.system}.iiOneUI4Icons
-        # inputs.illogical-impulse.legacyPackages.${pkgs.system}.quickshellWithQT
         inputs.illogical-impulse.packages.${pkgs.system}.default
         inputs.matugen.packages.${pkgs.system}.default
         inputs.hyprland.packages.${pkgs.system}.default

modules/options.nix

@@ -0,0 +1,22 @@
+{
+  config,
+  lib,
+  ...
+}: {
+  options.programs.illogical-impulse = {
+    enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = "Enable the illogical-impulse program module.";
+    };
+    settings = {
+      simpleStarship = {
+        enable = lib.mkOption {
+          type = lib.types.bool;
+          default = false;
+          description = "Uses a custom pure-like starship configuration.";
+        };
+      };
+    };
+  };
+}

modules/terminal/simple-starship.nix

@@ -1,62 +0,0 @@
-{lib, ...}: {
-  programs.starship = {
-    enable = true;
-    settings = {
-      format = lib.concatStrings [
-        "$username"
-        "$hostname"
-        "$directory"
-        "$git_branch"
-        "$git_state"
-        "$git_status"
-        "$cmd_duration"
-        "$line_break"
-        "$python"
-        "$character"
-      ];
-
-      directory = {
-        style = "blue";
-      };
-
-      character = {
-        success_symbol = "[→](purple)";
-        error_symbol = "[→](red)";
-        vimcmd_symbol = "[←](green)";
-      };
-
-      git_branch = {
-        format = "[$branch]($style)";
-        style = "bright-black";
-      };
-      git_status = {
-        format = "[(*$conflicted$untracked$modified$staged$renamed$deleted) $ahead_behind$stashed]($style)";
-        style = "cyan";
-        conflicted = "​";
-        untracked = "​";
-        modified = "​";
-        staged = "​";
-        renamed = "​";
-        deleted = "​";
-        stashed = "≡";
-      };
-      git_state = {
-        format = "([$state( $progress_current/$progress_total)]($style)) ";
-        style = "bright-black";
-      };
-
-      cmd_duration = {
-        format = "[$duration]($style) ";
-        style = "yellow";
-      };
-
-      python = {
-        format = "[$virtualenv]($style) ";
-        style = "bright-black";
-      };
-    };
-  };
-  # home.file.".config/starship.toml" = {
-  #   source = builtins.toPath ./pure.toml;
-  # };
-}

modules/terminal/terminal.nix

@@ -5,24 +5,9 @@
 }: let
   cfg = config.programs.illogical-impulse;
 in {
-  options = {
+  imports = [
-    programs.illogical-impulse = {
+    ./options.nix
-      enable = lib.mkOption {
+  ];
-        type = lib.types.bool;
-        default = false;
-        description = "Enable the illogical-impulse program module.";
-      };
-      settings = {
-        simpleStarship = {
-          enable = lib.mkOption {
-            type = lib.types.bool;
-            default = false;
-            description = "Uses a custom pure-like starship configuration.";
-          };
-        };
-      };
-    };
-  };
 
   config = lib.mkIf cfg.enable {
     programs.starship = lib.mkIf cfg.settings.simpleStarship.enable {