📦 Moved more configs to common files, and refactored code with common

home-manager/default.nix

@@ -6,7 +6,7 @@
 let
   common = import ../common.nix;
   username = common.username;
-  homeDir = "/home/${username}";
+  dir = common.dir;
 in
 {
   imports = [
@@ -23,10 +23,10 @@ in
   # paths it should manage.
   home = {
     username = username;
-    homeDirectory = homeDir;
+    homeDirectory = dir.home;
 
     sessionVariables = {
-      XDG_PICTURES_DIR = "${homeDir}/Pictures";
+      XDG_PICTURES_DIR = dir.pictures; # Define the default dir for pictures
     };
 
     # You can update Home Manager without changing this value. See
@@ -36,6 +36,8 @@ in
   };
 
   programs = {
+    btop.enable = true;
+
     git = {
       enable = true;
       userName = "Martin Berg Alstad";
@@ -48,7 +50,10 @@ in
     # Let Home Manager install and manage itself.
     home-manager.enable = true;
 
-    kitty.enable = true;
+    kitty = {
+      enable = common.terminal == "kitty";
+      settings.window_padding_width = 10;
+    };
   };
 
   services = {