Skip to content

Commit a252456

Browse files
devtobidevtobi
committed
Added cmux config and fixed git diff
1 parent 90b8a42 commit a252456

2 files changed

Lines changed: 200 additions & 3 deletions

File tree

‎private_dot_config/cmux/private_cmux.json‎

Lines changed: 195 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,195 @@
1+
{
2+
"$schema": "https://raw.githubusercontent.com/manaflow-ai/cmux/main/web/data/cmux.schema.json",
3+
"schemaVersion": 1,
4+
5+
// This file uses JSON with comments (JSONC).
6+
// Uncomment and edit any setting to make it file-managed.
7+
// Remove a setting to fall back to the value saved in Settings.
8+
// cmux creates this template on launch when both settings file locations are missing.
9+
// ~/.config/cmux/settings.json takes precedence over the Application Support fallback.
10+
11+
"app" : {
12+
"language" : "en",
13+
"appearance" : "system",
14+
"appIcon" : "automatic",
15+
"menuBarOnly": false,
16+
"newWorkspacePlacement" : "afterCurrent",
17+
"workspaceInheritWorkingDirectory": false,
18+
"minimalMode" : false,
19+
"keepWorkspaceOpenWhenClosingLastSurface" : false,
20+
"focusPaneOnFirstClick" : true,
21+
"preferredEditor" : "code",
22+
"openSupportedFilesInCmux": true,
23+
"openMarkdownInCmuxViewer": true,
24+
"reorderOnNotification" : false,
25+
"iMessageMode": true,
26+
"sendAnonymousTelemetry" : false,
27+
"confirmQuit" : "never",
28+
"warnBeforeClosingTab": false,
29+
"warnBeforeClosingTabXButton": false,
30+
"hideTabCloseButton": false,
31+
"renameSelectsExistingName" : true,
32+
"commandPaletteSearchesAllSurfaces" : true
33+
},
34+
"terminal": {
35+
"showScrollBar": true,
36+
"copyOnSelect": false,
37+
"autoResumeAgentSessions": true,
38+
"textBoxMaxLines": 10
39+
// "resumeCommands": ""
40+
},
41+
"notifications" : {
42+
"dockBadge" : true,
43+
"showInMenuBar" : false,
44+
"unreadPaneRing" : true,
45+
"paneFlash" : true,
46+
"sound" : "Funk",
47+
// "customSoundFilePath" : "",
48+
// "command" : "",
49+
"hooksMode": "append"
50+
// "hooks": "[]"
51+
},
52+
"sidebar" : {
53+
"hideAllDetails" : false,
54+
"showWorkspaceDescription": true,
55+
"branchLayout" : "vertical",
56+
"showNotificationMessage" : true,
57+
"showBranchDirectory" : true,
58+
"showPullRequests" : true,
59+
"watchGitStatus": true,
60+
"makePullRequestsClickable": true,
61+
"openPullRequestLinksInCmuxBrowser" : true,
62+
"openPortLinksInCmuxBrowser" : true,
63+
"showSSH" : true,
64+
"showPorts" : true,
65+
"showLog" : true,
66+
"showProgress" : true,
67+
"showCustomMetadata" : true
68+
},
69+
"workspaceColors" : {
70+
"indicatorStyle" : "leftRail",
71+
"selectionColor" : "#999999",
72+
"notificationBadgeColor" : "#007AFF"
73+
// "colors" : {
74+
// "Amber" : "#7D6608",
75+
// "Aqua" : "#0E6B8C",
76+
// "Blue" : "#1565C0",
77+
// "Brown" : "#7B3F00",
78+
// "Charcoal" : "#3E4B5E",
79+
// "Crimson" : "#922B21",
80+
// "Green" : "#196F3D",
81+
// "Indigo" : "#283593",
82+
// "Magenta" : "#AD1457",
83+
// "Navy" : "#1A5276",
84+
// "Olive" : "#4A5C18",
85+
// "Orange" : "#A04000",
86+
// "Purple" : "#6A1B9A",
87+
// "Red" : "#C0392B",
88+
// "Rose" : "#880E4F",
89+
// "Teal" : "#006B6B"
90+
// },
91+
},
92+
"sidebarAppearance" : {
93+
"matchTerminalBackground" : true,
94+
// "tintColor" : "#000000",
95+
// "lightModeTintColor" : null,
96+
// "darkModeTintColor" : null,
97+
// "tintOpacity" : 0.17999999999999999
98+
},
99+
"automation" : {
100+
"socketControlMode" : "automation",
101+
"socketPassword" : "",
102+
"claudeCodeIntegration" : false,
103+
// "claudeBinaryPath" : "",
104+
// "ripgrepBinaryPath" : "",
105+
"suppressSubagentNotifications": true,
106+
"cursorIntegration": false,
107+
"geminiIntegration": false,
108+
"portBase" : 9100,
109+
"portRange" : 10
110+
},
111+
"browser" : {
112+
"defaultSearchEngine" : "google",
113+
"showSearchSuggestions" : true,
114+
"theme" : "system",
115+
"discardHiddenWebViews": true,
116+
"hiddenWebViewDiscardDelaySeconds": 120,
117+
"openTerminalLinksInCmuxBrowser" : true,
118+
"interceptTerminalOpenCommandInCmuxBrowser" : true,
119+
// "hostsToOpenInEmbeddedBrowser" : [
120+
//
121+
// ],
122+
// "urlsToAlwaysOpenExternally" : [
123+
//
124+
// ],
125+
"insecureHttpHostsAllowedInEmbeddedBrowser" : [
126+
"localhost",
127+
"*.localhost",
128+
"127.0.0.1",
129+
"::1",
130+
"0.0.0.0",
131+
"*.localtest.me"
132+
],
133+
"showImportHintOnBlankTabs" : true
134+
// "reactGrabVersion" : "0.1.29",
135+
},
136+
"shortcuts" : {
137+
// "bindings" : {
138+
// "browserBack" : "cmd+[",
139+
// "browserForward" : "cmd+]",
140+
// "browserReload" : "cmd+r",
141+
// "browserZoomIn" : "cmd+=",
142+
// "browserZoomOut" : "cmd+-",
143+
// "browserZoomReset" : "cmd+0",
144+
// "closeOtherTabsInPane" : "cmd+opt+t",
145+
// "closeTab" : "cmd+w",
146+
// "closeWindow" : "cmd+ctrl+w",
147+
// "closeWorkspace" : "cmd+shift+w",
148+
// "commandPalette" : "cmd+shift+p",
149+
// "editWorkspaceDescription" : "cmd+shift+e",
150+
// "find" : "cmd+f",
151+
// "findNext" : "cmd+g",
152+
// "findPrevious" : "cmd+opt+g",
153+
// "focusBrowserAddressBar" : "cmd+l",
154+
// "focusDown" : "cmd+opt+↓",
155+
// "focusLeft" : "cmd+opt+←",
156+
// "focusRight" : "cmd+opt+→",
157+
// "focusUp" : "cmd+opt+↑",
158+
// "goToWorkspace" : "cmd+p",
159+
// "hideFind" : "cmd+shift+f",
160+
// "jumpToUnread" : "cmd+shift+u",
161+
// "newSurface" : "cmd+t",
162+
// "newTab" : "cmd+n",
163+
// "newWindow" : "cmd+shift+n",
164+
// "nextSidebarTab" : "cmd+ctrl+]",
165+
// "nextSurface" : "cmd+shift+]",
166+
// "openBrowser" : "cmd+shift+l",
167+
// "openFolder" : "cmd+o",
168+
// "openSettings" : "cmd+,",
169+
// "prevSidebarTab" : "cmd+ctrl+[",
170+
// "prevSurface" : "cmd+shift+[",
171+
// "quit" : "cmd+q",
172+
// "reloadConfiguration" : "cmd+shift+,",
173+
// "renameTab" : "cmd+r",
174+
// "renameWorkspace" : "cmd+shift+r",
175+
// "reopenClosedBrowserPanel" : "cmd+shift+t",
176+
// "selectSurfaceByNumber" : "ctrl+1",
177+
// "selectWorkspaceByNumber" : "cmd+1",
178+
// "sendFeedback" : "cmd+opt+f",
179+
// "showBrowserJavaScriptConsole" : "cmd+opt+c",
180+
// "showNotifications" : "cmd+i",
181+
// "splitBrowserDown" : "cmd+shift+opt+d",
182+
// "splitBrowserRight" : "cmd+opt+d",
183+
// "splitDown" : "cmd+shift+d",
184+
// "splitRight" : "cmd+d",
185+
// "toggleBrowserDeveloperTools" : "cmd+opt+i",
186+
// "toggleFullScreen" : "cmd+ctrl+f",
187+
// "toggleReactGrab" : "cmd+shift+g",
188+
// "toggleSidebar" : "cmd+b",
189+
// "toggleSplitZoom" : "cmd+shift+\r",
190+
// "toggleTerminalCopyMode" : "cmd+shift+m",
191+
// "triggerFlash" : "cmd+shift+h",
192+
// "useSelectionForFind" : "cmd+e"
193+
// }
194+
}
195+
}

‎private_dot_config/git/dot_gitconfig-tools‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,14 @@
1111
# Configuration for delta diff checker
1212
[core]
1313
pager = delta
14+
[interactive]
15+
diffFilter = delta --color-only
1416
[delta]
15-
navigate = true # use n and N to move between diff sections
17+
navigate = true # use n and N to move between diff sections
1618
side-by-side = true
1719
line-numbers = true
1820
features = catppuccin-latte
19-
[interactive]
20-
diffFilter = delta --color-only
21+
[merge]
22+
conflictStyle = zdiff3
2123
[include]
2224
path = ~/.config/delta/catppuccin.gitconfig

0 commit comments

Comments
 (0)