From a918e51e871411d5a8c4bc8dec970574e45042a7 Mon Sep 17 00:00:00 2001 From: Phuntsok Drak-pa Date: Thu, 26 Sep 2019 20:49:23 +0200 Subject: [PATCH] reorganized files --- config.fish => .config/fish/config.fish | 0 {fishfunctions => .config/fish/functions}/4chandl.fish | 0 {fishfunctions => .config/fish/functions}/backup.fish | 0 {fishfunctions => .config/fish/functions}/cnew.fish | 2 +- {fishfunctions => .config/fish/functions}/cppnew.fish | 2 +- {fishfunctions => .config/fish/functions}/mcd.fish | 0 {fishfunctions => .config/fish/functions}/rainymood.fish | 0 {fishfunctions => .config/fish/functions}/we.fish | 0 {spacemacs-layers => .emacs.d/private}/conlanging | 0 eshell-alias => .emacs.d/private/eshell-alias | 0 {spacemacs-layers => .emacs.d/private}/w3m | 0 .gitmodules | 7 +++++-- enable_touch.sh => .local/bin/enable_touch.sh | 0 .../bin/xsetwacom-my-preferences | 0 .spacemacs | 4 ++-- .tmux.conf | 1 + {fishfunctions => dev/fishfunctions}/cnew.man | 0 {fishfunctions => dev/fishfunctions}/cnew.org | 0 {fishfunctions => dev/fishfunctions}/cppnew.man | 0 {fishfunctions => dev/fishfunctions}/cppnew.org | 0 20 files changed, 10 insertions(+), 6 deletions(-) rename config.fish => .config/fish/config.fish (100%) rename {fishfunctions => .config/fish/functions}/4chandl.fish (100%) rename {fishfunctions => .config/fish/functions}/backup.fish (100%) rename {fishfunctions => .config/fish/functions}/cnew.fish (93%) rename {fishfunctions => .config/fish/functions}/cppnew.fish (96%) rename {fishfunctions => .config/fish/functions}/mcd.fish (100%) rename {fishfunctions => .config/fish/functions}/rainymood.fish (100%) rename {fishfunctions => .config/fish/functions}/we.fish (100%) rename {spacemacs-layers => .emacs.d/private}/conlanging (100%) rename eshell-alias => .emacs.d/private/eshell-alias (100%) rename {spacemacs-layers => .emacs.d/private}/w3m (100%) rename enable_touch.sh => .local/bin/enable_touch.sh (100%) rename xsetwacom-my-preferences => .local/bin/xsetwacom-my-preferences (100%) create mode 120000 .tmux.conf rename {fishfunctions => dev/fishfunctions}/cnew.man (100%) rename {fishfunctions => dev/fishfunctions}/cnew.org (100%) rename {fishfunctions => dev/fishfunctions}/cppnew.man (100%) rename {fishfunctions => dev/fishfunctions}/cppnew.org (100%) diff --git a/config.fish b/.config/fish/config.fish similarity index 100% rename from config.fish rename to .config/fish/config.fish diff --git a/fishfunctions/4chandl.fish b/.config/fish/functions/4chandl.fish similarity index 100% rename from fishfunctions/4chandl.fish rename to .config/fish/functions/4chandl.fish diff --git a/fishfunctions/backup.fish b/.config/fish/functions/backup.fish similarity index 100% rename from fishfunctions/backup.fish rename to .config/fish/functions/backup.fish diff --git a/fishfunctions/cnew.fish b/.config/fish/functions/cnew.fish similarity index 93% rename from fishfunctions/cnew.fish rename to .config/fish/functions/cnew.fish index 80148be..fdf5e3c 100644 --- a/fishfunctions/cnew.fish +++ b/.config/fish/functions/cnew.fish @@ -4,7 +4,7 @@ function cnew -d "Create new C11 project" for item in $argv switch "$item" case -h --help - man ~/dotfiles/fishfunctions/cnew.man + man ~/dev/fishfunctions/cnew.man return 0 case '*' set projname $item diff --git a/fishfunctions/cppnew.fish b/.config/fish/functions/cppnew.fish similarity index 96% rename from fishfunctions/cppnew.fish rename to .config/fish/functions/cppnew.fish index 8ce5229..64329c3 100644 --- a/fishfunctions/cppnew.fish +++ b/.config/fish/functions/cppnew.fish @@ -9,7 +9,7 @@ function cppnew -d "Create new C++17 project" --argument-names 'projectname' set conanproj "true" set conanprojname $value case -h --help - man ~/dotfiles/fishfunctions/cppnew.man + man ~/dev/fishfunctions/cppnew.man return 0 case '*' set projname $item diff --git a/fishfunctions/mcd.fish b/.config/fish/functions/mcd.fish similarity index 100% rename from fishfunctions/mcd.fish rename to .config/fish/functions/mcd.fish diff --git a/fishfunctions/rainymood.fish b/.config/fish/functions/rainymood.fish similarity index 100% rename from fishfunctions/rainymood.fish rename to .config/fish/functions/rainymood.fish diff --git a/fishfunctions/we.fish b/.config/fish/functions/we.fish similarity index 100% rename from fishfunctions/we.fish rename to .config/fish/functions/we.fish diff --git a/spacemacs-layers/conlanging b/.emacs.d/private/conlanging similarity index 100% rename from spacemacs-layers/conlanging rename to .emacs.d/private/conlanging diff --git a/eshell-alias b/.emacs.d/private/eshell-alias similarity index 100% rename from eshell-alias rename to .emacs.d/private/eshell-alias diff --git a/spacemacs-layers/w3m b/.emacs.d/private/w3m similarity index 100% rename from spacemacs-layers/w3m rename to .emacs.d/private/w3m diff --git a/.gitmodules b/.gitmodules index 41e12c6..72bbf9d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -5,8 +5,11 @@ path = tmux url = https://github.com/gpakosz/.tmux.git [submodule "spacemacs-layers/conlanging"] - path = spacemacs-layers/conlanging + path = .emacs.d/private/conlanging url = https://labs.phundrak.fr/phundrak/conlang-layer.git [submodule "spacemacs-layers/w3m"] - path = spacemacs-layers/w3m + path = .emacs.d/private/w3m url = https://github.com/venmos/w3m-layer.git +[submodule "spacemacs"] + path = .emacs.d + url = https://github.com/syl20bnr/spacemacs diff --git a/enable_touch.sh b/.local/bin/enable_touch.sh similarity index 100% rename from enable_touch.sh rename to .local/bin/enable_touch.sh diff --git a/xsetwacom-my-preferences b/.local/bin/xsetwacom-my-preferences similarity index 100% rename from xsetwacom-my-preferences rename to .local/bin/xsetwacom-my-preferences diff --git a/.spacemacs b/.spacemacs index 4f5f951..1d36292 100644 --- a/.spacemacs +++ b/.spacemacs @@ -577,7 +577,7 @@ See the header of this file for more information." (defun dotspacemacs/user-init () (setq gnutls-algorithm-priority "NORMAL:-VERS-TLS1.3") - (load "~/dotfiles/private/private_emacs.el") + (load "~/private/private_emacs.el") (require 'org-id) (require 'package) (require 'ox-latex) @@ -1216,7 +1216,7 @@ This function is called at the very end of Spacemacs initialization." '(ansi-color-names-vector ["black" "red3" "ForestGreen" "yellow3" "blue" "magenta3" "DeepSkyBlue" "gray50"]) '(default-input-method "ipa-x-sampa") - '(eshell-aliases-file "/home/phundrak/dotfiles/eshell-alias") + '(eshell-aliases-file "/home/phundrak/.emacs.d/private/eshell-alias") '(evil-want-Y-yank-to-eol nil) '(fci-rule-color "#5B6268") '(hl-todo-keyword-faces diff --git a/.tmux.conf b/.tmux.conf new file mode 120000 index 0000000..89e7f7a --- /dev/null +++ b/.tmux.conf @@ -0,0 +1 @@ +tmux/.tmux.conf \ No newline at end of file diff --git a/fishfunctions/cnew.man b/dev/fishfunctions/cnew.man similarity index 100% rename from fishfunctions/cnew.man rename to dev/fishfunctions/cnew.man diff --git a/fishfunctions/cnew.org b/dev/fishfunctions/cnew.org similarity index 100% rename from fishfunctions/cnew.org rename to dev/fishfunctions/cnew.org diff --git a/fishfunctions/cppnew.man b/dev/fishfunctions/cppnew.man similarity index 100% rename from fishfunctions/cppnew.man rename to dev/fishfunctions/cppnew.man diff --git a/fishfunctions/cppnew.org b/dev/fishfunctions/cppnew.org similarity index 100% rename from fishfunctions/cppnew.org rename to dev/fishfunctions/cppnew.org