ian-h-chamberlain.com / dotfiles
this repo has no description
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

First round of changes from 2work

Ian Chamberlain 449883be 1543800d

+76 -63
+3
.bashrc
··· 70 70 # `history` timestamp in output 71 71 export HISTTIMEFORMAT="%F %T " 72 72 73 + # https://stackoverflow.com/a/39352670 74 + export LESS=Rx4 75 + 73 76 if [ "$MAC_OS" = true ]; then 74 77 # (macOS) set up LS colors 75 78 export CLICOLOR=1
+55 -55
.config/Code/User/keybindings.json
··· 948 948 { 949 949 "key": "ctrl+k ctrl+s", 950 950 "command": "workbench.action.openGlobalKeybindingsFile", 951 - "when": "isLinux" 951 + "when": "(isLinux || isWindows)" 952 952 }, 953 953 { 954 954 "key": "ctrl+t", 955 955 "command": "workbench.action.quickOpen", 956 - "when": "isLinux" 956 + "when": "(isLinux || isWindows)" 957 957 }, 958 958 { 959 959 "key": "ctrl+p", 960 960 "command": "workbench.action.gotoSymbol", 961 - "when": "isLinux" 961 + "when": "(isLinux || isWindows)" 962 962 }, 963 963 { 964 964 "key": "ctrl+b", 965 965 "command": "workbench.action.toggleSidebarVisibility", 966 - "when": "isLinux" 966 + "when": "(isLinux || isWindows)" 967 967 }, 968 968 { 969 969 "key": "ctrl+f", 970 970 "command": "-vscode-neovim.ctrl-f", 971 - "when": "isLinux && editorTextFocus && neovim.ctrlKeysNormal && neovim.init && neovim.mode != 'insert'" 971 + "when": "(isLinux || isWindows) && editorTextFocus && neovim.ctrlKeysNormal && neovim.init && neovim.mode != 'insert'" 972 972 }, 973 973 { 974 974 "key": "ctrl+f", 975 975 "command": "-actions.find", 976 - "when": "isLinux && editorTextFocus && neovim.mode == 'visual'" 976 + "when": "(isLinux || isWindows) && editorTextFocus && neovim.mode == 'visual'" 977 977 }, 978 978 { 979 979 "key": "ctrl+f", 980 980 "command": "-settings.action.search", 981 - "when": "isLinux && editorTextFocus && neovim.mode == 'visual'" 981 + "when": "(isLinux || isWindows) && editorTextFocus && neovim.mode == 'visual'" 982 982 }, 983 983 { 984 984 "key": "ctrl+f", 985 985 "command": "-keybindings.editor.searchKeybindings", 986 - "when": "isLinux && editorTextFocus && neovim.mode == 'visual'" 986 + "when": "(isLinux || isWindows) && editorTextFocus && neovim.mode == 'visual'" 987 987 }, 988 988 { 989 989 "key": "ctrl+f", 990 990 "command": "vscode-neovim.send", 991 991 "args": "\\f", 992 - "when": "isLinux && editorTextFocus && neovim.init && neovim.mode == 'visual'" 992 + "when": "(isLinux || isWindows) && editorTextFocus && neovim.init && neovim.mode == 'visual'" 993 993 }, 994 994 { 995 995 "key": "ctrl+alt+r", 996 996 "command": "toggleFindRegex", 997 - "when": "isLinux && editorFocus" 997 + "when": "(isLinux || isWindows) && editorFocus" 998 998 }, 999 999 { 1000 1000 "key": "ctrl+alt+r", 1001 1001 "command": "toggleSearchEditorRegex", 1002 - "when": "isLinux && inSearchEditor && searchInputBoxFocus" 1002 + "when": "(isLinux || isWindows) && inSearchEditor && searchInputBoxFocus" 1003 1003 }, 1004 1004 { 1005 1005 "key": "ctrl+alt+r", 1006 1006 "command": "toggleSearchRegex", 1007 - "when": "isLinux && searchViewletFocus" 1007 + "when": "(isLinux || isWindows) && searchViewletFocus" 1008 1008 }, 1009 1009 { 1010 1010 "key": "ctrl+enter", 1011 1011 "command": "search.action.replaceAll", 1012 - "when": "isLinux && replaceActive && searchViewletVisible && !findWidgetVisible" 1012 + "when": "(isLinux || isWindows) && replaceActive && searchViewletVisible && !findWidgetVisible" 1013 1013 }, 1014 1014 { 1015 1015 "key": "ctrl+enter", 1016 1016 "command": "search.action.replaceAll", 1017 - "when": "isLinux && replaceActive && searchViewletVisible && !findWidgetVisible" 1017 + "when": "(isLinux || isWindows) && replaceActive && searchViewletVisible && !findWidgetVisible" 1018 1018 }, 1019 1019 { 1020 1020 "key": "ctrl+enter", 1021 1021 "command": "editor.action.replaceAll", 1022 - "when": "isLinux && editorFocus && findWidgetVisible" 1022 + "when": "(isLinux || isWindows) && editorFocus && findWidgetVisible" 1023 1023 }, 1024 1024 { 1025 1025 "key": "ctrl+j", 1026 1026 "command": "workbench.action.togglePanel", 1027 - "when": "isLinux" 1027 + "when": "(isLinux || isWindows)" 1028 1028 }, 1029 1029 { 1030 1030 "key": "ctrl+l", 1031 1031 "command": "workbench.action.editor.changeLanguageMode", 1032 - "when": "isLinux" 1032 + "when": "(isLinux || isWindows)" 1033 1033 }, 1034 1034 { 1035 1035 "key": "meta+l", 1036 1036 "command": "vscode-neovim.send", 1037 1037 "args": "<C-l>", 1038 - "when": "isLinux && neovim.init" 1038 + "when": "(isLinux || isWindows) && neovim.init" 1039 1039 }, 1040 1040 { 1041 1041 "key": "ctrl+shift+l", 1042 1042 "command": "workbench.action.editor.changeLanguageMode", 1043 - "when": "isLinux" 1043 + "when": "(isLinux || isWindows)" 1044 1044 }, 1045 1045 { 1046 1046 "key": "meta+z", 1047 1047 "command": "undo", 1048 - "when": "isLinux && !terminalFocus" 1048 + "when": "(isLinux || isWindows) && !terminalFocus" 1049 1049 }, 1050 1050 { 1051 1051 "key": "ctrl+shift+o", 1052 1052 "command": "workbench.action.output.toggleOutput", 1053 - "when": "isLinux" 1053 + "when": "(isLinux || isWindows)" 1054 1054 }, 1055 1055 { 1056 1056 "key": "ctrl+w", 1057 1057 "command": "workbench.action.closeActiveEditor", 1058 - "when": "isLinux" 1058 + "when": "(isLinux || isWindows)" 1059 1059 }, 1060 1060 { 1061 1061 "key": "ctrl+shift+c", 1062 1062 "command": "workbench.action.focusCommentsPanel", 1063 - "when": "isLinux" 1063 + "when": "(isLinux || isWindows)" 1064 1064 }, 1065 - // TODO: unclear if these also need a separate `meta` shortcut for isLinux... 1065 + // TODO: unclear if these also need a separate `meta` shortcut for (isLinux || isWindows)... 1066 1066 // Will need to test on a linux machine again at some point. 1067 1067 { 1068 1068 "key": "ctrl+cmd+right", ··· 1077 1077 { 1078 1078 "key": "ctrl+meta+down", 1079 1079 "command": "workbench.action.moveEditorToBelowGroup", 1080 - "when": "isLinux" 1080 + "when": "(isLinux || isWindows)" 1081 1081 }, 1082 1082 { 1083 1083 "key": "ctrl+alt+left", 1084 1084 "command": "workbench.action.focusPreviousGroup", 1085 - "when": "isLinux && editorFocus" 1085 + "when": "(isLinux || isWindows) && editorFocus" 1086 1086 }, 1087 1087 { 1088 1088 "key": "ctrl+alt+right", 1089 1089 "command": "workbench.action.focusNextGroup", 1090 - "when": "isLinux && editorFocus" 1090 + "when": "(isLinux || isWindows) && editorFocus" 1091 1091 }, 1092 1092 { 1093 1093 "key": "ctrl+shift+enter", 1094 1094 "command": "workbench.action.toggleMaximizedPanel", 1095 - "when": "isLinux && terminalFocus" 1095 + "when": "(isLinux || isWindows) && terminalFocus" 1096 1096 }, 1097 1097 { 1098 1098 "key": "ctrl+shift+enter", 1099 1099 "command": "workbench.action.toggleEditorWidths", 1100 - "when": "isLinux && editorFocus" 1100 + "when": "(isLinux || isWindows) && editorFocus" 1101 1101 }, 1102 1102 { 1103 1103 "key": "ctrl+\\", 1104 1104 "command": "workbench.action.terminal.split", 1105 - "when": "isLinux && terminalFocus" 1105 + "when": "(isLinux || isWindows) && terminalFocus" 1106 1106 }, 1107 1107 { 1108 1108 "key": "ctrl+\\", 1109 1109 "command": "workbench.action.moveEditorToNextGroup", 1110 - "when": "isLinux && editorFocus" 1110 + "when": "(isLinux || isWindows) && editorFocus" 1111 1111 }, 1112 1112 { 1113 1113 "key": "ctrl+shift+\\", 1114 1114 "command": "workbench.action.splitEditorOrthogonal", 1115 - "when": "isLinux && editorFocus" 1115 + "when": "(isLinux || isWindows) && editorFocus" 1116 1116 }, 1117 1117 { 1118 1118 "key": "shift+alt+f", ··· 1127 1127 { 1128 1128 "key": "meta+v", 1129 1129 "command": "editor.action.clipboardPasteAction", 1130 - "when": "isLinux && !editorTextFocus || editorTextFocus && neovim.init && neovim.mode == 'insert'" 1130 + "when": "(isLinux || isWindows) && !editorTextFocus || editorTextFocus && neovim.init && neovim.mode == 'insert'" 1131 1131 }, 1132 1132 { 1133 1133 "key": "meta+v", 1134 1134 "command": "workbench.action.terminal.paste", 1135 - "when": "isLinux && terminalFocus" 1135 + "when": "(isLinux || isWindows) && terminalFocus" 1136 1136 }, 1137 1137 { 1138 1138 "key": "meta+c", ··· 1141 1141 { 1142 1142 "key": "meta+a", 1143 1143 "command": "editor.action.selectAll", 1144 - "when": "isLinux && !editorTextFocus || editorTextFocus && neovim.init && neovim.mode == 'insert'" 1144 + "when": "(isLinux || isWindows) && !editorTextFocus || editorTextFocus && neovim.init && neovim.mode == 'insert'" 1145 1145 }, 1146 1146 { 1147 1147 "key": "meta+a", 1148 1148 "command": "vscode-neovim.send", 1149 1149 "args": "ggVG", 1150 - "when": "isLinux && editorTextFocus && neovim.init && neovim.mode != 'insert'" 1150 + "when": "(isLinux || isWindows) && editorTextFocus && neovim.init && neovim.mode != 'insert'" 1151 1151 }, 1152 1152 { 1153 1153 "key": "ctrl+0", 1154 1154 "command": "workbench.action.zoomReset", 1155 - "when": "isLinux" 1155 + "when": "(isLinux || isWindows)" 1156 1156 }, 1157 1157 // sorta overkill, since selection normally copies but whatever 1158 1158 { 1159 1159 "key": "meta+c", 1160 1160 "command": "workbench.action.terminal.copySelection", 1161 - "when": "isLinux && terminalFocus" 1161 + "when": "(isLinux || isWindows) && terminalFocus" 1162 1162 }, 1163 1163 { 1164 1164 "key": "ctrl+[", 1165 1165 "command": "editor.fold", 1166 - "when": "isLinux && editorTextFocus" 1166 + "when": "(isLinux || isWindows) && editorTextFocus" 1167 1167 }, 1168 1168 { 1169 1169 "key": "ctrl+]", 1170 1170 "command": "editor.unfold", 1171 - "when": "isLinux && editorTextFocus" 1171 + "when": "(isLinux || isWindows) && editorTextFocus" 1172 1172 }, 1173 1173 { 1174 1174 "key": "ctrl+shift+backspace", ··· 1183 1183 { 1184 1184 "key": "ctrl+shift+backspace", 1185 1185 "command": "deleteFile", 1186 - "when": "isLinux && explorerViewletVisible && filesExplorerFocus && !explorerResourceReadonly && !inputFocus" 1186 + "when": "(isLinux || isWindows) && explorerViewletVisible && filesExplorerFocus && !explorerResourceReadonly && !inputFocus" 1187 1187 }, 1188 1188 { 1189 1189 "command": "workbench.action.tasks.test", 1190 1190 "key": "ctrl+alt+t", 1191 - "when": "isLinux && !taskRunning" 1191 + "when": "(isLinux || isWindows) && !taskRunning" 1192 1192 }, 1193 1193 { 1194 1194 "command": "workbench.action.tasks.restartTask", 1195 1195 "key": "ctrl+alt+t", 1196 - "when": "isLinux && taskRunning" 1196 + "when": "(isLinux || isWindows) && taskRunning" 1197 1197 }, 1198 1198 // Terminal sequences. These are mainly movement-related but there are also a 1199 1199 // few that are used for other things like ctrl-c, ctrl-l, etc. ··· 1204 1204 "args": { 1205 1205 "text": "\u001a", 1206 1206 }, 1207 - "when": "isLinux && terminalFocus" 1207 + "when": "(isLinux || isWindows) && terminalFocus" 1208 1208 }, 1209 1209 { 1210 1210 "key": "meta+c", ··· 1212 1212 "args": { 1213 1213 "text": "\u0003", 1214 1214 }, 1215 - "when": "isLinux && terminalFocus" 1215 + "when": "(isLinux || isWindows) && terminalFocus" 1216 1216 }, 1217 1217 { 1218 1218 "key": "meta+d", ··· 1220 1220 "args": { 1221 1221 "text": "\u0004", 1222 1222 }, 1223 - "when": "isLinux && terminalFocus" 1223 + "when": "(isLinux || isWindows) && terminalFocus" 1224 1224 }, 1225 1225 { 1226 1226 "key": "meta+l", ··· 1228 1228 "args": { 1229 1229 "text": "\u000c", 1230 1230 }, 1231 - "when": "isLinux && terminalFocus" 1231 + "when": "(isLinux || isWindows) && terminalFocus" 1232 1232 }, 1233 1233 { 1234 1234 "key": "home", ··· 1236 1236 "args": { 1237 1237 "text": "\u0001", 1238 1238 }, 1239 - "when": "isLinux && terminalFocus" 1239 + "when": "(isLinux || isWindows) && terminalFocus" 1240 1240 }, 1241 1241 { 1242 1242 "key": "end", ··· 1244 1244 "args": { 1245 1245 "text": "\u0005", 1246 1246 }, 1247 - "when": "isLinux && terminalFocus" 1247 + "when": "(isLinux || isWindows) && terminalFocus" 1248 1248 }, 1249 1249 { 1250 1250 "key": "ctrl+shift+backspace", ··· 1252 1252 "args": { 1253 1253 "text": "\u0015", 1254 1254 }, 1255 - "when": "isLinux && terminalFocus" 1255 + "when": "(isLinux || isWindows) && terminalFocus" 1256 1256 }, 1257 1257 { 1258 1258 "key": "ctrl+shift+delete", ··· 1260 1260 "args": { 1261 1261 "text": "\u000b", 1262 1262 }, 1263 - "when": "isLinux && terminalFocus" 1263 + "when": "(isLinux || isWindows) && terminalFocus" 1264 1264 }, 1265 1265 { 1266 1266 "key": "alt+right", 1267 1267 "command": "-workbench.action.terminal.focusNextPane", 1268 - "when": "isLinux && terminalFocus && terminalHasBeenCreated || terminalFocus && terminalProcessSupported" 1268 + "when": "(isLinux || isWindows) && terminalFocus && terminalHasBeenCreated || terminalFocus && terminalProcessSupported" 1269 1269 }, 1270 1270 { 1271 1271 "key": "alt+left", 1272 1272 "command": "-workbench.action.terminal.focusPreviousPane", 1273 - "when": "isLinux && terminalFocus && terminalHasBeenCreated || terminalFocus && terminalProcessSupported" 1273 + "when": "(isLinux || isWindows) && terminalFocus && terminalHasBeenCreated || terminalFocus && terminalProcessSupported" 1274 1274 }, 1275 1275 { 1276 1276 "key": "ctrl+alt+right", 1277 1277 "command": "workbench.action.terminal.focusNextPane", 1278 - "when": "isLinux && terminalFocus" 1278 + "when": "(isLinux || isWindows) && terminalFocus" 1279 1279 }, 1280 1280 { 1281 1281 "key": "ctrl+alt+left", 1282 1282 "command": "workbench.action.terminal.focusPreviousPane", 1283 - "when": "isLinux && terminalFocus" 1283 + "when": "(isLinux || isWindows) && terminalFocus" 1284 1284 }, 1285 1285 { 1286 1286 "key": "ctrl+q",
+2 -2
.config/Code/User/settings.json
··· 1453 1453 "vscode-neovim.logOutputToConsole": false, 1454 1454 "vscode-neovim.neovimClean": false, 1455 1455 "vscode-neovim.afterInitConfig": [], 1456 - "vscode-neovim.useWSL": true, 1456 + "vscode-neovim.useWSL": false, 1457 1457 "vscode-neovim.statusLineSeparator": " ⏐ ", // alternatively maybe § but it's a bit noisy 1458 1458 "vscode-neovim.highlightGroups.highlights": { 1459 1459 "CurSearch": { ··· 1619 1619 ] 1620 1620 } 1621 1621 }, 1622 - "terminal.integrated.defaultProfile.windows": "NixOS (WSL)", 1622 + "terminal.integrated.defaultProfile.windows": "PowerShell", 1623 1623 }
+3
.config/fish/conf.d/50-config.fish
··· 55 55 "sh -c \"$sed -E -e 's#(.)\x08\1#\1#g' -e 's#_\x08(.)#\1#g' | bat --plain --language=Manpage\"" 56 56 end 57 57 58 + # https://stackoverflow.com/a/39352670 59 + set -gx LESS Rx4 60 + 58 61 if command -qs xcode-select 59 62 # Guess these don't get added automatically, make sure 60 63 for pth in (xcode-select --show-manpaths)
+6 -3
.config/git/config
··· 80 80 editor = code 81 81 [advice] 82 82 detachedHead = false 83 - # NOTE: This has to come last to override other settings, e.g. user.email 84 - [include] 85 - path = ~/.gitconfig.local 83 + 86 84 [rerere] 87 85 enabled = true 88 86 [rebase] ··· 97 95 # Don't hard-fail if some LFS files can't be downloaded during checkout. 98 96 # Without this, git repo is left in partially checked out state and it sucks 99 97 skipdownloaderrors = true 98 + 99 + # NOTE: This has to come last to override other settings, e.g. user.email 100 + [include] 101 + path = ~/.gitconfig.local 102 + path = ~/.config/git/config.local
+1
.config/yadm/alt/.config/git/.gitattributes
··· 1 + *2work* diff=git-crypt filter=git-crypt
.config/yadm/alt/.config/git/config.local##class.2work

This is a binary file and will not be displayed.

.config/yadm/alt/.ssh/config.local##class.2work

This is a binary file and will not be displayed.

+6 -3
.config/yadm/hooks/post_pull
··· 2 2 3 3 set -euo pipefail 4 4 5 - # Ensure latest alts are symlinked after a pull 6 - yadm alt >/dev/null 7 - echo >&2 Finished setting up alt symlinks. 5 + [ -f ~/.local/state/yadm/env ] && source ~/.local/state/yadm/env 6 + if [ "$YADM_OS" != "Msys" ]; then 7 + # Ensure latest alts are symlinked after a pull 8 + yadm alt >/dev/null 9 + echo >&2 Finished setting up alt symlinks. 10 + fi
.ssh/config

This is a binary file and will not be displayed.