diff --git a/.config/lazygit/config.yml b/.config/lazygit/config.yml
index e5e2e8b4..4c721cfc 100644
--- a/.config/lazygit/config.yml
+++ b/.config/lazygit/config.yml
@@ -1,2 +1,76 @@
 gui:
-  mouseEvents: false
+    nerdFontsVersion: "3"
+    mouseEvents: false
+update:
+    days: 1
+refresher:
+    refreshInterval: 5
+    fetchInterval: 30
+disableStartupPopups: true
+customCommands:
+  - key: b
+    command: "git branch --merged master | grep -v '^[ *]*master$' | xargs git branch -d"
+    context: "localBranches"
+    loadingText: "Pruning..."
+    description: "prune local branches that have been merged to master"
+  - key: "<c-v>"
+    context: "global"
+    description: "Create new conventional commit"
+    prompts:
+      - type: "menu"
+        key: "Type"
+        title: "Type of change"
+        options:
+          - name: "build"
+            description: "Changes that affect the build system or external dependencies"
+            value: "build"
+          - name: "feat"
+            description: "A new feature"
+            value: "feat"
+          - name: "fix"
+            description: "A bug fix"
+            value: "fix"
+          - name: "chore"
+            description: "Other changes that don't modify src or test files"
+            value: "chore"
+          - name: "ci"
+            description: "Changes to CI configuration files and scripts"
+            value: "ci"
+          - name: "docs"
+            description: "Documentation only changes"
+            value: "docs"
+          - name: "perf"
+            description: "A code change that improves performance"
+            value: "perf"
+          - name: "refactor"
+            description: "A code change that neither fixes a bug nor adds a feature"
+            value: "refactor"
+          - name: "revert"
+            description: "Reverts a previous commit"
+            value: "revert"
+          - name: "style"
+            description: "Changes that do not affect the meaning of the code"
+            value: "style"
+          - name: "test"
+            description: "Adding missing tests or correcting existing tests"
+            value: "test"
+      - type: "input"
+        title: "Scope - Add '(<scope>)'"
+        key: "Scope"
+        initialValue: ""
+      - type: "input"
+        title: "Breaking change - Add '!'"
+        key: "Breaking"
+        initialValue: ""
+      - type: "input"
+        title: "message"
+        key: "Message"
+        initialValue: ""
+      - type: "confirm"
+        key: "Confirm"
+        title: "Commit"
+        body: "Are you sure you want to commit?"
+    command: "git commit --message '{{.Form.Type}}{{.Form.Scope}}{{.Form.Breaking}}: {{.Form.Message}}'"
+    loadingText: "Creating conventional commit..."
+notARepository: skip
+promptToReturnFromSubprocess: true
diff --git a/.config/lf/lfrc b/.config/lf/lfrc
index 59efe357..738d34d6 100644
--- a/.config/lf/lfrc
+++ b/.config/lf/lfrc
@@ -41,11 +41,8 @@ cmd trash &{{
 
 cmd lazygit ${{
     clear
-    if ! git -C $PWD status >/dev/null 2>&1; then
-        [ $(echo "Yes\nNo" | fzf --header="Not in a git repository. Create a new git repository? (y/n): ") = "Yes" ] && git init && lazygit
-    else
-        lazygit
-    fi
+    dir="$(realpath $PWD)"
+    env PWD=$(realpath $PWD) lazygit
 }}
 
 # y (select for copy) and P to paste soft-link