diff --git a/.emacs.d/custom.el b/.emacs.d/custom.el index afe5d55..b049464 100644 --- a/.emacs.d/custom.el +++ b/.emacs.d/custom.el @@ -61,7 +61,7 @@ ((sequence "TODO" "|" "DONE" "ABANDONED" "DEFERRED")))) '(package-selected-packages (quote - (gnu-elpa-keyring-update xah-lookup lsp-hack hack-mode rust-mode filladapt vc-hgcmd lsp-ui yaml-mode wgrep fsharp-mode company-lsp cquery mustache-mode clang-format projectile dash-functional mocha add-node-modules-path rjsx-mode xref-js2 js2-refactor company omnisharp geiser cider clojure-mode graphviz-dot-mode multi-term xterm-color thrift markdown-mode tuareg merlin ag use-package flycheck dockerfile-mode js2-mode web-mode zencoding-mode tss switch-window python-mode paredit magit lua-mode go-mode go-autocomplete exec-path-from-shell csharp-mode color-theme-monokai auto-complete auto-complete-nxml flymake flyspell json-mode popup ruby-mode company-jedi tide ahg elm-mode monky))) + (esup gnu-elpa-keyring-update lsp-hack hack-mode rust-mode filladapt lsp-ui yaml-mode wgrep fsharp-mode company-lsp cquery mustache-mode clang-format projectile dash-functional mocha add-node-modules-path rjsx-mode xref-js2 js2-refactor company omnisharp geiser cider clojure-mode graphviz-dot-mode multi-term xterm-color thrift markdown-mode tuareg merlin ag use-package flycheck dockerfile-mode js2-mode web-mode tss switch-window python-mode paredit magit lua-mode go-mode go-autocomplete exec-path-from-shell csharp-mode color-theme-monokai auto-complete auto-complete-nxml flymake flyspell json-mode popup ruby-mode company-jedi tide elm-mode monky))) '(reb-re-syntax (quote string)) '(rmail-mail-new-frame t) '(safe-local-variable-values diff --git a/.emacs.d/init.el b/.emacs.d/init.el index f029a1b..8f5801b 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -88,12 +88,13 @@ ;; ================================================================= ;; Packages ;; ================================================================= +;; See http://dotyl.ink/l/qbmhz43kju (let* ((no-ssl (and (memq system-type '(windows-nt ms-dos)) (not (gnutls-available-p)))) (proto (if no-ssl "http" "https"))) (setq package-archives - '(("gnu" . "http://elpa.gnu.org/packages/") - ("org" . "http://orgmode.org/elpa/") + '(("gnu" . "https://elpa.gnu.org/packages/") + ("org" . "https://orgmode.org/elpa/") )) (add-to-list 'package-archives (cons "melpa" (concat proto "://melpa.org/packages/")) t) @@ -101,20 +102,20 @@ (package-initialize) (unless package-archive-contents - (package-refresh-contents)) -(package-install-selected-packages) + (package-refresh-contents) + (package-install-selected-packages)) ;; ================================================================= ;; Common stuff that's needed once ;; ================================================================= (require 'cl) -(require 'saveplace) -(require 'ffap) -(require 'uniquify) +(require 'saveplace) ;; Am I using this? +(require 'ffap) ;; Am I using this? +(require 'uniquify) ;; Unique buffers based on file name. (require 'ansi-color) -(require 'recentf) -(require '50-arc) +(when is-fb-environment + (require '50-arc)) (prefer-coding-system 'utf-8) diff --git a/setup.py b/setup.py index f17c0df..3a2b5f0 100644 --- a/setup.py +++ b/setup.py @@ -8,6 +8,7 @@ ignore = { "readme.md", ".git", "vscode", + "terminal", ".DS_Store", } @@ -21,7 +22,7 @@ def link_helper(source, dst): other_src = os.readlink(dst) other_src = os.path.join(os.path.dirname(dst), other_src) other_src = os.path.abspath(other_src) - if other_src != source: + if not os.path.samefile(other_src, source): print(source) print( "WARNING: {} is symlink but not into " @@ -33,7 +34,8 @@ def link_helper(source, dst): print("Linking: {} -> {}".format(source, dst)) os.symlink(source, dst) - +# Set up the vast majority of the files here: most things in *this* directory +# go into the home directory directly. (Directly directory?) home = os.path.expanduser("~") source_files = [file for file in os.listdir(os.getcwd()) if file not in ignore] for source in source_files: @@ -66,3 +68,19 @@ else: possible_vscode_roots ) ) + +# Also these dumb terminal settings go somewhere else yikes. +terminal_source = os.path.abspath("terminal") +terminal_root = os.path.join(os.getenv("LOCALAPPDATA"), "packages", "Microsoft.WindowsTerminal_8wekyb3d8bbwe", "LocalState") +if os.path.exists(terminal_root): + source_files = [file for file in os.listdir(terminal_source) if file not in ignore] + for source in source_files: + source = os.path.join(terminal_source, source) + dst = os.path.join(terminal_root, os.path.split(source)[1]) + link_helper(source, dst) +else: + print( + "WARNING: No viable root for windows terminal config (tried {})".format( + terminal_root + ) + ) diff --git a/terminal/profiles.json b/terminal/profiles.json new file mode 100644 index 0000000..8c343f8 --- /dev/null +++ b/terminal/profiles.json @@ -0,0 +1,53 @@ +// To view the default settings, hold "alt" while clicking on the "Settings" button. +// For documentation on these settings, see: https://aka.ms/terminal-documentation + +{ + "$schema": "https://aka.ms/terminal-profiles-schema", + + "defaultProfile": "{0caa0dad-35be-5f56-a8ff-afceeeaa6101}", + + "profiles": { + "defaults": { + // Put settings here that you want to apply to all profiles + "colorScheme": "One Half Dark", + "fontFace": "Fira Code", + "fontSize": 11, + "useAcrylic": false + }, + "list": [ + { + // Make changes here to the cmd.exe profile + "guid": "{0caa0dad-35be-5f56-a8ff-afceeeaa6101}", + "name": "cmd", + "commandline": "cmd.exe", + "hidden": false + }, + { + // Make changes here to the powershell.exe profile + "guid": "{61c54bbd-c2c6-5271-96e7-009a87ff44bf}", + "name": "Windows PowerShell", + "commandline": "powershell.exe", + "hidden": false + }, + { + "guid": "{2c4de342-38b7-51cf-b940-2309a097f518}", + "hidden": false, + "name": "Ubuntu", + "source": "Windows.Terminal.Wsl" + }, + { + "guid": "{b453ae62-4e3d-5e58-b989-0a998ec441b8}", + "hidden": false, + "name": "Azure Cloud Shell", + "source": "Windows.Terminal.Azure" + } + ] + }, + + // Add custom color schemes to this array + "schemes": [], + + // Add any keybinding overrides to this array. + // To unbind a default keybinding, set the command to "unbound" + "keybindings": [] +}