diff --git a/configurations/home-manager/leyla/packages/default.nix b/configurations/home-manager/leyla/packages/default.nix
index fd2347c..d8b200d 100644
--- a/configurations/home-manager/leyla/packages/default.nix
+++ b/configurations/home-manager/leyla/packages/default.nix
@@ -45,7 +45,9 @@ in {
         ++ (
           lib.lists.optionals hardware.directAccess.enable (with pkgs; [
             #foss platforms
+            # TODO: move signal to package with impermanence
             signal-desktop-bin
+            # TODO: move bitwarden to package with impermanence
             bitwarden
             ungoogled-chromium
             libreoffice
@@ -55,9 +57,12 @@ in {
             freecad
             # cura
             # kicad-small
+            # TODO: move makemkv to package with configs set and impermanence
             makemkv
             onionshare
             # rhythmbox
+
+            # TODO: move obs to package with impermanence
             (lib.mkIf hardware.graphicsAcceleration.enable obs-studio)
             # wireshark
             # rpi-imager
@@ -71,17 +76,22 @@ in {
             picard
 
             # proprietary platforms
+            # TODO: move discord to package with impermanence
             discord
+            # TODO: move obsidian to package with impermanence
             obsidian
+            # TODO: move prostudiomasters to package with impermanence
             prostudiomasters
             (lib.mkIf hardware.graphicsAcceleration.enable davinci-resolve)
 
             # development tools
             # androidStudioPackages.canary
+            # TODO: move idea to package with impermanence and installed extensions
             jetbrains.idea-community
             qFlipper
 
             # system tools
+            # TODO: move protonvpn to package with impermanence and installed extensions
             protonvpn-gui
             openvpn
             noisetorch
diff --git a/configurations/home-manager/leyla/packages/direnv.nix b/configurations/home-manager/leyla/packages/direnv.nix
index 630d0cc..038c149 100644
--- a/configurations/home-manager/leyla/packages/direnv.nix
+++ b/configurations/home-manager/leyla/packages/direnv.nix
@@ -1,11 +1,21 @@
-{config, ...}: {
-  config = {
+{
+  lib,
+  config,
+  osConfig,
+  ...
+}: let
+  userConfig = osConfig.host.users.leyla;
+in {
+  config = lib.mkIf userConfig.isDesktopUser {
     programs = {
-      git = {
-        enable = config.user.isDesktopUser || config.user.isTerminalUser;
-        userName = "Leyla Becker";
-        userEmail = "git@jan-leila.com";
-        extraConfig.init.defaultBranch = "main";
+      direnv = {
+        enable = true;
+        enableBashIntegration = true;
+        nix-direnv.enable = true;
+        config = {
+          global.hide_env_diff = true;
+          whitelist.exact = ["${config.home.homeDirectory}/documents/code/nix-config"];
+        };
       };
     };
   };
diff --git a/configurations/home-manager/leyla/packages/firefox.nix b/configurations/home-manager/leyla/packages/firefox.nix
index fcac972..a343b0a 100644
--- a/configurations/home-manager/leyla/packages/firefox.nix
+++ b/configurations/home-manager/leyla/packages/firefox.nix
@@ -341,5 +341,6 @@
         };
       };
     };
+    # TODO: impermanence module, prob in home-manager-modules?
   };
 }
diff --git a/configurations/home-manager/leyla/packages/git.nix b/configurations/home-manager/leyla/packages/git.nix
index 038c149..630d0cc 100644
--- a/configurations/home-manager/leyla/packages/git.nix
+++ b/configurations/home-manager/leyla/packages/git.nix
@@ -1,21 +1,11 @@
-{
-  lib,
-  config,
-  osConfig,
-  ...
-}: let
-  userConfig = osConfig.host.users.leyla;
-in {
-  config = lib.mkIf userConfig.isDesktopUser {
+{config, ...}: {
+  config = {
     programs = {
-      direnv = {
-        enable = true;
-        enableBashIntegration = true;
-        nix-direnv.enable = true;
-        config = {
-          global.hide_env_diff = true;
-          whitelist.exact = ["${config.home.homeDirectory}/documents/code/nix-config"];
-        };
+      git = {
+        enable = config.user.isDesktopUser || config.user.isTerminalUser;
+        userName = "Leyla Becker";
+        userEmail = "git@jan-leila.com";
+        extraConfig.init.defaultBranch = "main";
       };
     };
   };
diff --git a/configurations/home-manager/leyla/packages/openssh.nix b/configurations/home-manager/leyla/packages/openssh.nix
index 07b4488..e7131c9 100644
--- a/configurations/home-manager/leyla/packages/openssh.nix
+++ b/configurations/home-manager/leyla/packages/openssh.nix
@@ -20,5 +20,6 @@
         ];
       };
     };
+    # TODO: impermanence module, prob in home-manager-modules?
   };
 }