Skip to content
/ dotfiles Public template

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
david-fong committed Feb 2, 2022
1 parent 9a9d8eb commit 2529ec0
Show file tree
Hide file tree
Showing 11 changed files with 70 additions and 87 deletions.
9 changes: 5 additions & 4 deletions .bash_profile
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
# Copy this file to your user home directory.

declare -rx XDG_CONFIG_HOME="$(cygpath "${XDG_CONFIG_HOME:-"${HOME}/.config"}")"
declare -rx XDG_CACHE_HOME="$(cygpath "${XDG_CACHE_HOME:-"${HOME}/.cache"}")"
declare -rx XDG_DATA_HOME="$(cygpath "${XDG_DATA_HOME:-"${HOME}/.local/share"}")"
[[ -f "${XDG_CONFIG_HOME}/bash/main.sh" ]] && source "${XDG_CONFIG_HOME}/bash/main.sh"
# uncomment for windows
#declare -rx XDG_CONFIG_HOME="$(cygpath "${XDG_CONFIG_HOME:-"${HOME}/.config"}")"
#declare -rx XDG_CACHE_HOME="$(cygpath "${XDG_CACHE_HOME:-"${HOME}/.cache"}")"
#declare -rx XDG_DATA_HOME="$(cygpath "${XDG_DATA_HOME:-"${HOME}/.local/share"}")"
#[[ -f "${XDG_CONFIG_HOME}/bash/main.sh" ]] && source "${XDG_CONFIG_HOME}/bash/main.sh"

if [ "$TERM" = "linux" ]; then
echo -en "\e]P000181E" #black
Expand Down
5 changes: 5 additions & 0 deletions Code/User/keybindings.json
Original file line number Diff line number Diff line change
Expand Up @@ -111,4 +111,9 @@
"command": "toggleSuggestionDetails",
"when": "suggestWidgetVisible && textInputFocus"
},
{
"key": "ctrl+shift+c",
"command": "-workbench.action.terminal.openNativeConsole",
"when": "!terminalFocus"
},
]
22 changes: 18 additions & 4 deletions Code/User/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"zenMode.hideActivityBar": false,
"window.newWindowDimensions": "maximized",
"window.titleBarStyle": "custom",
"window.zoomLevel": 2,

// File Explorer Icons
"workbench.iconTheme": "material-icon-theme",
Expand All @@ -29,10 +30,10 @@
// Behaviour
"workbench.startupEditor": "welcomePage",
"window.enableMenuBarMnemonics": false,
"window.customMenuBarAltFocus": false,
"extensions.ignoreRecommendations": false,
"extensions.closeExtensionDetailsOnViewChange": true,
"telemetry.enableCrashReporter": false,
"telemetry.enableTelemetry": false,
"telemetry.telemetryLevel": "off",

"workbench.editor.closeOnFileDelete": true,
"workbench.editor.limit.enabled": true,
Expand All @@ -45,6 +46,7 @@
"git.enableStatusBarSync": false,
"git.alwaysShowStagedChangesResourceGroup": true,
"git.showCommitInput": false,
"git.confirmSync": false,

"explorer.sortOrder": "type",
"explorer.autoReveal": false,
Expand All @@ -65,6 +67,7 @@
"editor.renderWhitespace": "none",
"editor.minimap.renderCharacters": false,
"editor.suggest.showWords": false,
"editor.suggestSelection": "first",
"editor.autoClosingDelete": "always",

"debug.openDebug": "openOnSessionStart",
Expand Down Expand Up @@ -100,7 +103,6 @@
"todo-tree.highlights.enabled": true,
"todo-tree.filtering.useBuiltInExcludes": "file excludes",
"todo-tree.general.statusBar": "tags",
"todo-tree.tree.showScanModeButton": false,
"todo-tree.tree.showCountsInTree": true,
"todo-tree.tree.flat": true,
"todo-tree.tree.hideIconsWhenGroupedByTag": true,
Expand Down Expand Up @@ -140,6 +142,18 @@
"editor.tabSize": 2,
},
"rust-client.rustupPath": "~/.local/share/cargo/bin/rustup",
"window.zoomLevel": 2,
// "rust.wait_to_build": null,
"C_Cpp.updateChannel": "Insiders",
"files.exclude": {
"**/.classpath": true,
"**/.project": true,
"**/.settings": true,
"**/.factorypath": true
},
"java.imports.gradle.wrapper.checksums": [
{
"sha256": "1fca1b1af7c3ed6cb9059346aaa89179c82abf11252837115e546c4da38e8b0c",
"allowed": true
}
],
}
2 changes: 1 addition & 1 deletion bash/_xdg_compat.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ declare -rx PYTHONSTARTUP="${XDG_CONFIG_HOME}/python/startup.py"
PYTHONHOME+=":${XDG_CONFIG_HOME}/python/"
declare -rx NPM_CONFIG_USERCONFIG="${XDG_CONFIG_HOME}/npm/npmrc"
declare -rx CARGO_HOME="${XDG_DATA_HOME}/cargo"
[[ -f "${XDG_DATA_HOME}/emsdk/emsdk_env.sh" ]] && source "${XDG_DATA_HOME}/emsdk/emsdk_env.sh"
#[[ -f "${XDG_DATA_HOME}/emsdk/emsdk_env.sh" ]] && source "${XDG_DATA_HOME}/emsdk/emsdk_env.sh"

