diff --git a/git/.config/git/config b/git/.config/git/config
new file mode 100644
index 0000000..b6f220d
--- /dev/null
+++ b/git/.config/git/config
@@ -0,0 +1,12 @@
+[user]
+    name = J. Fernando Sánchez
+    email = j@sinpapel.es
+
+[core]
+    pager = delta
+
+[includeIf "gitdir:~/git/work/tcs/"]
+    path = tcs.config
+
+[delta]
+    side-by-side = true
diff --git a/git/.config/git/tcs.config b/git/.config/git/tcs.config
new file mode 100644
index 0000000..26cb79c
--- /dev/null
+++ b/git/.config/git/tcs.config
@@ -0,0 +1,3 @@
+[user]
+	name = J. Fernando Sánchez
+	email = f.sanchez@thechannelstore.tv
diff --git a/git/.gitconfig b/git/.gitconfig
index 867df62..cb1532e 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -1,10 +1,15 @@
 [user]
 	name = J. Fernando Sánchez
-	email = balkian@gmail.com
+	email = j@sanchezrada.es
+
 [diff]
-	tool = vimdiff
+	tool = delta
 [alias]
 	d = difftool
+
+[includeIf "gitdir:~/git/work/tcs"]
+    path = ~/.config/git/tcs.config
+
 [include]
  	path = ~/.gitconfig_secret
 
diff --git a/home-manager/common.nix b/home-manager/common.nix
index c8fa2dc..e9ef1be 100644
--- a/home-manager/common.nix
+++ b/home-manager/common.nix
@@ -39,6 +39,7 @@
     # Utils
     jq
     bat 	# Replacement for less
+    delta # Replacement for less (for git diff and the like)
     eza 	# Better ld
     zoxide 	# better cd
     yazi 	# File manager
@@ -47,12 +48,13 @@
     dust	# File disk utilization
     gnumake
 
+    zenith 	# System monitor
+
+    # Productivity
     taskwarrior3
     taskwarrior-tui
     timewarrior
 
-    zenith 	# System monitor
-
     # Shells
     fish
     grc 	# Colorizer
@@ -120,7 +122,8 @@
   home.sessionVariables = {
     XDG_BIN_HOME    = "${config.home.homeDirectory}/.local/bin";
     #This variable is overriden. It does not work
-    EDITOR = "nvim";
+    EDITOR = "hx";
+    PAGER = "bat";
   };
   home.sessionPath = [ "$XDG_BIN_HOME" ];
 
@@ -181,6 +184,10 @@
 
   fonts.fontconfig.enable = true;
 
-
-
+  xdg.configFile = {
+    "git" = {
+      source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/git/dotfiles/git/.config/git";
+      recursive = true;
+    };
+  };
 }
diff --git a/home-manager/lenny.nix b/home-manager/lenny.nix
index f082c69..66011f8 100644
--- a/home-manager/lenny.nix
+++ b/home-manager/lenny.nix
@@ -4,15 +4,12 @@
   	jujutsu
 	ansible
 	awscli2
-	tinybird
+	cargo-cross
+	rustup
+	rustc
+	gcc
+	vial
+	chromium
   ];
-  programs.git = {
-      enable = true;
-      userName = "Fernando Sánchez";
-      userEmail = "f.sanchez@thechannelstore.tv";
-      extraConfig = {
-              init.defaultBranch = "main";
-      };
-  };
 
 }
diff --git a/jj/.config/jj/config.toml b/jj/.config/jj/config.toml
new file mode 100644
index 0000000..5631010
--- /dev/null
+++ b/jj/.config/jj/config.toml
@@ -0,0 +1,18 @@
+"$schema" = "https://jj-vcs.github.io/jj/latest/config-schema.json"
+
+[user]
+name = "J. Fernando Sánchez"
+email = "f.sanchez@thechannelstore.tv"
+
+[[--scope]]
+--when.repositories = ["~/git/personal/"]
+[--scope.user]
+email = "j@sanchezrada.es"
+
+[ui]
+pager = "delta" #":builtin"
+diff-formatter=":git"
+
+[merge-tools.delta]
+diff-args=["--side-by-side", "$left", "$right", "--width=$width"]
+
diff --git a/lazygit/.config/lazygit/config.yml b/lazygit/.config/lazygit/config.yml
new file mode 100644
index 0000000..6afa251
--- /dev/null
+++ b/lazygit/.config/lazygit/config.yml
@@ -0,0 +1,15 @@
+customCommands:
+  #  - key: "m"
+  #    description: "Merge (no‑ff, no‑commit)"
+  #    command: "git merge --no-ff --no-commit {{.SelectedBranch}}"
+  #    context: "localBranches"
+  #    output: terminal
+  - key: "m"
+    description: "Merge (no‑ff, no‑commit)"
+    command: "git merge --no-ff --no-commit {{.SelectedLocalBranch.Name}}"
+    context: "localBranches"
+    output: terminal
+
+#keybindings:
+#  branches:
+#    merge: "m" # make the UI “Merge” use our custom command
diff --git a/niri/.config/niri/config.kdl b/niri/.config/niri/config.kdl
index 43ba35f..c80ae80 100644
--- a/niri/.config/niri/config.kdl
+++ b/niri/.config/niri/config.kdl
@@ -103,6 +103,7 @@ output "eDP-1" {
     // If the position is unset or results in an overlap, the output is instead placed
     // automatically.
     position x=0 y=0
+    //position x=0 y=1080
 }
 
 output "DP-1" {
@@ -115,10 +116,15 @@ output "DP-1" {
     // for the resolution.
     // If the mode is omitted altogether or is invalid, niri will pick one automatically.
     // Run `niri msg outputs` while inside a niri instance to list all outputs and their modes.
+    //mode "3840x2160@60"
     mode "3840x2160@60"
+    scale 1.25
+    //mode "1920x1080@60"
+    //mode "2560x1440"
+    //scale 1
 
     // You can use integer or fractional scale, for example use 1.5 for 150% scale.
-    scale 1.25
+    //scale 1.0
 
     // Transform allows to rotate the output counter-clockwise, valid values are:
     // normal, 90, 180, 270, flipped, flipped-90, flipped-180 and flipped-270.
@@ -134,6 +140,7 @@ output "DP-1" {
     // If the position is unset or results in an overlap, the output is instead placed
     // automatically.
     position x=1920 y=-500
+    //position x=0 y=0
 }
 
 // Settings that influence how windows are positioned and sized.
@@ -427,6 +434,9 @@ binds {
     // Note: the entire command goes as a single argument in the end.
     // Mod+T { spawn "bash" "-c" "notify-send hello && exec wezterm"; }
 
+    Ctrl+Alt+W { spawn "firefox" "--ProfileManager"; }
+    Ctrl+Alt+Q { spawn "chromium-browser" "--ozone-platform=wayland"; }
+
     // Brightness control
     XF86MonBrightnessUp   allow-when-locked=true { spawn "brightnessctl" "s" "+5%"; }
     XF86MonBrightnessDown   allow-when-locked=true { spawn "brightnessctl" "s" "5%-"; }
@@ -556,6 +566,7 @@ binds {
     Mod+7 { focus-workspace "7"; }
     Mod+8 { focus-workspace "8"; }
     Mod+9 { focus-workspace "9"; }
+    Mod+grave { focus-workspace "teams"; }
     Mod+0 { focus-workspace "teams"; }
     Mod+Ctrl+1 { move-column-to-workspace "terminal"; }
     Mod+Ctrl+2 { move-column-to-workspace "firefox"; }