diff --git a/home/apps/default.nix b/home/apps/default.nix
index 291ebb1..7dc47e3 100644
--- a/home/apps/default.nix
+++ b/home/apps/default.nix
@@ -1,3 +1,4 @@
+{ pkgs, ... }:
 {
   imports = [
     # ./discord.nix
@@ -5,4 +6,31 @@
     ./mpv.nix
     # ./vscode.nix
   ];
+
+  home.packages = with pkgs; [
+    # gui applications
+    input-leap
+    libreoffice-qt-fresh
+    # nur.repos.forkprince.helium-nightly
+    chromium
+    nautilus
+    fractal
+    tuba
+
+    # gui applications ( multimedia )
+    audacity
+    strawberry
+    musescore
+    gimp
+    # calibre
+    # riff
+    dissent
+    loupe
+    spotify-player
+
+    # overrides
+    # (chromium.override {
+    #   enableWideVine = true;
+    # })
+  ];
 }
diff --git a/home/default.nix b/home/default.nix
index 96fd263..319b733 100755
--- a/home/default.nix
+++ b/home/default.nix
@@ -1,105 +1,14 @@
 {
-  config,
-  pkgs,
-  pkgs-unstable,
-  ...
-}:
-{
+  # This value determines the Home Manager release that your
+  # configuration is compatible with. This helps avoid breakage
+  # when a new Home Manager release introduces backwards
+  # incompatible changes.
+  #
+  # You can update Home Manager without changing this value. See
+  # the Home Manager release notes for a list of state version
+  # changes in each release.
+  config.home.stateVersion = "25.05";
 
-  config = {
-    home.packages = with pkgs; [
-      # cli utilities
-      tmux
-      fastfetch
-      btop
-      wget
-      ripgrep
-      ncdu
-      fzf
-      wl-clipboard
-      rclone
-      waypipe
-      spotdl
-      browsh
-      mosh
-      gh
-
-      # development & tooling
-      jdk21_headless
-      quickemu
-      nerd-fonts.noto
-      noto-fonts
-      noto-fonts-color-emoji
-      nix-prefetch
-      prowlarr
-      radarr
-      sonarr
-      flaresolverr
-      nerd-fonts.fira-mono
-      ffmpeg-full
-
-      # kde and kde theming
-      kde-rounded-corners
-      kdePackages.partitionmanager
-      adwaita-icon-theme
-      morewaita-icon-theme
-
-      # gui applications
-      input-leap
-      libreoffice-qt-fresh
-      # nur.repos.forkprince.helium-nightly
-      chromium
-      nautilus
-      fractal
-      tuba
-
-      # gui applications ( multimedia )
-      audacity
-      strawberry
-      musescore
-      gimp
-      # calibre
-      # riff
-      dissent
-      loupe
-      spotify-player
-
-      # overrides
-      # (chromium.override {
-      #   enableWideVine = true;
-      # })
-    ];
-
-    services = {
-      spotifyd = {
-        enable = true;
-        package = pkgs-unstable.spotifyd;
-        settings = {
-          global = {
-            device_type = "computer";
-            dbus_type = "session";
-            disable_discovery = true;
-            use_mpris = true;
-            bitrate = 320;
-            initial_volume = 100;
-            volume_normalisation = true;
-            normalisation_pregain = 0;
-          };
-        };
-      };
-    };
-
-    # This value determines the Home Manager release that your
-    # configuration is compatible with. This helps avoid breakage
-    # when a new Home Manager release introduces backwards
-    # incompatible changes.
-    #
-    # You can update Home Manager without changing this value. See
-    # the Home Manager release notes for a list of state version
-    # changes in each release.
-    home.stateVersion = "25.05";
-
-    # Let Home Manager install and manage itself.
-    programs.home-manager.enable = true;
-  };
+  # Let Home Manager install and manage itself.
+  config.programs.home-manager.enable = true;
 }
diff --git a/home/hosts/peach/default.nix b/home/hosts/peach/default.nix
index 3b3319a..dee4f54 100644
--- a/home/hosts/peach/default.nix
+++ b/home/hosts/peach/default.nix
@@ -5,7 +5,7 @@
 }:
 {
   colors = {
-    scheme = "kanagawa-dragon";
+    scheme = "material-dark";
     accent = "base09";
   };
 
diff --git a/home/services/default.nix b/home/services/default.nix
index 307dc31..ed05a05 100644
--- a/home/services/default.nix
+++ b/home/services/default.nix
@@ -10,6 +10,13 @@
     ./systemd.nix
   ];
 
+  home.packages = with pkgs; [
+    # kde and kde theming
+    adwaita-icon-theme
+    morewaita-icon-theme
+    # kde-rounded-corners
+  ];
+
   home.file = {
     ".icons/default/index.theme" = {
       text = ''
@@ -22,6 +29,24 @@
     };
   };
 
+  services = {
+    spotifyd = {
+      enable = true;
+      settings = {
+        global = {
+          device_type = "computer";
+          dbus_type = "session";
+          disable_discovery = true;
+          use_mpris = true;
+          bitrate = 320;
+          initial_volume = 100;
+          volume_normalisation = true;
+          normalisation_pregain = 0;
+        };
+      };
+    };
+  };
+
   dconf.settings = {
     "org/gnome/desktop/interface" = {
       color-scheme = "prefer-dark";
diff --git a/home/terminal/default.nix b/home/terminal/default.nix
index 379f1df..4210b84 100644
--- a/home/terminal/default.nix
+++ b/home/terminal/default.nix
@@ -1,3 +1,9 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 {
   imports = [
     ./btop.nix
@@ -5,4 +11,48 @@
     ./kitty.nix
     ./neovim.nix
   ];
+
+  home.packages = with pkgs; [
+    # cli utilities
+    tmux
+    fastfetch
+    btop
+    wget
+    ripgrep
+    ncdu
+    fzf
+    wl-clipboard
+    rclone
+    waypipe
+    spotdl
+    browsh
+    mosh
+    gh
+
+    # development & tooling
+    jdk21_headless
+    quickemu
+    nerd-fonts.noto
+    noto-fonts
+    noto-fonts-color-emoji
+    nix-prefetch
+    prowlarr
+    radarr
+    sonarr
+    flaresolverr
+    nerd-fonts.fira-mono
+    ffmpeg-full
+  ];
+
+  programs.git = {
+    enable = true;
+    settings = {
+      user = {
+        name = config.userOptions.name;
+        email = config.userOptions.email;
+      };
+      core.pager = "${pkgs.bat}/bin/bat";
+      commit.gpgsign = true;
+    };
+  };
 }
diff --git a/options.nix b/options.nix
index 68396e5..0f62b2b 100644
--- a/options.nix
+++ b/options.nix
@@ -32,6 +32,11 @@
         readOnly = true;
         default = config.system.name;
       };
+      email = lib.mkOption {
+        type = lib.types.str;
+        readOnly = true;
+        default = "kovacsmillio@gmail.com";
+      };
       fontSans = {
         name = lib.mkOption {
           type = lib.types.str;