# note: this must go after the declaration of LESSKEY.
lesskey --output="${XDG_DATA_HOME}/less/lesskey" -- "${XDG_CONFIG_HOME}/less/lesskey"
Expand Down
6 changes: 5 additions & 1 deletion bash/main.sh
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,10 @@ source "$(dirname "${BASH_SOURCE[0]}")""/_prompt.sh"
#xkbcomp "$HOME/.config/xkb/xkb.xkb" $DISPLAY 2>/dev/null
# ^copy the above into /usr/share/X11/xkb/symbols/us
# Note: https://bugs.freedesktop.org/show_bug.cgi?id=78661
xset r 25; xset r 27; xset r 31; xset r 32; xset r 38; xset r 39; xset r 40; xset r 41; xset r 43; xset r 44; xset r 45; xset r 46; xset r 47; xset r 58; xset r 59; xset r 60;
if [[ -x "$(command -v xset)" ]]; then
xset r 25; xset r 26; xset r 27; xset r 31; xset r 32; xset r 38; xset r 39;
xset r 40; xset r 41; xset r 43; xset r 44; xset r 45; xset r 46; xset r 47;
xset r 58; xset r 59; xset r 60;
fi

set +eo pipefail
16 changes: 11 additions & 5 deletions blank.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html lang="en">
<html lang="en" style="color-scheme: dark;">
<head>
<meta charset="UTF-8"/>
<title>blank</title>
Expand All @@ -17,17 +17,23 @@
</head>


<body style="position: fixed; top: 0; bottom: 0; left: 0; right: 0; background-color: #222;">
<body style="position: fixed; inset: 0; font-family: monospace;">
<style>
* {
box-sizing: border-box;
}
</style>
<input type="button"></input>
<input type="text"></input>
<input type="checkbox"></input>
<input type="text" autocomplete></input>
<input type="checkbox" autocomplete></input>
<input type="color"></input>
<input type="date"></input>
<input type="file"></input>
<input type="number"></input>
<input type="number" autocomplete></input>
<input type="password"></input>
<input type="range"></input>
<input type="tel"></input>
<input type="url"></input>
<div>hi <span>there</span></div>
</body>
</html>
1 change: 1 addition & 0 deletions git/allowed_signers
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[email protected] ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDhkjKw7/T1IBvc8dklnk9s2ubaWm7MIMBIKbDxJtoXg [email protected]
10 changes: 10 additions & 0 deletions git/config
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,16 @@
defaultToUpstream = true
tool = vimdiff

[commit]
gpgSign = true

[tag]
gpgSign = true

[push]
default = simple
recurseSubmodules = check

[gpg.ssh]
defaultKeyCommand = "ssh-add -L"
allowedSignersFile = "~/.config/git/allowed_signers"; with env vars could be used :/
8 changes: 4 additions & 4 deletions vim/main.vim
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ endfunction
set scrolloff=5
set sidescroll=1
set sidescrolloff=7
map <silent> <ScrollWheelUp> <C-Y>
map <silent> <ScrollWheelDown> <C-E>
imap <silent> <ScrollWheelUp> <C-O><C-Y>
imap <silent> <ScrollWheelDown> <C-O><C-E>
noremap <silent> <ScrollWheelUp> <C-Y>
noremap <silent> <ScrollWheelDown> <C-E>
inoremap <silent> <ScrollWheelUp> <C-O><C-Y>
inoremap <silent> <ScrollWheelDown> <C-O><C-E>


