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.
This commit is contained in:
parent
7adb776927
commit
3dc1bc4f84
3 changed files with 0 additions and 53 deletions
|
@ -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)
|
|
|
@ -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/")
|
|
|
@ -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/")
|
|
Loading…
Reference in a new issue