From 3dc1bc4f841042eda9b8d17a97ff6e7b714c881a Mon Sep 17 00:00:00 2001 From: William Carroll Date: Sun, 22 Dec 2019 20:58:53 +0000 Subject: Delete "conflicted copy" files TODO: It may be preferable to augment my git history to remove the traces of these files ever existing. For now, since I value a precise git history over a pristine git history and my tendancy to maintain the former is sometimes at odds with my goal of the latter, I'm saving this work for a later date. --- ...init (wpcarro2's conflicted copy 2019-11-18).el | 51 ---------------------- ...rks (wpcarro2's conflicted copy 2019-11-17).eld | 1 - ...rks (wpcarro2's conflicted copy 2019-12-06).eld | 1 - 3 files changed, 53 deletions(-) delete mode 100644 configs/shared/.emacs.d/flycheck_init (wpcarro2's conflicted copy 2019-11-18).el delete mode 100644 configs/shared/.emacs.d/projectile-bookmarks (wpcarro2's conflicted copy 2019-11-17).eld delete mode 100644 configs/shared/.emacs.d/projectile-bookmarks (wpcarro2's conflicted copy 2019-12-06).eld (limited to 'configs') diff --git a/configs/shared/.emacs.d/flycheck_init (wpcarro2's conflicted copy 2019-11-18).el b/configs/shared/.emacs.d/flycheck_init (wpcarro2's conflicted copy 2019-11-18).el deleted file mode 100644 index a59b03e425b0..000000000000 --- a/configs/shared/.emacs.d/flycheck_init (wpcarro2's conflicted copy 2019-11-18).el +++ /dev/null @@ -1,51 +0,0 @@ -(require 'wpc-package "~/.emacs.d/wpc/packages/wpc-package.el") - -;; load order is intentional -(require 'constants) -(require 'wpc-misc) - -;; my libraries -(require 'functions) -(require 'prelude) -(require 'macros) -(require 'kaomoji) - -;; Google -(require 'google-tooling) -;; TODO: How should I handle google-stuff.el? - -;; TODO: Debug why wallpaper is changing randomly. It seems to happen every 5 -;; seconds when init.el is open... - -;; Laptop XF-functionality -(require 'pulse-audio) -(require 'screen-brightness) - -;; miscellaneous -(require 'clipboard) -(require 'battery) -(require 'dotfiles) -(require 'bookmark) -(require 'keyboard) - -(require 'wpc-keybindings) -(require 'window-manager) -(require 'wpc-ui) -(require 'wpc-dired) -(require 'wpc-terminal) -(require 'wpc-org) -(require 'wpc-company) -(require 'wpc-flycheck) -(require 'wpc-shell) -(require 'wpc-docker) -(require 'wpc-lisp) -(require 'wpc-haskell) -(require 'wpc-reasonml) -(require 'wpc-ocaml) -(require 'wpc-elixir) -(require 'wpc-nix) -(require 'wpc-rust) -(require 'wpc-clojure) -(require 'wpc-python) -(require 'wpc-javascript) -(require 'wpc-java) diff --git a/configs/shared/.emacs.d/projectile-bookmarks (wpcarro2's conflicted copy 2019-11-17).eld b/configs/shared/.emacs.d/projectile-bookmarks (wpcarro2's conflicted copy 2019-11-17).eld deleted file mode 100644 index 447dfd86efcc..000000000000 --- a/configs/shared/.emacs.d/projectile-bookmarks (wpcarro2's conflicted copy 2019-11-17).eld +++ /dev/null @@ -1 +0,0 @@ -("~/Dropbox/programming/data_structures_and_algorithms/" "~/Dropbox/dotfiles/" "~/Dropbox/ide/" "~/Dropbox/programming/tazjins-dotfiles/" "~/Dropbox/programming/tablecloth/" "~/Dropbox/programming/ngs/" "~/Dropbox/programming/" "~/.tmux/plugins/tmux-onedark-theme/" "~/Dropbox/programming/lispyville/" "~/Dropbox/programming/i3-quickterm/" "~/Dropbox/programming/db_cli/" "~/Dropbox/programming/clipmenu/" "~/Dropbox/ide-server/" "~/Dropbox/st/" "~/Dropbox/dwm/" "~/Dropbox/ide-server-stack/" "~/Dropbox/programming/programming/powerlisp/" "~/Dropbox/programming/nixery/" "/google/src/cloud/wpcarro/ac-skeleton/") \ No newline at end of file diff --git a/configs/shared/.emacs.d/projectile-bookmarks (wpcarro2's conflicted copy 2019-12-06).eld b/configs/shared/.emacs.d/projectile-bookmarks (wpcarro2's conflicted copy 2019-12-06).eld deleted file mode 100644 index bebf64bf5ce0..000000000000 --- a/configs/shared/.emacs.d/projectile-bookmarks (wpcarro2's conflicted copy 2019-12-06).eld +++ /dev/null @@ -1 +0,0 @@ -("~/Dropbox/dotfiles/" "~/Dropbox/programming/data_structures_and_algorithms/" "~/Dropbox/ide/" "~/Dropbox/programming/tazjins-dotfiles/" "~/Dropbox/programming/tablecloth/" "~/Dropbox/programming/ngs/" "~/Dropbox/programming/" "~/.tmux/plugins/tmux-onedark-theme/" "~/Dropbox/programming/lispyville/" "~/Dropbox/programming/i3-quickterm/" "~/Dropbox/programming/db_cli/" "~/Dropbox/programming/clipmenu/" "~/Dropbox/ide-server/" "~/Dropbox/st/" "~/Dropbox/dwm/" "~/Dropbox/ide-server-stack/" "~/Dropbox/programming/programming/powerlisp/" "~/Dropbox/programming/nixery/") \ No newline at end of file -- cgit 1.4.1