Expand Down
21 changes: 10 additions & 11 deletions xkb/symbols-us
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ xkb_symbols "basic" {
key <AD02> { [ w, W ] };
key <AD03> { type="ALT_NAV", [ e, E ], actions=[NoAction(),NoAction(),RedirectKey(key=<ESC> ,clearmods=Alt)], repeat=yes };
key <AD04> { [ r, R ] };
key <AD05> { [ f, F ] };
key <AD06> { [ j, J ] };
key <AD05> { [ t, T ] };
key <AD06> { [ y, Y ] };
key <AD07> { [ u, U ] };
key <AD08> { type="ALT_NAV", [ i, I ], actions=[NoAction(),NoAction(),RedirectKey(key=<RGHT>,clearmods=Alt)], repeat=yes };
key <AD09> { type="ALT_NAV", [ o, O ], actions=[NoAction(),NoAction(),RedirectKey(key=<UP>, clearmods=Alt)], repeat=yes };
key <AD09> { type="ALT_NAV", [ o, O ], actions=[NoAction(),NoAction(),RedirectKey(key=<BKSP>,clearmods=Alt)], repeat=yes };
key <AD10> { [ p, P ] };
key <AD11> { [ bracketleft, braceleft ] };
key <AD12> { [ bracketright, braceright ] };
Expand All @@ -33,14 +33,14 @@ xkb_symbols "basic" {
key <AC02> { [ s, S ] };
key <AC02> { type="ALT_NAV", [ s, S ], actions=[NoAction(),NoAction(),RedirectKey(key=<LEFT>)], repeat=yes };
key <AC03> { type="ALT_NAV", [ d, D ], actions=[NoAction(),NoAction(),RedirectKey(key=<DELE>,clearmods=Alt)], repeat=yes };
key <AC04> { type="ALT_NAV", [ t, T ], actions=[NoAction(),NoAction(),RedirectKey(key=<RTRN>,clearmods=Alt)], repeat=yes };
key <AC04> { type="ALT_NAV", [ f, F ], actions=[NoAction(),NoAction(),RedirectKey(key=<RTRN>,clearmods=Alt)], repeat=yes };
key <AC05> { [ g, G ] };
key <AC06> { [ h, H ] };
key <AC06> { type="ALT_NAV", [ y, Y ], actions=[NoAction(),NoAction(),RedirectKey(key=<BKSP>,clearmods=Alt)], repeat=yes };
key <AC07> { type="ALT_NAV", [ h, H ], actions=[NoAction(),NoAction(),RedirectKey(key=<LEFT>,clearmods=Alt)], repeat=yes };
key <AC08> { type="ALT_NAV", [ k, K ], actions=[NoAction(),NoAction(),RedirectKey(key=<HOME>,clearmods=Alt)], repeat=yes };
key <AC09> { type="ALT_NAV", [ l, L ], actions=[NoAction(),NoAction(),RedirectKey(key=<END>, clearmods=Alt)], repeat=yes };
key <AC10> { type="ALT_NAV", [ semicolon, colon ], actions=[NoAction(),NoAction(),RedirectKey(key=<DOWN>,clearmods=Alt)], repeat=yes };
key <AC06> { type="ALT_NAV", [ h, H ], actions=[NoAction(),NoAction(),RedirectKey(key=<BKSP>,clearmods=Alt)], repeat=yes };
key <AC07> { type="ALT_NAV", [ j, J ], actions=[NoAction(),NoAction(),RedirectKey(key=<LEFT>,clearmods=Alt)], repeat=yes };
key <AC08> { type="ALT_NAV", [ k, K ], actions=[NoAction(),NoAction(),RedirectKey(key=<UP>,clearmods=Alt)], repeat=yes };
key <AC09> { type="ALT_NAV", [ l, L ], actions=[NoAction(),NoAction(),RedirectKey(key=<HOME>,clearmods=Alt)], repeat=yes };
key <AC10> { type="ALT_NAV", [ semicolon, colon ], actions=[NoAction(),NoAction(),RedirectKey(key=<END>,clearmods=Alt)], repeat=yes };
key <AC11> { [ apostrophe, quotedbl ] };

key <AB01> { [ z, Z ] };
Expand All @@ -49,11 +49,10 @@ xkb_symbols "basic" {
key <AB04> { [ v, V ] };
key <AB05> { [ b, B ] };
key <AB06> { type="ALT_NAV", [ n, N ], actions=[NoAction(),NoAction(),RedirectKey(key=<BKSP>,clearmods=Alt)], repeat=yes };
key <AB07> { type="ALT_NAV", [ m, M ], actions=[NoAction(),NoAction(),RedirectKey(key=<RTRN>,clearmods=Alt)], repeat=yes };
key <AB07> { type="ALT_NAV", [ m, M ], actions=[NoAction(),NoAction(),RedirectKey(key=<DOWN>,clearmods=Alt)], repeat=yes };
key <AB08> { type="ALT_NAV", [ comma, less ], actions=[NoAction(),NoAction(),RedirectKey(key=<PGUP>,clearmods=Alt)], repeat=yes };
key <AB09> { type="ALT_NAV", [ period, greater ], actions=[NoAction(),NoAction(),RedirectKey(key=<PGDN>,clearmods=Alt)], repeat=yes };
key <AB10> { [ slash, question ] };

key <BKSL> { [ backslash, bar ] };
};

57 changes: 0 additions & 57 deletions xkb/symbols-us_alt0

This file was deleted.

0 comments on commit 2529ec0

Please sign in to comment.