upd

flake.nix

@@ -85,7 +85,7 @@
           ];
         };
         extraSpecialArgs = args;
-        modules = [./dotfiles/desktop.nix];
+        modules = [./home/desktop.nix];
       };
 
       gaming = home-manager.lib.homeManagerConfiguration {
@@ -94,7 +94,7 @@
           overlays = [];
         };
         extraSpecialArgs = args;
-        modules = [./dotfiles/gaming.nix];
+        modules = [./home/gaming.nix];
       };
       headless = home-manager.lib.homeManagerConfiguration {
         pkgs = import nixpkgs {
@@ -102,7 +102,7 @@
           overlays = [];
         };
         extraSpecialArgs = args;
-        modules = [./dotfiles/headless.nix];
+        modules = [./home/headless.nix];
       };
     };
     # darwinConfiguration for macOS M series

home/macos.nix

@@ -5,9 +5,7 @@
   ...
 }: {
   imports = [
-    ../packages/fish/default.nix
+    ../modules/console.nix
-    ../packages/kitty/default.nix
-    ../packages/neovim/default.nix
   ];
 
   programs.home-manager.enable = true;

hosts/macos/darwin.nix

@@ -4,6 +4,9 @@
   general,
   ...
 }: {
+  imports = [
+    ../../modules/dev.nix
+  ];
   # List packages installed in system profile. To search by name, run:
   # $ nix-env -qaP | grep wget
   environment.systemPackages = with pkgs; [
@@ -35,5 +38,5 @@
     shell = pkgs.${general.terminal.Shell};
   };
 
-  home-manager.users.${general.Username} = import ../../dotfiles/macos.nix;
+  home-manager.users.${general.Username} = import ../../home/macos.nix;
 }

modules/console.nix

@@ -1,4 +1,10 @@
 {...}: {
   imports = [
+    ../packages/git/default.nix
+    ../packages/fish/default.nix
+    ../packages/kitty/default.nix
+    ../packages/neovim/default.nix
+    ../packages/starship/default.nix
+    ../packages/fastfetch/default.nix
   ];
 }

modules/dev.nix

@@ -0,0 +1,6 @@
+{...}: {
+  imports = [
+    ../system/dev/tools.nix
+    ../system/dev/python.nix
+  ];
+}

packages/fastfetch/default.nix

@@ -0,0 +1,131 @@
+{
+  programs.fastfetch = {
+    enable = true;
+
+    settings = {
+      logo = {
+        padding = {
+          top = 2;
+          left = 1;
+          right = 2;
+        };
+      };
+
+      display = {
+        separator = "  ";
+      };
+
+      modules = [
+        # Title
+        {
+          type = "title";
+          format = "{#1}╭───────────── {#}{user-name-colored}";
+        }
+
+        # System Information Header
+        {
+          type = "custom";
+          format = "{#1}│ {#}System Information";
+        }
+        {
+          type = "os";
+          key = "│  {#keys}󰍹 OS";
+        }
+        {
+          type = "kernel";
+          key = "│  {#keys}󰒋 Kernel";
+        }
+        {
+          type = "uptime";
+          key = "│  {#keys}󰅐 Uptime";
+        }
+        {
+          type = "packages";
+          key = "│  {#keys}󰏖 Packages";
+          format = "{all}";
+        }
+
+        {
+          type = "custom";
+          format = "{#1}│";
+        }
+
+        # Desktop Environment
+        {
+          type = "custom";
+          format = "{#1}│ {#}Desktop Environment";
+        }
+        {
+          type = "de";
+          key = "│  {#keys}󰧨 DE";
+        }
+        {
+          type = "wm";
+          key = "│  {#keys}󱂬 WM";
+        }
+        {
+          type = "wmtheme";
+          key = "│  {#keys}󰉼 Theme";
+        }
+        {
+          type = "display";
+          key = "│  {#keys}󰹑 Resolution";
+        }
+        {
+          type = "shell";
+          key = "│  {#keys}󰞷 Shell";
+        }
+        {
+          type = "terminalfont";
+          key = "│  {#keys}󰛖 Font";
+        }
+
+        {
+          type = "custom";
+          format = "{#1}│";
+        }
+
+        # Hardware Information
+        {
+          type = "custom";
+          format = "{#1}│ {#}Hardware Information";
+        }
+        {
+          type = "cpu";
+          key = "│  {#keys}󰻠 CPU";
+        }
+        {
+          type = "gpu";
+          key = "│  {#keys}󰢮 GPU";
+        }
+        {
+          type = "memory";
+          key = "│  {#keys}󰍛 Memory";
+        }
+        {
+          type = "disk";
+          key = "│  {#keys}󰋊 Disk (/)";
+          folders = "/";
+        }
+
+        {
+          type = "custom";
+          format = "{#1}│";
+        }
+
+        # Colors
+        {
+          type = "colors";
+          key = "│";
+          symbol = "circle";
+        }
+
+        # Footer
+        {
+          type = "custom";
+          format = "{#1}╰───────────────────────────────╯";
+        }
+      ];
+    };
+  };
+}

packages/git/default.nix

@@ -0,0 +1,10 @@
+{general, ...}: {
+  programs.git = {
+    enable = true;
+    extraConfig = {
+      user.name = "${general.gitProfile.user}";
+      user.email = "${general.gitProfile.email}";
+      init.defaultBranch = "${general.gitProfile.defaultBranch}";
+    };
+  };
+}

packages/starship/default.nix

@@ -0,0 +1,62 @@
+{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;
+  # };
+}

system/dev/dev.nix

@@ -0,0 +1,15 @@
+{pkgs, ...}: {
+  environment.systemPackages = with pkgs; [
+    python3
+    python3Packages.pip
+    python3Packages.pygobject3
+    python3Packages.setuptools
+    python3Packages.wheel
+
+    git
+    p7zip
+    busybox
+    tldr
+    jq
+  ];
+}

system/dev/python.nix

@@ -0,0 +1,9 @@
+{pkgs, ...}: {
+  environment.systemPackages = with pkgs; [
+    python3
+    python3Packages.pip
+    python3Packages.pygobject3
+    python3Packages.setuptools
+    python3Packages.wheel
+  ];
+}

system/dev/tools.nix

@@ -0,0 +1,9 @@
+{pkgs, ...}: {
+  environment.systemPackages = with pkgs; [
+    git
+    p7zip
+    busybox
+    tldr
+    jq
+  ];
+}