From 37c41c160328db8393394e0d236b1064289b26c5 Mon Sep 17 00:00:00 2001 From: Luciano Maiwald Date: Tue, 6 Sep 2022 12:49:48 +0200 Subject: [PATCH] Move dotfiles repo to ~/ Plus a couple of changes I had not yet committed. :grimacing: --- Brewfile => .Brewfile | 4 -- ackrc => .ackrc | 0 bash_profile => .bash_profile | 0 bashrc => .bashrc | 0 {bin => .bin}/color-git-log | 0 {bin => .bin}/tmux-session-launcher | 2 +- {bin => .bin}/tnew | 0 {bundle => .bundle}/config | 0 .config/nvim | 1 + gemrc => .gemrc | 0 gitconfig => .gitconfig | 0 githelpers => .githelpers | 0 .gitignore | 40 ++++++++++++--- .nvimrc | 1 + private.Brewfile => .private.Brewfile | 2 + rspec => .rspec | 0 tmux.conf => .tmux.conf | 0 .vim/init.vim | 1 + {vim => .vim}/undo/.gitkeep | 0 vimrc => .vimrc | 4 +- {zsh => .zsh}/aliases | 0 {zsh => .zsh}/config | 0 {zsh => .zsh}/func | 0 zshenv => .zshenv | 0 zshrc => .zshrc | 0 Rakefile | 71 --------------------------- config/nvim | 1 - gitignore | 4 -- nvimrc | 1 - vim/init.vim | 1 - 30 files changed, 43 insertions(+), 90 deletions(-) rename Brewfile => .Brewfile (91%) rename ackrc => .ackrc (100%) rename bash_profile => .bash_profile (100%) rename bashrc => .bashrc (100%) rename {bin => .bin}/color-git-log (100%) rename {bin => .bin}/tmux-session-launcher (71%) rename {bin => .bin}/tnew (100%) rename {bundle => .bundle}/config (100%) create mode 120000 .config/nvim rename gemrc => .gemrc (100%) rename gitconfig => .gitconfig (100%) rename githelpers => .githelpers (100%) create mode 120000 .nvimrc rename private.Brewfile => .private.Brewfile (76%) rename rspec => .rspec (100%) rename tmux.conf => .tmux.conf (100%) create mode 120000 .vim/init.vim rename {vim => .vim}/undo/.gitkeep (100%) rename vimrc => .vimrc (99%) rename {zsh => .zsh}/aliases (100%) rename {zsh => .zsh}/config (100%) rename {zsh => .zsh}/func (100%) rename zshenv => .zshenv (100%) rename zshrc => .zshrc (100%) delete mode 100644 Rakefile delete mode 120000 config/nvim delete mode 100644 gitignore delete mode 120000 nvimrc delete mode 120000 vim/init.vim diff --git a/Brewfile b/.Brewfile similarity index 91% rename from Brewfile rename to .Brewfile index 4616cb0..e260349 100644 --- a/Brewfile +++ b/.Brewfile @@ -23,7 +23,6 @@ tap "homebrew/cask-fonts" cask "font-powerline-symbols" cask "font-hack" -brew "leiningen" brew "clojure" tap "clojure-lsp/brew" brew "clojure-lsp-native" @@ -34,6 +33,3 @@ brew "go" brew "rbenv" brew "ruby-build" brew "pyenv" - -tap "sass/sass" -brew "sass" diff --git a/ackrc b/.ackrc similarity index 100% rename from ackrc rename to .ackrc diff --git a/bash_profile b/.bash_profile similarity index 100% rename from bash_profile rename to .bash_profile diff --git a/bashrc b/.bashrc similarity index 100% rename from bashrc rename to .bashrc diff --git a/bin/color-git-log b/.bin/color-git-log similarity index 100% rename from bin/color-git-log rename to .bin/color-git-log diff --git a/bin/tmux-session-launcher b/.bin/tmux-session-launcher similarity index 71% rename from bin/tmux-session-launcher rename to .bin/tmux-session-launcher index 92757a3..d1a021f 100755 --- a/bin/tmux-session-launcher +++ b/.bin/tmux-session-launcher @@ -4,7 +4,7 @@ if [[ $# -eq 1 ]]; then selected=$1 else - selected=$((echo ~/.dotfiles ; find ~/projects -mindepth 1 -maxdepth 1 -type d) | fzf) + selected=$((echo ~/ ; find ~/projects -mindepth 1 -maxdepth 1 -type d) | fzf) fi if [[ -z $selected ]]; then diff --git a/bin/tnew b/.bin/tnew similarity index 100% rename from bin/tnew rename to .bin/tnew diff --git a/bundle/config b/.bundle/config similarity index 100% rename from bundle/config rename to .bundle/config diff --git a/.config/nvim b/.config/nvim new file mode 120000 index 0000000..815cbcc --- /dev/null +++ b/.config/nvim @@ -0,0 +1 @@ +../.vim \ No newline at end of file diff --git a/gemrc b/.gemrc similarity index 100% rename from gemrc rename to .gemrc diff --git a/gitconfig b/.gitconfig similarity index 100% rename from gitconfig rename to .gitconfig diff --git a/githelpers b/.githelpers similarity index 100% rename from githelpers rename to .githelpers diff --git a/.gitignore b/.gitignore index ad86e7f..313b81f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,34 @@ -bundle/cache -config/* -vim/autoload/plug.vim* -vim/plugged/ -vim/shada/ -vim/undo/* +*.Brewfile.lock.json +*.DS_Store +/.CFUserTextEncoding +/.aws +/.cache +/.cargo +/.config/iterm2 +/.config/karabiner +/.docker +/.fzf* +/.lesshst +/.local +/.m2 +/.npm +/.pyenv +/.ssh +/.tig_history +/.vim/autoload/plug.vim +/.vim/plugged +/.vim/undo +/.viminfo +/.zcompdump +/.zprofile +/.zsh_history +/.zsh_sessions +/Desktop +/Documents +/Downloads +/Library +/Movies +/Music +/Pictures +/Public +/projects diff --git a/.nvimrc b/.nvimrc new file mode 120000 index 0000000..1490f7a --- /dev/null +++ b/.nvimrc @@ -0,0 +1 @@ +.vimrc \ No newline at end of file diff --git a/private.Brewfile b/.private.Brewfile similarity index 76% rename from private.Brewfile rename to .private.Brewfile index d2b6254..843cb96 100644 --- a/private.Brewfile +++ b/.private.Brewfile @@ -1,4 +1,6 @@ cask "1password" +cask "audio-hijack" cask "obs" +cask "vlc" mas "HP Easy Scan", id: 967004861 mas "Pixelmator Pro", id: 1289583905 diff --git a/rspec b/.rspec similarity index 100% rename from rspec rename to .rspec diff --git a/tmux.conf b/.tmux.conf similarity index 100% rename from tmux.conf rename to .tmux.conf diff --git a/.vim/init.vim b/.vim/init.vim new file mode 120000 index 0000000..f67022e --- /dev/null +++ b/.vim/init.vim @@ -0,0 +1 @@ +../.vimrc \ No newline at end of file diff --git a/vim/undo/.gitkeep b/.vim/undo/.gitkeep similarity index 100% rename from vim/undo/.gitkeep rename to .vim/undo/.gitkeep diff --git a/vimrc b/.vimrc similarity index 99% rename from vimrc rename to .vimrc index 05cb4a6..21ea511 100644 --- a/vimrc +++ b/.vimrc @@ -26,6 +26,8 @@ Plug 'neovim/nvim-lspconfig' Plug 'nvim-lualine/lualine.nvim' Plug 'nvim-telescope/telescope.nvim' Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'} +Plug 'nvim-treesitter/nvim-treesitter-context' +Plug 'nvim-treesitter/playground' Plug 'pangloss/vim-javascript' Plug 'scrooloose/nerdtree' Plug 'tpope/vim-abolish' @@ -87,7 +89,7 @@ require('lualine').setup { EOF set foldcolumn=2 -set number +set relativenumber set ruler set autoread set winwidth=90 diff --git a/zsh/aliases b/.zsh/aliases similarity index 100% rename from zsh/aliases rename to .zsh/aliases diff --git a/zsh/config b/.zsh/config similarity index 100% rename from zsh/config rename to .zsh/config diff --git a/zsh/func b/.zsh/func similarity index 100% rename from zsh/func rename to .zsh/func diff --git a/zshenv b/.zshenv similarity index 100% rename from zshenv rename to .zshenv diff --git a/zshrc b/.zshrc similarity index 100% rename from zshrc rename to .zshrc diff --git a/Rakefile b/Rakefile deleted file mode 100644 index 307554b..0000000 --- a/Rakefile +++ /dev/null @@ -1,71 +0,0 @@ -# encoding: utf-8 -# Inspired by this script of Ryan Bates: http://github.com/ryanb/dotfiles/blob/master/Rakefile -# Taken from http://github.com/tow8ie/dotfiles/blob/master/Rakefile - -require 'rake' - -desc "install the dot files into user’s home directory" -task :install do - replace_all = false - install_vim_plug - Dir['*'].each do |filename| - next if %w[Rakefile README.rdoc LICENSE utils].include? filename - - repo_file = File.join(ENV['PWD'], filename) - home_file = File.join(ENV['HOME'], ".#{filename}") - - if File.exist? home_file - if File.identical? home_file, repo_file - puts "identical #{home_file}" - elsif replace_all - replace_file_with_symlink(home_file, repo_file) - else - print "overwrite #{home_file}? [ynaq] " - case $stdin.gets.chomp - when 'a' - replace_all = true - replace_file_with_symlink(home_file, repo_file) - when 'y' - replace_file_with_symlink(home_file, repo_file) - when 'q' - exit - else - puts "skipping #{home_file}" - end - end - else - print "create #{home_file}? [ynq] " - case $stdin.gets.chomp - when 'y' - create_symlink(home_file, repo_file) - when 'q' - exit - else - puts "skipping #{home_file}" - end - end - end -end - -def replace_file_with_symlink(old_file, new_file) - delete_file(old_file) - create_symlink(old_file, new_file) -end - -def delete_file(file) - system %Q{rm -rf "#{file}"} -end - -def create_symlink(pointing_file, pointed_at_file) - puts "linking #{pointing_file} -> #{pointed_at_file}" - system %Q{ln -s "#{pointed_at_file}" "#{pointing_file}"} -end - -def install_vim_plug - vim_plug_path = File.join(File.dirname(File.realpath(__FILE__)), 'vim/autoload/plug.vim') - if File.exist?(vim_plug_path) - puts "found vim-plug installation" - else - system %Q{curl -fLo #{vim_plug_path} --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim} - end -end diff --git a/config/nvim b/config/nvim deleted file mode 120000 index c99592a..0000000 --- a/config/nvim +++ /dev/null @@ -1 +0,0 @@ -../vim \ No newline at end of file diff --git a/gitignore b/gitignore deleted file mode 100644 index 57c0602..0000000 --- a/gitignore +++ /dev/null @@ -1,4 +0,0 @@ -.DS_Store -vendor/bundle -.bundle -.byebug_history diff --git a/nvimrc b/nvimrc deleted file mode 120000 index c9a3c9c..0000000 --- a/nvimrc +++ /dev/null @@ -1 +0,0 @@ -vimrc \ No newline at end of file diff --git a/vim/init.vim b/vim/init.vim deleted file mode 120000 index 5615dc5..0000000 --- a/vim/init.vim +++ /dev/null @@ -1 +0,0 @@ -../vimrc \ No newline at end of file