chore: formatter

home/shahab/aamil-1.nix

@@ -0,0 +1,27 @@
+{lib, ...}: {
+  imports = lib.flatten [
+    #
+    # ========== Required Configs ==========
+    #
+    ./common/core
+
+    #
+    # ========== Host-specific Optional Configs ==========
+    #
+    (map (config: "${builtins.toString ./.}/common/optional/${config}.nix") [
+      "btop"
+      "nvim"
+      "starship"
+      "tmux"
+      "zsh"
+    ])
+  ];
+
+  home = {
+    # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
+    stateVersion = "25.05";
+    sessionVariables = {
+      EDITOR = "nvim";
+    };
+  };
+}

home/shahab/aamil-2.nix

@@ -0,0 +1,27 @@
+{lib, ...}: {
+  imports = lib.flatten [
+    #
+    # ========== Required Configs ==========
+    #
+    ./common/core
+
+    #
+    # ========== Host-specific Optional Configs ==========
+    #
+    (map (config: "${builtins.toString ./.}/common/optional/${config}.nix") [
+      "btop"
+      "nvim"
+      "starship"
+      "tmux"
+      "zsh"
+    ])
+  ];
+
+  home = {
+    # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
+    stateVersion = "25.05";
+    sessionVariables = {
+      EDITOR = "nvim";
+    };
+  };
+}

home/shahab/aamil-3.nix

@@ -0,0 +1,27 @@
+{lib, ...}: {
+  imports = lib.flatten [
+    #
+    # ========== Required Configs ==========
+    #
+    ./common/core
+
+    #
+    # ========== Host-specific Optional Configs ==========
+    #
+    (map (config: "${builtins.toString ./.}/common/optional/${config}.nix") [
+      "btop"
+      "nvim"
+      "starship"
+      "tmux"
+      "zsh"
+    ])
+  ];
+
+  home = {
+    # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
+    stateVersion = "25.05";
+    sessionVariables = {
+      EDITOR = "nvim";
+    };
+  };
+}

home/shahab/common/core/default.nix

@@ -7,11 +7,6 @@
 }: {
   imports = lib.flatten [
     (map lib.custom.relativeToRoot ["modules/common" "modules/home-manager"])
-
-    ./kitty.nix
-    ./direnv.nix
-    ./git.nix
-    ./fonts.nix
   ];
 
   inherit hostSpec;
@@ -27,32 +22,6 @@
       VISUAL = "nvim";
       EDITOR = "nvim";
     };
-
-    packages = with pkgs; [
-      nh
-      btop
-      eza
-      ripgrep
-      rm-improved
-      dust
-      zoxide
-      xcp
-      unzip
-      tmux
-      gcc
-      zig
-      gparted
-      gnupg
-      dig
-      bash
-      kdePackages.dolphin
-      font-awesome
-      tree
-      wl-clipboard-rs
-      brightnessctl
-      age
-      nerd-fonts.jetbrains-mono
-    ];
   };
 
   nix = {

home/shahab/common/optional/git.nix

@@ -5,13 +5,14 @@
   ...
 }: {
   programs.git = {
-    package = pkgs.gitAndTools.gitFull;
     enable = true;
-    userName = config.hostSpec.userFullName;
-    userEmail = config.hostSpec.email.user;
     lfs.enable = true;
 
-    extraConfig = {
+    settings = {
+      user = {
+        name = config.hostSpec.userFullName;
+        email = config.hostSpec.email.user;
+      };
       gpg = {format = "ssh";};
       "gpg \"ssh\"" = {
         program = "${lib.getExe' pkgs._1password-gui "op-ssh-sign"}";

home/shahab/common/optional/misc-packages.nix

@@ -1,5 +1,23 @@
 {pkgs, ...}: {
   home.packages = with pkgs; [
+    uv
+    btop
+    zoxide
+    unzip
+    tmux
+    gcc
+    zig
+    gparted
+    gnupg
+    dig
+    bash
+    kdePackages.dolphin
+    font-awesome
+    tree
+    wl-clipboard-rs
+    brightnessctl
+    age
+    nerd-fonts.jetbrains-mono
     lazygit
     gh
     dbeaver-bin

home/shahab/common/optional/zsh.nix

@@ -1,4 +1,18 @@
-{config, ...}: {
+{
+  config,
+  pkgs,
+  ...
+}: {
+  home.packages = with pkgs; [
+    eza
+    ripgrep
+    rm-improved
+    dust
+    xcp
+    nh
+    zoxide
+  ];
+
   programs.zsh = {
     enable = true;
     enableCompletion = true;

home/shahab/rihla.nix

@@ -10,8 +10,13 @@
     #
     (map (config: "${builtins.toString ./.}/common/optional/${config}.nix") [
       "btop"
+      "direnv"
       "firefox"
+      "fonts"
+      "ghostty"
+      "git"
       "hyprland"
+      "kitty"
       "misc-packages"
       "nvim"
       "ssh"