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.

Merge branch 'main' of github.com:ian-h-chamberlain/dotfiles

Ian Chamberlain 64744c90 5bc1f0e6

+568 -118
+10 -6
.Brewfile
··· 64 64 # Get a file from an HTTP, HTTPS or FTP server 65 65 brew "curl" 66 66 67 - # Pack, ship and run any application as a lightweight container 68 - brew "docker" 69 - 70 - # Platform keystore credential helper for Docker 71 - brew "docker-credential-helper" 72 - 73 67 # Simple, fast and user-friendly alternative to find 74 68 brew "fd" 75 69 ··· 379 373 380 374 # Developer Tools 381 375 mas "Xcode", id: 497799835 376 + else 377 + # ============================================================================== 378 + # Linux-specific packages (assume != Darwin means linux) 379 + # ============================================================================== 380 + 381 + # Tool for managing OCI containers and pods 382 + brew "podman" 383 + 384 + # Access X11 clipboards from the command-line 385 + brew "xclip" 382 386 end
+30 -27
.config/Code/User/extensions.txt
··· 2 2 a5huynh.vscode-ron@0.10.0 3 3 ahmadalli.vscode-nginx-conf@0.1.3 4 4 Alpha4.jsonl@0.0.1 5 - asvetliakov.vscode-neovim@0.0.95 6 - atlassian.atlascode@3.0.1 5 + anseki.vscode-color@0.4.5 6 + asvetliakov.vscode-neovim@0.0.97 7 + atlassian.atlascode@3.0.2 7 8 attilabuti.brainfuck-syntax@0.0.1 8 9 BazelBuild.vscode-bazel@0.7.0 9 10 be5invis.vscode-custom-css@7.1.0 10 11 bierner.markdown-checkbox@0.4.0 11 12 bierner.markdown-mermaid@1.17.4 12 - bmalehorn.vscode-fish@1.0.31 13 - bpruitt-goddard.mermaid-markdown-syntax-highlighting@1.5.0 13 + bmalehorn.vscode-fish@1.0.33 14 + bpruitt-goddard.mermaid-markdown-syntax-highlighting@1.5.1 14 15 codeout.vscode-junos@0.2.6 15 16 codezombiech.gitignore@0.9.0 16 17 corewa-rs.redcode@0.2.0 ··· 20 21 dnicolson.binary-plist@0.11.0 21 22 DotJoshJohnson.xml@2.5.1 22 23 dunstontc.viml@0.1.7 23 - eamodio.gitlens@13.2.0 24 + eamodio.gitlens@13.3.1 24 25 emeraldwalk.RunOnSave@0.2.0 25 - GitHub.vscode-pull-request-github@0.57.2022122310 26 + GitHub.vscode-pull-request-github@0.58.2 26 27 golang.go@0.37.1 27 - Gruntfuggly.todo-tree@0.0.222 28 + Gruntfuggly.todo-tree@0.0.224 28 29 haskell.haskell@2.2.2 29 30 ian-h-chamberlain.pica200@0.1.0 30 31 IBM.output-colorizer@0.1.2 ··· 39 40 justusadam.language-haskell@3.6.0 40 41 korekontrol.saltstack@0.0.9 41 42 kumar-harsh.graphql-for-vscode@1.15.3 42 - LaurentTreguier.rpm-spec@0.3.2 43 43 llvm-vs-code-extensions.vscode-clangd@0.1.23 44 44 mariusschulz.yarn-lock-syntax@0.2.0 45 45 marko2276.yang@0.1.3 46 46 mattn.Lisp@0.1.12 47 47 mechatroner.rainbow-csv@3.5.0 48 48 moshfeu.compare-folders@0.22.3 49 - ms-azuretools.vscode-docker@1.23.3 49 + ms-azuretools.vscode-docker@1.24.0 50 50 ms-dotnettools.vscode-dotnet-runtime@1.6.0 51 51 ms-python.isort@2022.8.0 52 - ms-python.python@2022.20.2 53 - ms-python.vscode-pylance@2023.1.40 54 - ms-toolsai.jupyter@2022.11.1003412109 52 + ms-python.python@2023.2.0 53 + ms-python.vscode-pylance@2023.2.40 54 + ms-toolsai.jupyter@2023.1.2010391206 55 55 ms-toolsai.jupyter-renderers@1.0.14 56 - ms-vscode-remote.remote-containers@0.266.1 57 - ms-vscode-remote.remote-ssh@0.94.0 56 + ms-vscode-remote.remote-containers@0.275.1 57 + ms-vscode-remote.remote-ssh@0.96.0 58 58 ms-vscode-remote.remote-ssh-edit@0.84.0 59 - ms-vscode.cmake-tools@1.13.42 60 - ms-vscode.cpptools@1.13.9 59 + ms-vscode.cmake-tools@1.13.45 60 + ms-vscode.cpptools@1.14.3 61 61 ms-vscode.hexeditor@1.9.11 62 - ms-vscode.live-server@0.4.4 63 - ms-vscode.remote-explorer@0.0.3 64 - ms-vsliveshare.vsliveshare@1.0.5823 62 + ms-vscode.live-server@0.4.5 63 + ms-vscode.remote-explorer@0.2.0 64 + ms-vscode.vscode-serial-monitor@0.8.0 65 + ms-vsliveshare.vsliveshare@1.0.5832 65 66 neilding.language-liquid@0.1.1 67 + nico-castell.linux-desktop-file@0.0.21 66 68 NicolasVuillamy.vscode-groovy-lint@2.0.0 67 69 PolyMeilex.wgsl@0.1.14 68 70 raynigon.nginx-formatter@0.0.13 69 71 rebornix.ruby@0.28.1 70 72 redhat.vscode-commons@0.0.6 71 - redhat.vscode-xml@0.23.0 73 + redhat.vscode-xml@0.24.0 72 74 redhat.vscode-yaml@1.11.0 73 75 ria.elastic@0.13.3 74 76 richie5um2.vscode-sort-json@1.20.0 75 - robocorp.robotframework-lsp@1.8.1 77 + robocorp.robotframework-lsp@1.9.0 76 78 RReverser.llvm@0.1.1 77 - rust-lang.rust-analyzer@0.3.1377 79 + rust-lang.rust-analyzer@0.3.1410 78 80 ryanluker.vscode-coverage-gutters@2.10.3 79 81 samuelcolvin.jinjahtml@0.20.0 80 - sleistner.vscode-fileutils@3.9.1 82 + sleistner.vscode-fileutils@3.10.0 81 83 slevesque.shader@1.1.5 82 84 stevensona.shader-toy@0.10.15 83 - streetsidesoftware.code-spell-checker@2.15.0 85 + streetsidesoftware.code-spell-checker@2.17.1 84 86 tamasfe.even-better-toml@0.19.0 85 - timonwong.shellcheck@0.29.3 87 + timonwong.shellcheck@0.29.4 88 + trond-snekvik.gnu-mapfiles@1.1.0 86 89 twxs.cmake@0.0.17 87 90 Tyriar.sort-lines@1.9.1 88 91 vadimcn.vscode-lldb@1.8.1 89 92 Veracosta.mib@0.0.4 90 - vsciot-vscode.vscode-arduino@0.4.13 93 + vsciot-vscode.vscode-arduino@0.5.0 91 94 vscode-org-mode.org-mode@1.0.0 92 95 vstirbu.vscode-mermaid-preview@1.6.3 93 96 warpnet.salt-lint@0.1.0 ··· 97 100 wingrunr21.vscode-ruby@0.28.0 98 101 xaver.clang-format@1.9.0 99 102 xoronic.pestfile@0.4.0 100 - yy0931.gitconfig-lsp@0.9.2 103 + yy0931.gitconfig-lsp@0.9.3 101 104 ZixuanWang.linkerscript@1.0.3 102 105 zxh404.vscode-proto3@0.5.5
+261 -19
.config/Code/User/keybindings.json
··· 332 332 }, 333 333 { 334 334 "key": "escape", 335 + "command": "workbench.action.terminal.hideFind", 336 + "when": "terminalFindFocused", 337 + }, 338 + { 339 + "key": "escape", 335 340 "command": "workbench.action.closePanel", 336 - "when": "neovim.mode == 'normal' && !terminalFocus && activePanel", 341 + "when": "neovim.mode == 'normal' && !terminalFocus && !terminalFindFocused && activePanel", 337 342 }, 338 343 { 339 344 "key": "escape", ··· 589 594 "command": "rust-analyzer.onEnter", 590 595 "when": "editorTextFocus && neovim.mode == 'insert' && editorLangId == 'rust' && !suggestWidgetVisible" 591 596 }, 597 + { 598 + "key": "ctrl+shift+m", 599 + "command": "-rust-analyzer.matchingBrace", 600 + "when": "editorTextFocus && editorLangId == 'rust'" 601 + }, 592 602 // ========================================================================= 593 603 // End rust-analyzer keybinds 594 604 // ========================================================================= ··· 614 624 "command": "-workbench.action.hideComment", 615 625 "when": "commentEditorFocused" 616 626 }, 617 - { 618 - "key": "n", 619 - "command": "workbench.action.compareEditor.nextChange", 620 - "when": "editorTextFocus && isInDiffEditor && !github:inReviewMode", 621 - }, 622 - { 623 - "key": "p", 624 - "command": "workbench.action.compareEditor.previousChange", 625 - "when": "editorTextFocus && isInDiffEditor && !github:inReviewMode", 626 - }, 627 + // TODO these bindings seem troublesome for e.g. `git diffool`: 628 + // { 629 + // "key": "n", 630 + // "command": "workbench.action.compareEditor.nextChange", 631 + // "when": "editorTextFocus && isInDiffEditor && !github:inReviewMode", 632 + // }, 633 + // { 634 + // "key": "p", 635 + // "command": "workbench.action.compareEditor.previousChange", 636 + // "when": "editorTextFocus && isInDiffEditor && !github:inReviewMode", 637 + // }, 627 638 // TODO: Maybe pass these ones through nvim so we can move cursor too? 628 639 { 629 640 "key": "n", 630 641 "command": "pr.goToNextDiffInPr", 631 - "when": "editorTextFocus && isInDiffEditor && github:inReviewMode", 642 + "when": "editorTextFocus && isInDiffEditor && !commentEditorFocused && github:inReviewMode", 632 643 }, 633 644 { 634 645 "key": "p", 635 646 "command": "pr.goToPreviousDiffInPr", 636 - "when": "editorTextFocus && isInDiffEditor && github:inReviewMode", 647 + "when": "editorTextFocus && isInDiffEditor && !commentEditorFocused && github:inReviewMode", 637 648 }, 638 649 { 639 650 "key": "alt+j", ··· 648 659 { 649 660 "key": "m", 650 661 "command": "pr.createComment", 651 - "when": "editorTextFocus && github:inReviewMode && inDiffEditor", 662 + "when": "editorTextFocus && github:inReviewMode && inDiffEditor && !commentEditorFocused", 652 663 }, 653 664 { 654 665 "key": "shift+d", 655 666 "command": "toggle.diff.renderSideBySide", 656 - "when": "editorTextFocus && isInDiffEditor", 667 + "when": "editorTextFocus && isInDiffEditor && !commentEditorFocused", 657 668 }, 658 669 { 659 670 "key": "shift+e", 660 671 "command": "toggle.diff.ignoreTrimWhitespace", 661 - "when": "editorTextFocus && isInDiffEditor", 672 + "when": "editorTextFocus && isInDiffEditor && !commentEditorFocused", 662 673 }, 663 674 { 664 675 "key": "[", 665 676 "command": "workbench.action.toggleSidebarVisibility", 666 - "when": "editorTextFocus && isInDiffEditor", 677 + "when": "editorTextFocus && isInDiffEditor && !commentEditorFocused", 667 678 }, 668 679 { 669 680 "key": "shift+[", 670 681 "command": "workbench.action.toggleSidebarVisibility", 671 - "when": "editorTextFocus && isInDiffEditor", 682 + "when": "editorTextFocus && isInDiffEditor && !commentEditorFocused", 672 683 }, 673 684 674 685 // ========================================================================= ··· 813 824 { 814 825 "key": "alt+,", 815 826 "command": "-gitlens.diffWithPrevious", 816 - } 827 + }, 828 + 829 + // ========================================================================= 830 + // Linux bindings (designed for use with <https://kinto.sh>). 831 + // Many of these effectively just "undo" the default neovim bindings and 832 + // restore the default VSCode behavior, since neovim uses ctrl keys so 833 + // much. 834 + // ========================================================================= 835 + { 836 + "key": "ctrl+k ctrl+s", 837 + "command": "workbench.action.openGlobalKeybindingsFile", 838 + "when": "isLinux" 839 + }, 840 + { 841 + "key": "ctrl+t", 842 + "command": "workbench.action.quickOpen", 843 + "when": "isLinux" 844 + }, 845 + { 846 + "key": "ctrl+p", 847 + "command": "workbench.action.gotoSymbol", 848 + "when": "isLinux" 849 + }, 850 + { 851 + "key": "ctrl+b", 852 + "command": "workbench.action.toggleSidebarVisibility", 853 + "when": "isLinux" 854 + }, 855 + { 856 + "key": "ctrl+f", 857 + "command": "-vscode-neovim.ctrl-f", 858 + "when": "isLinux && editorTextFocus && neovim.ctrlKeysNormal && neovim.init && neovim.mode != 'insert'" 859 + }, 860 + { 861 + "key": "ctrl+f", 862 + "command": "-actions.find", 863 + "when": "isLinux && editorTextFocus && neovim.mode == 'visual'" 864 + }, 865 + { 866 + "key": "ctrl+f", 867 + "command": "-settings.action.search", 868 + "when": "isLinux && editorTextFocus && neovim.mode == 'visual'" 869 + }, 870 + { 871 + "key": "ctrl+f", 872 + "command": "-keybindings.editor.searchKeybindings", 873 + "when": "isLinux && editorTextFocus && neovim.mode == 'visual'" 874 + }, 875 + { 876 + "key": "ctrl+f", 877 + "command": "vscode-neovim.send", 878 + "args": "\\f", 879 + "when": "isLinux && editorTextFocus && neovim.init && neovim.mode == 'visual'" 880 + }, 881 + { 882 + "key": "ctrl+j", 883 + "command": "workbench.action.togglePanel", 884 + "when": "isLinux" 885 + }, 886 + { 887 + "key": "ctrl+l", 888 + "command": "workbench.action.editor.changeLanguageMode", 889 + "when": "isLinux" 890 + }, 891 + { 892 + "key": "ctrl+shift+l", 893 + "command": "workbench.action.editor.changeLanguageMode", 894 + "when": "isLinux" 895 + }, 896 + { 897 + "key": "meta+z", 898 + "command": "undo", 899 + "when": "isLinux && !terminalFocus" 900 + }, 901 + { 902 + "key": "ctrl+shift+o", 903 + "command": "workbench.action.output.toggleOutput", 904 + "when": "isLinux" 905 + }, 906 + { 907 + "key": "ctrl+w", 908 + "command": "workbench.action.closeActiveEditor", 909 + "when": "isLinux" 910 + }, 911 + { 912 + "key": "ctrl+shift+c", 913 + "command": "workbench.action.focusCommentsPanel", 914 + "when": "isLinux" 915 + }, 916 + { 917 + "key": "ctrl+meta+right", 918 + "command": "workbench.action.moveEditorToRightGroup", 919 + "when": "isLinux" 920 + }, 921 + { 922 + "key": "ctrl+meta+left", 923 + "command": "workbench.action.moveEditorToLeftGroup", 924 + "when": "isLinux" 925 + }, 926 + { 927 + "key": "ctrl+meta+left", 928 + "command": "workbench.action.moveEditorToLeftGroup", 929 + "when": "isLinux" 930 + }, 931 + { 932 + "key": "ctrl+alt+left", 933 + "command": "workbench.action.focusPreviousGroup", 934 + "when": "isLinux && editorFocus" 935 + }, 936 + { 937 + "key": "ctrl+alt+right", 938 + "command": "workbench.action.focusNextGroup", 939 + "when": "isLinux && editorFocus" 940 + }, 941 + { 942 + "key": "ctrl+shift+enter", 943 + "command": "workbench.action.toggleMaximizedPanel", 944 + "when": "isLinux && terminalFocus" 945 + }, 946 + { 947 + "key": "ctrl+shift+enter", 948 + "command": "workbench.action.toggleEditorWidths", 949 + "when": "isLinux && editorFocus" 950 + }, 951 + { 952 + "key": "ctrl+\\", 953 + "command": "workbench.action.terminal.split", 954 + "when": "isLinux && terminalFocus" 955 + }, 956 + { 957 + "key": "meta+v", 958 + "command": "editor.action.clipboardPasteAction", 959 + "when": "isLinux && editorTextFocus && neovim.init && neovim.mode == 'insert'" 960 + }, 961 + { 962 + "key": "meta+v", 963 + "command": "workbench.action.terminal.paste", 964 + "when": "isLinux && terminalFocus" 965 + }, 966 + // sorta overkill, since selection normally copies but whatever 967 + { 968 + "key": "meta+c", 969 + "command": "workbench.action.terminal.copySelection", 970 + "when": "isLinux && terminalFocus" 971 + }, 972 + { 973 + "key": "ctrl+[", 974 + "command": "editor.fold", 975 + "when": "isLinux && editorTextFocus" 976 + }, 977 + { 978 + "key": "ctrl+]", 979 + "command": "editor.unfold", 980 + "when": "isLinux && editorTextFocus" 981 + }, 982 + { 983 + "key": "ctrl+shift+backspace", 984 + "command": "deleteAllLeft", 985 + "when": "textInputFocus" 986 + }, 987 + { 988 + "key": "ctrl+shift+delete", 989 + "command": "deleteAllRight", 990 + "when": "textInputFocus" 991 + }, 992 + // Terminal sequences. These are mainly movement-related but there are also a 993 + // few that are used for other things like ctrl-c, ctrl-l, etc. 994 + // https://github.com/xtermjs/xterm.js/blob/master/src/common/data/EscapeSequences.ts 995 + { 996 + "key": "meta+z", 997 + "command": "workbench.action.terminal.sendSequence", 998 + "args": { 999 + "text": "\u001a", 1000 + }, 1001 + "when": "isLinux && terminalFocus" 1002 + }, 1003 + { 1004 + "key": "meta+c", 1005 + "command": "workbench.action.terminal.sendSequence", 1006 + "args": { 1007 + "text": "\u0003", 1008 + }, 1009 + "when": "isLinux && terminalFocus" 1010 + }, 1011 + { 1012 + "key": "meta+d", 1013 + "command": "workbench.action.terminal.sendSequence", 1014 + "args": { 1015 + "text": "\u0004", 1016 + }, 1017 + "when": "isLinux && terminalFocus" 1018 + }, 1019 + { 1020 + "key": "meta+l", 1021 + "command": "workbench.action.terminal.sendSequence", 1022 + "args": { 1023 + "text": "\u000c", 1024 + }, 1025 + "when": "isLinux && terminalFocus" 1026 + }, 1027 + { 1028 + "key": "home", 1029 + "command": "workbench.action.terminal.sendSequence", 1030 + "args": { 1031 + "text": "\u0001", 1032 + }, 1033 + "when": "isLinux && terminalFocus" 1034 + }, 1035 + { 1036 + "key": "end", 1037 + "command": "workbench.action.terminal.sendSequence", 1038 + "args": { 1039 + "text": "\u0005", 1040 + }, 1041 + "when": "isLinux && terminalFocus" 1042 + }, 1043 + { 1044 + "key": "ctrl+shift+backspace", 1045 + "command": "workbench.action.terminal.sendSequence", 1046 + "args": { 1047 + "text": "\u0015", 1048 + }, 1049 + "when": "isLinux && terminalFocus" 1050 + }, 1051 + { 1052 + "key": "ctrl+shift+delete", 1053 + "command": "workbench.action.terminal.sendSequence", 1054 + "args": { 1055 + "text": "\u000b", 1056 + }, 1057 + "when": "isLinux && terminalFocus" 1058 + }, 817 1059 ]
+41 -20
.config/Code/User/settings.json
··· 98 98 99 99 // TODO: reorganize the remaining sections into extension-specific vs VSCode 100 100 "arduino.defaultBaudRate": 9600, 101 - "arduino.logLevel": "info", 102 - "arduino.path": "/Users/ianchamberlain/Applications/Arduino.app", 103 101 "arduino.enableUSBDetection": true, 102 + "arduino.logLevel": "info", 104 103 "arduino.skipHeaderProvider": false, 104 + "arduino.useArduinoCli": true, 105 105 106 106 "atlascode.bitbucket.enabled": false, 107 107 "atlascode.helpExplorerEnabled": false, ··· 128 128 129 129 "breadcrumbs.enabled": true, 130 130 131 - "C_Cpp.autocomplete": "Disabled", 132 - "C_Cpp.enhancedColorization": "Disabled", 133 - "C_Cpp.formatting": "Disabled", 134 - "C_Cpp.intelliSenseEngine": "Disabled", 135 - "C_Cpp.intelliSenseEngineFallback": "Disabled", 131 + "C_Cpp.autocomplete": "disabled", 132 + "C_Cpp.enhancedColorization": "disabled", 133 + "C_Cpp.formatting": "disabled", 134 + "C_Cpp.intelliSenseEngine": "disabled", 135 + "C_Cpp.intelliSenseEngineFallback": "disabled", 136 136 "C_Cpp.loggingLevel": "Information", 137 137 "C_Cpp.workspaceParsingPriority": "low", 138 138 "C_Cpp.workspaceSymbols": "Just My Code", ··· 152 152 "--background-index" 153 153 ], 154 154 "clangd.checkUpdates": true, 155 - "clangd.path": "/Users/ichamberlain/Library/Application Support/Code/User/globalStorage/llvm-vs-code-extensions.vscode-clangd/install/15.0.6/clangd_15.0.6/bin/clangd", 155 + "clangd.path": "/Users/ianchamberlain/Library/Application Support/Code/User/globalStorage/llvm-vs-code-extensions.vscode-clangd/install/15.0.3/clangd_15.0.3/bin/clangd", 156 156 "clangd.onConfigChanged": "restart", 157 157 158 158 "cmake.cmakePath": "/usr/local/bin/cmake", ··· 160 160 "cmake.configureOnEdit": false, 161 161 "cmake.skipConfigureIfCachePresent": true, 162 162 163 - "color-highlight.matchRgbWithNoFunction": true, 163 + "color-highlight.matchRgbWithNoFunction": true, 164 164 "color-highlight.markerType": "dot-before", 165 165 166 166 "comments.openView": "never", ··· 267 267 "editor.find.cursorMoveOnType": true, 268 268 "editor.fontFamily": "Input Mono, JetBrainsMonoNL Nerd Font, Monaco, Courier New, monospace", 269 269 "editor.fontSize": 11, 270 - "editor.fontWeight": "100", 270 + "editor.fontWeight": "300", 271 271 "editor.inlayHints.enabled": "onUnlessPressed", 272 272 "editor.minimap.showSlider": "always", 273 273 "editor.multiCursorModifier": "alt", ··· 357 357 "foreground": "#F92672", 358 358 "fontStyle": "", 359 359 }, 360 - }, 361 - { 360 + }, 361 + { 362 362 "scope": "support.type.property-name.array.toml", 363 363 "settings": { 364 364 "foreground": "#A6E22E", ··· 429 429 ] 430 430 }, 431 431 432 + "evenBetterToml.commands.copyTomlAsJson": true, 433 + "evenBetterToml.commands.copyJsonAsToml": true, 432 434 "evenBetterToml.formatter.arrayAutoCollapse": false, 433 435 "evenBetterToml.formatter.allowedBlankLines": 1, 434 436 "evenBetterToml.formatter.reorderKeys": false, ··· 449 451 "extensions.supportUntrustedWorkspaces": { 450 452 "asvetliakov.vscode-neovim": { 451 453 "supported": true, 452 - "version": "0.0.82" 453 454 }, 454 455 }, 455 456 "extensions.experimental.affinity": { 456 - "asvetliakov.vscode-neovim": 1 457 + "asvetliakov.vscode-neovim": 1 457 458 }, 458 459 "files.associations": { 459 460 "**/.cargo/config": "toml", ··· 707 708 708 709 "json.format.keepLines": false, 709 710 711 + // This seems to fix key issues on Linux, but TBD whether it breaks anything on macOS 712 + "keyboard.dispatch": "keyCode", 713 + 710 714 "lldb.adapterEnv": { 711 715 "PYENV_VERSION": "system" 712 716 }, ··· 753 757 ], 754 758 "python.defaultInterpreterPath": "python", 755 759 "python.formatting.provider": "black", 756 - "python.formatting.blackArgs": [ "--fast" ], 760 + "python.formatting.blackArgs": ["--fast"], 757 761 "python.languageServer": "Pylance", 758 762 "python.linting.lintOnSave": true, 759 763 "python.linting.pylintCategorySeverity.refactor": "Information", 760 764 "python.showStartPage": false, 761 765 "python.terminal.activateEnvironment": false, 762 - "python.venvFolders": [ ], 766 + "python.venvFolders": [], 763 767 764 768 "remote.SSH.configFile": "~/.ssh/vscode_config", 765 769 ··· 821 825 // Makes debugging test output much more readable 822 826 "RUST_TEST_THREADS": "1" 823 827 }, 824 - "rust-analyzer.runnables.extraArgs": [ ], 828 + "rust-analyzer.runnables.extraArgs": [], 825 829 826 830 "salt-lint.enable": true, 827 831 "salt-lint.executablePath": "/Users/ichamberlain/.pyenv/versions/i95-py3/bin/salt-lint", ··· 841 845 "shader-toy.reloadOnEditTextDelay": 2, 842 846 "shader-toy.reloadOnEditText": true, 843 847 844 - "shellcheck.executablePath": "/usr/local/bin/shellcheck", 848 + "shellcheck.executablePath": "shellcheck", 845 849 "shellcheck.run": "onSave", 846 850 "shellcheck.customArgs": [ 847 851 "--external-sources", ··· 880 884 // NOTE: slow terminal on big sur was fixable via 881 885 // codesign --remove-signature "~/Applications/Visual Studio Code.app/Contents/Frameworks/Code Helper (Renderer).app" 882 886 "terminal.external.osxExec": "iTerm.app", 887 + "terminal.external.linuxExec": "konsole", 888 + "terminal.integrated.commandsToSkipShell": [ 889 + "workbench.action.toggleSidebarVisibility", 890 + "workbench.action.gotoSymbol" 891 + ], 892 + "terminal.integrated.confirmOnExit": "hasChildProcesses", 893 + "terminal.integrated.confirmOnKill": "panel", 883 894 "terminal.integrated.copyOnSelection": true, 884 895 "terminal.integrated.enableBell": true, 885 896 "terminal.integrated.fontFamily": "Input Mono, JetBrainsMonoNL Nerd Font, Monaco, Courier New, monospace", 886 897 "terminal.integrated.fontSize": 11, 887 - "terminal.integrated.fontWeight": "250", 898 + "terminal.integrated.fontWeight": "400", 899 + "terminal.integrated.ignoreProcessNames": [ 900 + "bash", 901 + "zsh", 902 + "fish" 903 + ], 888 904 // actually use the colors I configure!!1! 889 905 "terminal.integrated.minimumContrastRatio": 1, 890 906 "terminal.integrated.macOptionClickForcesSelection": false, ··· 1000 1016 "typescript.check.npmIsInstalled": false, 1001 1017 1002 1018 "vscode_custom_css.imports": [ 1019 + "file:///home/deck/.config/Code/User/custom.css", 1003 1020 "file:///Users/ichamberlain/.config/Code/User/custom.css", 1004 1021 "file:///Users/ianchamberlain/.config/Code/User/custom.css", 1005 1022 ], ··· 1015 1032 1016 1033 "window.restoreWindows": "folders", 1017 1034 "window.title": "${folderName}${separator}${activeEditorMedium} ${dirty}", 1035 + "window.menuBarVisibility": "visible", 1036 + "window.titleBarStyle": "custom", 1037 + "window.customMenuBarAltFocus": false, 1038 + "window.enableMenuBarMnemonics": false, 1018 1039 1019 1040 "workbench.colorCustomizations": { 1020 1041 "editor.selectionBackground": "#9d550f", ··· 1074 1095 "**/*.tm[Ll]anguage.yaml", 1075 1096 "**/*.tm[Ll]anguage.yml" 1076 1097 ], 1077 - "file:///Users/ichamberlain/.vscode/extensions/atlassian.atlascode-3.0.1/resources/schemas/pipelines-schema.json": "bitbucket-pipelines.yml" 1098 + "file:///home/deck/.vscode/extensions/atlassian.atlascode-3.0.2/resources/schemas/pipelines-schema.json": "bitbucket-pipelines.yml" 1078 1099 }, 1079 1100 "jupyter.interactiveWindow.textEditor.magicCommandsAsComments": true, 1080 1101 }
+16
.config/Code/User/snippets/markdown.json
··· 1 + { 2 + "Details view": { 3 + "description": "Github-flavored markdown: expandable details snippet", 4 + "prefix": [ 5 + "details", 6 + "<details>", 7 + ], 8 + "body": [ 9 + "<details>", 10 + "<summary>$1</summary>", 11 + "", 12 + "$2", 13 + "</details>" 14 + ], 15 + } 16 + }
+30 -5
.config/fish/completions/yadm.fish
··· 26 26 and return 0 27 27 end 28 28 29 + if test -f /usr/share/fish/completions/git.fish 30 + source /usr/share/fish/completions/git.fish 31 + else if test -f /usr/local/share/fish/completions/git.fish 32 + source /usr/local/share/fish/completions/git.fish 33 + end 34 + 35 + function __fish_yadm_files 36 + # if we use `yadm` directly, it will setup alts which can cause a race, so instead 37 + # just manually set the env variables it would normally set (a la `yadm enter`) 38 + set -fx GIT_DIR $HOME/.local/share/yadm/repo.git 39 + set -fx GIT_WORKTREE $HOME 40 + 41 + __fish_git_files $argv 42 + end 43 + 29 44 # yadm's specific autocomplete 30 45 complete -x -c yadm -n __fish_yadm_needs_command -a clone -d 'Clone an existing repository' 31 46 complete -F -c yadm -n '__fish_yadm_using_command clone' -s w -d 'work-tree to use (default: $HOME)' ··· 71 86 complete --force-files -c yadm -l yadm-archive -d 'Override location of yadm encrypted files archive' 72 87 complete --force-files -c yadm -l yadm-bootstrap -d 'Override location of yadm bootstrap program' 73 88 74 - # if we use `yadm` directly, it will setup alts which can cause a race, so instead 75 - # just manually set the env variables it would normally set (a la `yadm enter`) 76 - set -lx GIT_DIR $HOME/.local/share/yadm/repo.git 77 - set -lx GIT_WORKTREE $HOME 78 - 79 89 # setup variables for git completion using `yadm enter` 80 90 complete -c yadm -w "git --git-dir='$GIT_DIR' --work-tree='$GIT_WORK_TREE'" 91 + 92 + # Override some file completions to avoid waiting forever for untracked files. 93 + # These are mostly just copy-pastes of the same completions in git.fish with minor 94 + # modifications 95 + complete -f -c yadm -n '__fish_git_using_command add' -a '(__fish_yadm_files modified deleted unmerged modified-staged-deleted)' 96 + complete -f -c yadm -n '__fish_git_using_command commit' -a '(__fish_yadm_files modified deleted modified-staged-deleted)' 97 + complete -f -c yadm -n '__fish_git_using_command diff' -n '__fish_git_contains_opt cached staged' -a '(__fish_yadm_files all-staged)' 98 + complete -f -c yadm -n '__fish_git_using_command diff' -n 'not __fish_git_contains_opt cached staged' -a '(__fish_yadm_files all-staged modified modified-staged-deleted)' 99 + complete -f -c yadm -n '__fish_git_using_command reset' -n 'not contains -- -- (commandline -opc)' -a '(__fish_yadm_files all-staged modified)' 100 + complete -f -c yadm -n '__fish_git_using_command reset' -n 'contains -- -- (commandline -opc)' -a '(__fish_yadm_files all-staged deleted modified)' 101 + complete -f -c yadm -n '__fish_git_using_command restore' -n 'not __fish_git_contains_opt -s S staged' -a '(__fish_yadm_files modified deleted modified-staged-deleted unmerged)' 102 + complete -f -c yadm -n '__fish_git_using_command restore' -n '__fish_git_contains_opt -s S staged' -a '(__fish_yadm_files added modified-staged deleted-staged renamed copied)' 103 + complete -f -c yadm -n '__fish_git_using_command rm' -n '__fish_git_contains_opt cached' -a '(__fish_yadm_files all-staged)' 104 + complete -f -c yadm -n '__fish_git_using_command rm' -n 'not __fish_git_contains_opt cached' -a '(__fish_yadm_files all-staged)' 105 + complete -f -c yadm -n '__fish_git_stash_using_command push' -a '(__fish_yadm_files modified deleted modified-staged-deleted)'
+1 -1
.config/fish/conf.d/.gitignore
··· 1 1 # Ignore yadm alt on non-applicable systems 2 - 50-cask-appdir.fish 2 + 55-cask-appdir.fish
+3 -2
.config/fish/conf.d/50-config.fish
··· 1 - if test -f ~/.config/yadm/env 2 - source ~/.config/yadm/env 1 + if test -f ~/.local/state/yadm/env 2 + source ~/.local/state/yadm/env 3 3 end 4 4 5 5 set -gx GOPATH ~/go ··· 79 79 # Set fish_user_paths here instead of fish_variables to expand $HOME per-machine 80 80 set -Ux fish_user_paths \ 81 81 $DEVKITARM/bin \ 82 + $DEVKITPRO/tools/bin \ 82 83 ~/.cargo/bin \ 83 84 ~/.local/bin \ 84 85 $GOPATH/bin \
+7
.config/fish/functions/docker.fish
··· 1 + function docker --wraps=podman --description 'alias docker=podman' 2 + if command -q podman 3 + command podman $argv 4 + else 5 + command docker $argv 6 + end 7 + end
+1
.config/fish/functions/sudoedit.fish
··· 1 1 function sudoedit --description 'alias sudoedit=sudo sudo -e' 2 + set -lx SUDO_COMMAND "sudoedit $argv" 2 3 if command -q sudoedit 3 4 command sudoedit $argv 4 5 else
+2
.config/kinto/args.env
··· 1 + # QUIET_ARG= 2 + QUIET_ARG=--quiet
+135 -29
.config/kinto/kinto.py
··· 2 2 # autostart = true 3 3 4 4 import re 5 + 5 6 from xkeysnail.transform import * 6 7 7 8 # Use the following for testing terminal keymaps ··· 39 40 terminals = [term.casefold() for term in terminals] 40 41 termStr = "|".join(str('^'+x+'$') for x in terminals) 41 42 42 - mscodes = ["code","vscodium"] 43 - codeStr = "|".join(str('^'+x+'$') for x in mscodes) 43 + mscodes = ["code","vscodium","code-oss"] 44 + mscodeStr = "|".join(str('^'+x+'$') for x in mscodes) 44 45 45 46 sublimes = ["Sublime_text","subl"] 46 47 sublimeStr = "|".join(str('^'+x+'$') for x in sublimes) 47 48 49 + emacs = ["Emacs", "emacs"] 50 + emacsStr = "|".join(str('^'+x+'$') for x in emacs) 51 + 48 52 # Add remote desktop clients & VM software here 49 53 # Ideally we'd only exclude the client window, 50 54 # but that may not be easily done. ··· 118 122 # define_conditional_modmap(lambda wm_class: wm_class == '', {}) 119 123 120 124 # [Global modemap] Change modifier keys as in xmodmap 121 - define_conditional_modmap(lambda wm_class: wm_class.casefold() not in terminals,{ 125 + define_conditional_modmap(lambda wm_class: wm_class.casefold() not in (terminals + emacs),{ 122 126 123 127 # Key.CAPSLOCK: Key.RIGHT_CTRL, # Caps2Cmd 124 128 # Key.LEFT_META: Key.RIGHT_CTRL, # Caps2Cmd - Chromebook ··· 146 150 # Key.RIGHT_CTRL: Key.RIGHT_META, # WinMac - Multi-language (Remove) 147 151 148 152 # - Mac Only 149 - # Key.LEFT_META: Key.RIGHT_CTRL, # Mac 150 - # Key.LEFT_CTRL: Key.LEFT_META, # Mac 151 - # Key.RIGHT_META: Key.RIGHT_CTRL, # Mac - Multi-language (Remove) 152 - # Key.RIGHT_CTRL: Key.RIGHT_META, # Mac - Multi-language (Remove) 153 + Key.LEFT_META: Key.RIGHT_CTRL, # Mac 154 + Key.LEFT_CTRL: Key.LEFT_META, # Mac 155 + Key.RIGHT_META: Key.RIGHT_CTRL, # Mac - Multi-language (Remove) 156 + Key.RIGHT_CTRL: Key.RIGHT_META, # Mac - Multi-language (Remove) 157 + }) 158 + 159 + # Restore defaults for emacs, shortcuts gets messy otherwise 160 + define_conditional_modmap(re.compile(emacsStr, re.IGNORECASE),{ 161 + Key.LEFT_META: Key.RIGHT_CTRL, # Mac 162 + # Left Ctrl stays Left Ctrl 163 + Key.RIGHT_META: Key.RIGHT_CTRL, # Mac - Multi-language (Remove) 164 + Key.RIGHT_CTRL: Key.LEFT_CTRL, # Mac - Multi-language (Remove) 153 165 }) 154 166 155 167 # [Conditional modmap] Change modifier keys in certain applications ··· 183 195 # Key.RIGHT_CTRL: Key.LEFT_CTRL, # WinMac - Multi-language (Remove) 184 196 185 197 # - Mac Only 186 - # Key.LEFT_META: Key.RIGHT_CTRL, # Mac 198 + Key.LEFT_META: Key.RIGHT_CTRL, # Mac 187 199 # # Left Ctrl Stays Left Ctrl 188 - # Key.RIGHT_META: Key.RIGHT_CTRL, # Mac - Multi-language (Remove) 189 - # Key.RIGHT_CTRL: Key.LEFT_CTRL, # Mac - Multi-language (Remove) 200 + Key.RIGHT_META: Key.RIGHT_CTRL, # Mac - Multi-language (Remove) 201 + Key.RIGHT_CTRL: Key.LEFT_CTRL, # Mac - Multi-language (Remove) 190 202 }) 191 203 192 204 # Keybindings for IntelliJ ··· 329 341 # (overrides some bindings from general file manager code block below) 330 342 define_keymap(re.compile("^org.gnome.nautilus$|^nautilus$", re.IGNORECASE),{ 331 343 # K("RC-N"): K("C-M-Space"), # macOS Finder search window shortcut Cmd+Option+Space 332 - # For this ^^^^^^^^^^^ to work, a custom shortcut must be set up in the Settings app in GNOME 344 + # For this ^^^^^^^^^^^ to work, a custom shortcut must be set up in the Settings app in GNOME 333 345 # to run command: "nautilus --new-window /home/USER" [ replace "USER" ] 334 346 K("RC-KEY_1"): K("C-KEY_2"), # View as Icons 335 347 K("RC-KEY_2"): K("C-KEY_1"), # View as List (Detailed) 336 348 K("RC-Super-o"): K("Shift-Enter"), # Open in new window 337 349 # K("RC-Super-o"): K("RC-Enter"), # Open in new tab 338 - K("RC-comma"): K("RC-comma"), # Overrides "Open preferences dialog" shortcut below 350 + K("RC-comma"): K("RC-comma"), # Overrides "Open preferences dialog" shortcut below 339 351 },"Overrides for Nautilus - Finder Mods") 340 352 341 353 # Keybindings overrides for PCManFM and PCManFM-Qt ··· 433 445 ########################################################################################################### 434 446 # K("Enter"): K("F2"), # Rename with Enter key 435 447 # K("RC-Shift-Enter"): K("Enter"), # Remap alternative "Enter" key to easily activate/exit text fields 436 - # K("RC-Shift-Enter"): K("F2"), # Rename with Cmd+Shift+Enter 448 + K("RC-Shift-Enter"): K("F2"), # Rename with Cmd+Shift+Enter 437 449 },"General File Managers - Finder Mods") 438 450 439 451 ############################################ ··· 445 457 K("C-comma"): [ 446 458 K("C-T"),K("a"),K("b"),K("o"),K("u"),K("t"), 447 459 K("Shift-SEMICOLON"),K("p"),K("r"),K("e"),K("f"), 448 - K("e"),K("r"),K("e"),K("n"),K("c"),K("e"),K("s"),K("Enter") 460 + K("e"),K("r"),K("e"),K("n"),K("c"),K("e"),K("s"),K("Enter"), 461 + # Sometimes the first one doesn't work?? 462 + K("C-L"),K("Enter"), 449 463 ], 450 - K("RC-Shift-N"): K("RC-Shift-P"), # Open private window with Ctrl+Shift+N like other browsers 464 + # K("RC-Shift-N"): K("RC-Shift-P"), # Open private window with Ctrl+Shift+N like other browsers 465 + 466 + # Firefox default shortcuts don't seem to work nicely without this 467 + K("RC-Backspace"): [K("Shift-Home"), K("Backspace")], # Delete Entire Line Left of Cursor 468 + K("RC-Delete"): [K("Shift-End"), K("Delete")], # Delete Entire Line Right of Cursor 469 + 470 + K("Super-K"): K("C-K"), 451 471 }) 452 472 453 473 define_keymap(re.compile(chromeStr, re.IGNORECASE),{ ··· 483 503 # Enable Ctrl+PgUp/PgDn for tab navigation 484 504 K("Super-Page_Up"): K("C-Page_Up"), # Go to prior tab 485 505 K("Super-Page_Down"): K("C-Page_Down"), # Go to next tab 486 - # Use Cmd+Braces keys for tab navigation instead of page navigation 506 + # Use Cmd+Braces keys for tab navigation instead of page navigation 487 507 # K("C-Left_Brace"): K("C-Page_Up"), 488 508 # K("C-Right_Brace"): K("C-Page_Down"), 489 509 }, "General Web Browsers") ··· 510 530 }, "Ulauncher") 511 531 512 532 # Note: terminals extends to remotes as well 513 - define_keymap(lambda wm_class: wm_class.casefold() not in terminals,{ 533 + define_keymap(lambda wm_class: wm_class.casefold() not in (terminals + mscodes),{ 514 534 K("RC-Dot"): K("Esc"), # Mimic macOS Cmd+dot = Escape key (not in terminals) 515 535 }) 516 536 ··· 532 552 ### Tab navigation 533 553 K("RC-Shift-Left"): K("C-Page_Up"), # Tab nav: Go to prior tab (Left) 534 554 K("RC-Shift-Right"): K("C-Page_Down"), # Tab nav: Go to next tab (Right) 555 + K("RC-Shift-Right"): K("C-Page_Down"), # Tab nav: Go to next tab (Right) 556 + 557 + # Global shortcut: tile to top. Needs to be before General GUI for some reason 558 + K("RC-LC-Shift-Up"): K("Super-LC-Shift-Up"), 559 + 535 560 },"Special overrides for terminals") 536 561 562 + # Custom app-specific shortcuts (defined before General GUI to avoid conflicts) 563 + 564 + define_keymap(re.compile(r"^keepassxc$", re.IGNORECASE),{ 565 + K("Super-H"): K("C-H"), # Show/hide password while typing 566 + 567 + # These seem to work in the search bar, but not in the password entry: 568 + K("Alt-Backspace"): K("C-Backspace"), # Delete word left of cursor 569 + K("Alt-Delete"): K("C-Delete"), # Delete word right of cursor 570 + 571 + # C-U clears the whole line, so use this instead: 572 + K("C-Backspace"): [K("Shift-Home"), K("Backspace")], # Delete Entire Line Left of Cursor 573 + K("C-Delete"): K("C-K"), # Delete Entire Line Right of Cursor 574 + }, "KeepassXC") 575 + 576 + define_keymap(re.compile(emacsStr, re.IGNORECASE),{ 577 + K("RC-C"): K("Super-C"), 578 + K("RC-V"): K("Super-V"), 579 + K("RC-S"): [K("C-x"), K("C-s")], # Cmd+S saves on macOS by default 580 + K("RC-SLASH"): K("Super-SLASH"), 581 + K("RC-BACKSLASH"): K("Super-BACKSLASH"), 582 + K("RC-Shift-BACKSLASH"): K("Super-Shift-BACKSLASH"), 583 + 584 + K("RC-Shift-Left"): K("Super-Shift-Left"), 585 + K("RC-Shift-Right"): K("Super-Shift-Right"), 586 + 587 + # # TODO: these don't seem to work yet... 588 + # K("Alt-RC-Left"): K("Alt-Super-Left"), 589 + # K("Alt-RC-Right"): K("Alt-Super-Right"), 590 + # K("Alt-RC-Up"): K("Alt-Super-Up"), 591 + # K("Alt-RC-Down"): K("Alt-Super-Down"), 592 + }, "emacs") 593 + 537 594 # None referenced here originally 538 595 # - but remote clients and VM software ought to be set here 539 596 # These are the typical remaps for ALL GUI based apps ··· 543 600 K("RC-Space"): K("Alt-F1"), # Default SL - Launch Application Menu (gnome/kde) 544 601 K("RC-F3"):K("Super-d"), # Default SL - Show Desktop (gnome/kde,eos) 545 602 K("RC-Super-f"):K("Alt-F10"), # Default SL - Maximize app (gnome/kde) 546 - # K("RC-Super-f"): K("Super-Page_Up"), # SL - Toggle maximized window state (kde_neon) 603 + K("RC-Super-f"): K("Super-Page_Up"), # SL - Toggle maximized window state (kde_neon) 547 604 # K("Super-Right"):K("C-M-Right"), # Default SL - Change workspace (budgie) 548 605 # K("Super-Left"):K("C-M-Left"), # Default SL - Change workspace (budgie) 549 606 K("RC-Q"): K("Alt-F4"), # Default SL - not-popos ··· 561 618 # K("Super-Left"):K("Super-C-Down"), # SL - Change workspace (popos) 562 619 # K("RC-Q"):K("Super-q"), # SL - Close Apps (popos) 563 620 # K("RC-Space"): K("Super-Space"), # SL - Launch Application Menu (eos) 564 - # K("RC-H"): K("Super-Page_Down"), # SL - Minimize app (kde_neon) 621 + K("RC-H"): K("Super-Page_Down"), # SL - Minimize app (kde_neon) 622 + K("RC-M"): K("Super-Page_Down"), # SL - Minimize app (kde_neon) 565 623 # SL - Default SL - Change workspace (kde_neon) 566 624 # K("RC-Space"): K("LC-Esc"), # SL- Launch Application Menu xfce4 567 625 # K("RC-F3"):K("C-M-d"), # SL- Show Desktop xfce4 ··· 588 646 K("Super-n"): K("Down"), 589 647 K("Super-p"): K("Up"), 590 648 K("Super-k"): [K("Shift-End"), K("Backspace")], 591 - K("Super-d"): K("Delete"), 649 + # K("Super-d"): K("Delete"), # Setting this interferes with Ctrl-D vscode binding 650 + 651 + # Minor fix for Japanese IME and switcher 652 + K("Super-J"): K("C-J"), 592 653 593 654 # K("Alt-RC-Space"): K(""), # Open Finder - Placeholder 594 655 ··· 640 701 }, "Wordwise - not vscode") 641 702 642 703 # Keybindings for VS Code 643 - define_keymap(re.compile(codeStr, re.IGNORECASE),{ 704 + define_keymap(re.compile(mscodeStr, re.IGNORECASE),{ 644 705 K("Super-Space"): K("LC-Space"), # Basic code completion 645 706 # Wordwise remaining - for VS Code 646 707 # Alt-F19 hack fixes Alt menu activation ··· 651 712 652 713 # K("C-PAGE_DOWN"): pass_through_key, # cancel next_view 653 714 # K("C-PAGE_UP"): pass_through_key, # cancel prev_view 654 - K("C-M-Left"): K("C-PAGE_UP"), # next_view 655 - K("C-M-Right"): K("C-PAGE_DOWN"), # prev_view 715 + # K("C-Alt-Left"): K("C-PAGE_UP"), # next_view 716 + # K("C-Alt-Right"): K("C-PAGE_DOWN"), # prev_view 656 717 K("RC-Shift-Left_Brace"): K("C-PAGE_UP"), # next_view 657 718 K("RC-Shift-Right_Brace"): K("C-PAGE_DOWN"), # prev_view 658 719 ··· 678 739 # K("Super-Shift-down"): K("Alt-Shift-down"), # multi-cursor down - Sublime 679 740 # K(""): pass_through_key, # cancel 680 741 # K(""): K(""), # 742 + 743 + K("Alt-Space"): K("LC-Space"), # Basic code completion 744 + K("Super-Grave"): K("C-Grave"), # Toggle terminal 745 + K("Super-Shift-Grave"): K("C-Shift-Grave"), # New terminal 746 + 747 + # Terminal shortcuts 748 + K("C-C"): K("Super-C"), 749 + K("C-Z"): K("Super-Z"), 750 + K("C-V"): K("Super-V"), 751 + K("Super-V"): K("C-V"), 752 + K("Super-D"): K("C-D"), 753 + K("RC-Backspace"): K("C-Shift-Backspace"), 754 + K("RC-Delete"): K("C-Shift-Delete"), 755 + 756 + # "Find+replace" vs neovim "redo" 757 + K("C-R"): K("Super-R"), 758 + K("Super-R"): K("C-R"), 759 + 681 760 }, "Code") 682 761 683 762 # Keybindings for Sublime Text ··· 768 847 769 848 define_keymap(re.compile("^deepin-terminal$", re.IGNORECASE),{ 770 849 K("RC-w"): K("Alt-w"), # Close only current tab, instead of all other tabs 771 - K("RC-j"): None, # Block Cmd+J from remapping to vertical split (Ctrl+Shift+J) 772 - K("RC-minus"): K("C-minus"), # Decrease font size/zoom out 850 + K("RC-j"): None, # Block Cmd+J from remapping to vertical split (Ctrl+Shift+J) 851 + K("RC-minus"): K("C-minus"), # Decrease font size/zoom out 773 852 K("RC-equal"): K("C-equal"), # Increase font size/zoom in 774 853 },"Deepin Terminal fixes") 775 854 ··· 797 876 K("LC-Grave") : K("LC-PAGE_UP"), 798 877 # K("Alt-Tab"): pass_through_key, # Default - Cmd Tab - App Switching Default 799 878 # K("RC-Tab"): K("Alt-Tab"), # Default - Cmd Tab - App Switching Default 800 - # K("RC-Shift-Tab"): K("Alt-Shift-Tab"), # Default - Cmd Tab - App Switching Default 801 - # Converts Cmd to use Ctrl-Shift 802 - K("RC-MINUS"): K("C-MINUS"), 879 + # K("RC-Shift-Tab"): K("Alt-Shift-Tab"), # Default - Cmd Tab - App Switching Default Converts Cmd to use Ctrl-Shift K("RC-MINUS"): K("C-MINUS"), 803 880 K("RC-EQUAL"): K("C-Shift-EQUAL"), 804 881 K("RC-BACKSPACE"): K("C-Shift-BACKSPACE"), 805 882 K("RC-W"): K("C-Shift-W"), ··· 824 901 K("RC-J"): K("C-Shift-J"), 825 902 K("RC-K"): K("C-Shift-K"), 826 903 K("RC-L"): K("C-Shift-L"), 827 - K("RC-SEMICOLON"): K("C-Shift-SEMICOLON"), 828 904 K("RC-APOSTROPHE"): K("C-Shift-APOSTROPHE"), 829 905 K("RC-GRAVE"): K("C-Shift-GRAVE"), 830 906 K("RC-Z"): K("C-Shift-Z"), ··· 838 914 K("RC-Dot"): K("LC-c"), 839 915 K("RC-SLASH"): K("C-Shift-SLASH"), 840 916 K("RC-KPASTERISK"): K("C-Shift-KPASTERISK"), 917 + 918 + # Move pane focus 919 + K("Super-Alt-Left"): K("LC-Alt-Left"), 920 + K("Super-Alt-Right"): K("LC-Alt-Right"), 921 + K("Super-Alt-Up"): K("LC-Alt-Up"), 922 + K("Super-Alt-Down"): K("LC-Alt-Down"), 923 + 924 + # Global shortcut: IME switch input method 925 + K("RC-SEMICOLON"): K("C-SEMICOLON"), 926 + 927 + # Global shortcuts: tiling / maximize 928 + K("RC-LC-Alt-Left"): K("Super-LC-Alt-Left"), 929 + K("RC-LC-Alt-Right"): K("Super-LC-Alt-Right"), 930 + K("RC-LC-Alt-Up"): K("Super-LC-Alt-Up"), 931 + K("RC-LC-Alt-Down"): K("Super-LC-Alt-Down"), 932 + 933 + # Global shortcuts: switch desktops, media etc 934 + K("LC-Up"): K("Super-Up"), 935 + K("LC-Down"): K("Super-Down"), 936 + K("LC-Left"): K("Super-Left"), 937 + K("LC-Right"): K("Super-Right"), 938 + 939 + K("LC-Shift-Up"): K("Super-Shift-Up"), 940 + K("LC-Shift-Down"): K("Super-Shift-Down"), 941 + K("LC-Shift-Left"): K("Super-Shift-Left"), 942 + K("LC-Shift-Right"): K("Super-Shift-Right"), 943 + 944 + K("LC-Shift-Space"): K("Super-Shift-Space"), 841 945 }, "terminals") 946 + 947 +
+1 -1
.config/pyp.py
··· 1 1 #!/usr/bin/env python3 2 2 3 3 # Convenience import aliases 4 - from urllib import parse as up 4 + from urllib.parse import quote, unquote 5 5
-1
.config/yadm/alt/.config/fish/conf.d/55-cask-appdir.fish##os.Darwin,class.personal,extension.fish
··· 1 1 # Install apps to homedir by default 2 2 3 3 set -gx HOMEBREW_CASK_OPTS "--appdir=~/Applications" 4 -
.config/yadm/alt/.config/yadm/env##template.default,extension.env .config/yadm/alt/.local/state/yadm/env##template.default,extension.env
-2
.config/yadm/alt/.gitconfig.local##class.personal
··· 4 4 login = ianchamberlain 5 5 # NOTE this is the key *fingerprint* not its ID 6 6 signingkey = AF8ED27FD663CC3D321F9F23AE5484D09405AA60 7 - [gpg] 8 - program = pinentry-mac
+5
.config/yadm/alt/.gnupg/gpg-agent.conf##os.Linux,distro.SteamOS
··· 1 + # Use builtin GTK pinentry 2 + pinentry-program /usr/bin/pinentry-qt 3 + # Set TTL to 5 days for GPG passphrase prompt 4 + default-cache-ttl 432000 5 + max-cache-ttl 432000
+10 -3
.config/yadm/hooks/pre_commit
··· 1 1 #!/usr/bin/env bash 2 2 3 - set -o errexit 4 3 set -o nounset 5 4 6 5 trap 'exit -2' INT 7 6 8 7 # Start from the base yadm directory 9 - cd "$(dirname "${BASH_SOURCE[0]}")" 10 - cd .. 8 + cd "$(dirname "${BASH_SOURCE[0]}")" || exit_with_error "Failed to find yadm directory!" 9 + cd .. || exit_with_error "Failed to find yadm directory!" 11 10 12 11 if [[ "$YADM_HOOK_FULL_COMMAND" =~ (^| )(--no-verify|-n)($| ) ]]; then 13 12 # Same as `git commit --no-verify` ··· 21 20 if is_merging; then 22 21 exit 0 23 22 fi 23 + 24 + WARNINGS=0 24 25 25 26 # Sort of hacky, but handle `yadm commit -a` to check all modified files 26 27 cached_arg="" ··· 46 47 # Update vscode extension list to be current with installed extensions 47 48 list_vscode_exts >"$VSCODE_EXTENSIONS" 48 49 warn "$VSCODE_EXTENSIONS was out-of-date. It has been updated automatically." 50 + WARNINGS=$((WARNINGS + 1)) 49 51 fi 50 52 fi 51 53 ··· 55 57 export HOMEBREW_NO_AUTO_UPDATE=1 56 58 if ! brew bundle check --global --no-upgrade --verbose ; then 57 59 warn "$HOME/.Brewfile is out of date or incorrect" 60 + WARNINGS=$((WARNINGS + 1)) 58 61 fi 59 62 fi 60 63 ··· 76 79 if [[ $failed_files -ne 0 ]] ; then 77 80 exit_with_error "$failed_files files failed fish lint/format checks!" 78 81 fi 82 + fi 83 + 84 + if [ $WARNINGS -gt 0 ]; then 85 + read -r -p "Some pre-commit checks had warnings. Press enter to continue or Ctrl-C to cancel." 79 86 fi 80 87 81 88 # TODO: convert other scripts to fish instead of bash (except bootstrap)
+4 -1
.config/yadm/utils.sh
··· 23 23 } 24 24 25 25 function list_vscode_exts() { 26 - code --list-extensions --show-versions 26 + # Linux `code` outputs with CRLF for some reason 27 + code --list-extensions --show-versions | sed 's/\r$//g' 27 28 } 28 29 29 30 function check_vscode_exts() { 31 + command -v code || return 0 32 + 30 33 diff "$VSCODE_EXTENSIONS" \ 31 34 <(list_vscode_exts) \ 32 35 --unchanged-line-format="" \
+1
.config/youtube-enhancer.json
··· 1 + {"version":"2.0.117.10","settings":{"blur":0,"brightness":100,"contrast":100,"grayscale":0,"huerotate":0,"invert":0,"saturate":100,"sepia":0,"applyvideofilters":false,"backgroundcolor":"#000000","backgroundopacity":85,"blackbars":false,"blockads":true,"blockadsexceptforsubs":false,"blockautoplay":true,"blockhfrformats":false,"blockwebmformats":false,"boostvolume":false,"cinemamode":false,"cinemamodewideplayer":true,"controlbar":{"active":true,"autohide":false,"centered":true,"position":"absolute"},"controls":["loop","not-interested","cards-end-screens","keyboard-shortcuts","options"],"controlsvisible":false,"controlspeed":false,"controlspeedmousebutton":false,"controlvolume":false,"controlvolumemousebutton":false,"convertshorts":false,"customcolors":{"--main-color":"#00adee","--main-background":"#111111","--second-background":"#181818","--hover-background":"#232323","--main-text":"#eff0f1","--dimmer-text":"#cccccc","--shadow":"#000000"},"customcssrules":"","customscript":"","customtheme":false,"darktheme":true,"date":1679203019039,"defaultvolume":false,"disableautoplay":true,"executescript":false,"expanddescription":false,"filter":"none","hidecardsendscreens":false,"hidechat":false,"hidecomments":false,"hiderelated":false,"hideshorts":false,"ignoreplaylists":true,"ignorepopupplayer":true,"localecode":"en_US","localedir":"ltr","message":false,"miniplayer":true,"miniplayerposition":"_bottom-right","miniplayersize":"_400x225","newestcomments":false,"overridespeeds":false,"pauseforegroundtab":false,"pausevideos":true,"popuplayersize":"640x360","qualityembeds":"hd720","qualityembedsfullscreen":"hd1080","qualityplaylists":"hd1080","qualityplaylistsfullscreen":"hd1080","qualityvideos":"hd1080","qualityvideosfullscreen":"hd1440","reload":false,"reversemousewheeldirection":false,"selectquality":true,"selectqualityfullscreenoff":false,"selectqualityfullscreenon":false,"speed":1,"speedvariation":0.1,"stopvideos":false,"theatermode":false,"theme":"default-dark","themevariant":"youtube-deep-dark.css","update":0,"volume":50,"volumemultiplier":3,"volumevariation":5,"whitelist":"","wideplayer":false,"wideplayerviewport":false}}
+10
.vimrc
··· 72 72 73 73 autocmd FileType yaml,json,nix setlocal shiftwidth=2 tabstop=2 74 74 75 + " Automatically add +x for shebang + script files 76 + autocmd BufWritePost * 77 + \ if getline(1) =~ "^#!" | 78 + \ if getline(1) =~ "/bin/" | 79 + \ if !exists("$SUDO_COMMAND") | 80 + \ silent execute "!chmod a+x <afile>" | 81 + \ endif | 82 + \ endif | 83 + \ endif 84 + 75 85 " Editor-specific settings 76 86 77 87 " vscode-neovim specific settings
-1
Library/Application Support/Code/User/snippets
··· 1 - ../../../../.config/Code/User/snippets/