and tags like the block tags they are
-let g:html_indent_tags = 'li\|p'
-
-filetype plugin indent on
-
-augroup vimrcEx
- autocmd!
-
- " When editing a file, always jump to the last known cursor position.
- " Don't do it for commit messages, when the position is invalid, or when
- " inside an event handler (happens when dropping a file on gvim).
- autocmd BufReadPost *
- \ if &ft != 'gitcommit' && line("'\"") > 0 && line("'\"") <= line("$") |
- \ exe "normal g`\"" |
- \ endif
-
- " Set syntax highlighting for specific file types
- autocmd BufRead,BufNewFile *.md set filetype=markdown
-
- " Allow stylesheets to autocomplete hyphenated words
- autocmd FileType css,scss,sass setlocal iskeyword+=-
-augroup END
-
-" Use The Silver Searcher https://github.com/ggreer/the_silver_searcher
-if executable('ag')
- " Use Ag over Grep
- set grepprg=ag\ --nogroup\ --nocolor
-
- " Use ag in CtrlP for listing files. Lightning fast and respects .gitignore
- let g:ctrlp_user_command = 'ag %s -l --nocolor -g ""'
- let g:ackprg = 'ag --vimgrep'
-
- " ag is fast enough that CtrlP doesn't need to cache
- let g:ctrlp_use_caching = 0
-endif
-
-" Setup some default ignores
-let g:ctrlp_custom_ignore = {
- \ 'dir': '\v[\/](\.(git|hg|svn)|\_site)$',
- \ 'file': '\v\.(exe|so|dll|class|png|jpg|jpeg)$',
-\}
-
-" Use the nearest .git directory as the cwd
-" This makes a lot of sense if you are working on a project that is in version
-" control. It also supports works with .svn, .hg, .bzr.
-let g:ctrlp_working_path_mode = 'r'
-
-" Use a leader instead of the actual named binding
-nmap pb :CtrlPBuffer
-nmap :CtrlPBuffer
-
-" Easy bindings for its various modes
-nmap bb :CtrlPBuffer
-nmap bm :CtrlPMixed
-nmap bs :CtrlPMRU
-
-" Tagbar
-nmap :TagbarToggle
-nmap :CtrlPTag
-
-
-" To open a new empty buffer
-" This replaces :tabnew which I used to bind to this mapping
-nmap t :enew
-
-" Move to the next buffer
-nmap l :bnext
-
-" Move to the previous buffer
-nmap h :bprevious
-
-" Close the current buffer and move to the previous one
-nmap bq :bp bd #
-
-" FUCK EX MODE
-map q:
-nnoremap Q
-
-
-" Toggle line numbers with F1 - no more stupid help!
-"nmap :set invnumber
-nmap :exec &nu==&rnu? "se nu!" : "se rnu!"
-autocmd StdinReadPre * let s:std_in=1
-hi Normal ctermbg=none
-" Local config
-let g:go_fmt_command = "goimports"
-nnoremap :buffers:buffer
-set background=dark
-let vim_markdown_preview_hotkey=''
-let vim_markdown_preview_github=1
-let vim_markdown_preview_browser='Google Chrome'
-
-if filereadable($HOME . "/.vimrc.local")
- source ~/.vimrc.local
-endif
-
-" Set the ctags file name
-set tags=./.tags;
-let g:tagbar_ctags_bin='/usr/local/bin/ctags'
-let g:session_autoload = 'no'
-let g:airline#extensions#tabline#fnamemod = ':.'
-let g:ctrlp_working_path_mode = 0
-let g:ctrlp_custom_ignore = 'node_modules\|DS_Store\|git|.pyc'
-
-set timeoutlen=100 ttimeoutlen=10
diff --git a/_old/vimrc.bundles b/_old/vimrc.bundles
deleted file mode 100644
index 2039094..0000000
--- a/_old/vimrc.bundles
+++ /dev/null
@@ -1,33 +0,0 @@
-if &compatible
- set nocompatible
-end
-
-filetype off
-set rtp+=~/.vim/bundle/Vundle.vim/
-call vundle#begin()
-
-" Let Vundle manage Vundle
-Plugin 'gmarik/Vundle.vim'
-
-" Define bundles via Github repos
-Plugin 'croaky/vim-colors-github'
-Plugin 'danro/rename.vim'
-Plugin 'kien/ctrlp.vim'
-Plugin 'pbrisbin/vim-mkdir'
-Plugin 'scrooloose/syntastic'
-Plugin 'scrooloose/nerdtree'
-Plugin 'tpope/vim-surround'
-Plugin 'vim-airline/vim-airline'
-Plugin 'vim-airline/vim-airline-themes'
-
-
-" do mac specific stuff
-if has("unix")
- let s:uname = system("uname -s")
- if s:uname == "Darwin"
- Plugin 'rizzatti/dash.vim'
- endif
-endif
-
-call vundle#end()
-filetype on
diff --git a/git_template/hooks/post-checkout b/git_template/hooks/post-checkout
deleted file mode 100755
index 0b12578..0000000
--- a/git_template/hooks/post-checkout
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-#if [ -e bin/update_dependencies.sh ]; then
-# bin/update_dependencies.sh
-#fi
diff --git a/git_template/hooks/post-merge b/git_template/hooks/post-merge
deleted file mode 100755
index 0b12578..0000000
--- a/git_template/hooks/post-merge
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-#if [ -e bin/update_dependencies.sh ]; then
-# bin/update_dependencies.sh
-#fi
diff --git a/git_template/hooks/pre-push b/git_template/hooks/pre-push
deleted file mode 100755
index b8970e8..0000000
--- a/git_template/hooks/pre-push
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-#protected_branch='master'
-#current_branch=$(git symbolic-ref HEAD | sed -e 's,.*/\(.*\),\1,')
-#
-#if [[ $current_branch = *"$protected_branch"* ]]
-#then
-# read -p "You're about to push $current_branch, is that what you intended? [y|n] " -n 1 -r < /dev/tty
-# echo
-# if echo $REPLY | grep -E '^[Yy]$' > /dev/null
-# then
-# exit 0 # push will execute
-# fi
-# exit 1 # push will not execute
-#else
-# exit 0 # push will execute
-#fi
diff --git a/bin/CPSP b/home/bin/CPSP
similarity index 100%
rename from bin/CPSP
rename to home/bin/CPSP
diff --git a/bin/Markdown.pl b/home/bin/Markdown.pl
similarity index 100%
rename from bin/Markdown.pl
rename to home/bin/Markdown.pl
diff --git a/bin/SCmd b/home/bin/SCmd
similarity index 100%
rename from bin/SCmd
rename to home/bin/SCmd
diff --git a/bin/datecalc.py b/home/bin/datecalc.py
similarity index 100%
rename from bin/datecalc.py
rename to home/bin/datecalc.py
diff --git a/bin/emax b/home/bin/emax
similarity index 100%
rename from bin/emax
rename to home/bin/emax
diff --git a/bin/git-clean.sh b/home/bin/git-clean.sh
similarity index 100%
rename from bin/git-clean.sh
rename to home/bin/git-clean.sh
diff --git a/bin/git-fuck b/home/bin/git-fuck
similarity index 100%
rename from bin/git-fuck
rename to home/bin/git-fuck
diff --git a/bin/git_undo_everything.sh b/home/bin/git_undo_everything.sh
similarity index 100%
rename from bin/git_undo_everything.sh
rename to home/bin/git_undo_everything.sh
diff --git a/bin/gochk b/home/bin/gochk
similarity index 100%
rename from bin/gochk
rename to home/bin/gochk
diff --git a/bin/goland.sh b/home/bin/goland.sh
similarity index 100%
rename from bin/goland.sh
rename to home/bin/goland.sh
diff --git a/bin/golangci-lint b/home/bin/golangci-lint
similarity index 100%
rename from bin/golangci-lint
rename to home/bin/golangci-lint
diff --git a/bin/gstate b/home/bin/gstate
similarity index 100%
rename from bin/gstate
rename to home/bin/gstate
diff --git a/bin/json2yaml b/home/bin/json2yaml
similarity index 100%
rename from bin/json2yaml
rename to home/bin/json2yaml
diff --git a/bin/keybase_download_gpg_keys.sh b/home/bin/keybase_download_gpg_keys.sh
similarity index 100%
rename from bin/keybase_download_gpg_keys.sh
rename to home/bin/keybase_download_gpg_keys.sh
diff --git a/bin/killtransmission.sh b/home/bin/killtransmission.sh
similarity index 100%
rename from bin/killtransmission.sh
rename to home/bin/killtransmission.sh
diff --git a/bin/last_status.py b/home/bin/last_status.py
similarity index 100%
rename from bin/last_status.py
rename to home/bin/last_status.py
diff --git a/bin/mov_to_gif.sh b/home/bin/mov_to_gif.sh
similarity index 100%
rename from bin/mov_to_gif.sh
rename to home/bin/mov_to_gif.sh
diff --git a/bin/mysql_in_ram.sh b/home/bin/mysql_in_ram.sh
similarity index 100%
rename from bin/mysql_in_ram.sh
rename to home/bin/mysql_in_ram.sh
diff --git a/bin/oh_fuck.sh b/home/bin/oh_fuck.sh
similarity index 100%
rename from bin/oh_fuck.sh
rename to home/bin/oh_fuck.sh
diff --git a/bin/old.py b/home/bin/old.py
similarity index 100%
rename from bin/old.py
rename to home/bin/old.py
diff --git a/bin/packages/homebrew-casks.txt b/home/bin/packages/homebrew-casks.txt
similarity index 100%
rename from bin/packages/homebrew-casks.txt
rename to home/bin/packages/homebrew-casks.txt
diff --git a/bin/packages/homebrew.txt b/home/bin/packages/homebrew.txt
similarity index 100%
rename from bin/packages/homebrew.txt
rename to home/bin/packages/homebrew.txt
diff --git a/bin/packages/pip.txt b/home/bin/packages/pip.txt
similarity index 100%
rename from bin/packages/pip.txt
rename to home/bin/packages/pip.txt
diff --git a/bin/pycharm.sh b/home/bin/pycharm.sh
similarity index 100%
rename from bin/pycharm.sh
rename to home/bin/pycharm.sh
diff --git a/bin/release_package.sh b/home/bin/release_package.sh
similarity index 100%
rename from bin/release_package.sh
rename to home/bin/release_package.sh
diff --git a/bin/restart_bluetooth b/home/bin/restart_bluetooth
similarity index 100%
rename from bin/restart_bluetooth
rename to home/bin/restart_bluetooth
diff --git a/bin/rubymine.sh b/home/bin/rubymine.sh
similarity index 100%
rename from bin/rubymine.sh
rename to home/bin/rubymine.sh
diff --git a/bin/sc b/home/bin/sc
similarity index 100%
rename from bin/sc
rename to home/bin/sc
diff --git a/bin/scf b/home/bin/scf
similarity index 100%
rename from bin/scf
rename to home/bin/scf
diff --git a/bin/spoof_mac.sh b/home/bin/spoof_mac.sh
similarity index 100%
rename from bin/spoof_mac.sh
rename to home/bin/spoof_mac.sh
diff --git a/bin/sshc b/home/bin/sshc
similarity index 100%
rename from bin/sshc
rename to home/bin/sshc
diff --git a/bin/startemacs.sh b/home/bin/startemacs.sh
similarity index 100%
rename from bin/startemacs.sh
rename to home/bin/startemacs.sh
diff --git a/bin/startup_i3.sh b/home/bin/startup_i3.sh
similarity index 100%
rename from bin/startup_i3.sh
rename to home/bin/startup_i3.sh
diff --git a/bin/update-neovim.sh b/home/bin/update-neovim.sh
similarity index 100%
rename from bin/update-neovim.sh
rename to home/bin/update-neovim.sh
diff --git a/bin/upload_and_copy b/home/bin/upload_and_copy
similarity index 100%
rename from bin/upload_and_copy
rename to home/bin/upload_and_copy
diff --git a/bin/vimv b/home/bin/vimv
similarity index 100%
rename from bin/vimv
rename to home/bin/vimv
diff --git a/bin/virtualenv-auto-activate.sh b/home/bin/virtualenv-auto-activate.sh
similarity index 100%
rename from bin/virtualenv-auto-activate.sh
rename to home/bin/virtualenv-auto-activate.sh
diff --git a/bin/watch.py b/home/bin/watch.py
similarity index 100%
rename from bin/watch.py
rename to home/bin/watch.py
diff --git a/bin/water_reminder b/home/bin/water_reminder
similarity index 100%
rename from bin/water_reminder
rename to home/bin/water_reminder
diff --git a/config/fish/config.fish b/home/config/fish/config.fish
similarity index 100%
rename from config/fish/config.fish
rename to home/config/fish/config.fish
diff --git a/config/fish/everquote.fish b/home/config/fish/everquote.fish
similarity index 100%
rename from config/fish/everquote.fish
rename to home/config/fish/everquote.fish
diff --git a/home/config/fish/fish_variables b/home/config/fish/fish_variables
new file mode 100644
index 0000000..b96d260
--- /dev/null
+++ b/home/config/fish/fish_variables
@@ -0,0 +1,34 @@
+# This file contains fish universal variable definitions.
+# VERSION: 3.0
+SETUVAR __fish_initialized:3400
+SETUVAR fish_color_autosuggestion:555\x1ebrblack
+SETUVAR fish_color_cancel:\x2dr
+SETUVAR fish_color_command:blue
+SETUVAR fish_color_comment:red
+SETUVAR fish_color_cwd:green
+SETUVAR fish_color_cwd_root:red
+SETUVAR fish_color_end:green
+SETUVAR fish_color_error:brred
+SETUVAR fish_color_escape:brcyan
+SETUVAR fish_color_history_current:\x2d\x2dbold
+SETUVAR fish_color_host:normal
+SETUVAR fish_color_host_remote:yellow
+SETUVAR fish_color_normal:normal
+SETUVAR fish_color_operator:brcyan
+SETUVAR fish_color_param:cyan
+SETUVAR fish_color_quote:yellow
+SETUVAR fish_color_redirection:cyan\x1e\x2d\x2dbold
+SETUVAR fish_color_search_match:\x2d\x2dbackground\x3d111
+SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack
+SETUVAR fish_color_status:red
+SETUVAR fish_color_user:brgreen
+SETUVAR fish_color_valid_path:\x2d\x2dunderline
+SETUVAR fish_key_bindings:fish_default_key_bindings
+SETUVAR fish_pager_color_completion:normal
+SETUVAR fish_pager_color_description:B3A06D\x1eyellow\x1e\x2di
+SETUVAR fish_pager_color_prefix:cyan\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
+SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan
+SETUVAR fish_pager_color_selected_background:\x2dr
+SETUVAR fish_user_paths:/etc/profiles/per\x2duser/tyrel/bin
+SETUVAR hydro_color_git:red
+SETUVAR hydro_color_pwd:green
diff --git a/config/fish/shell_aliases.fish b/home/config/fish/shell_aliases.fish
similarity index 100%
rename from config/fish/shell_aliases.fish
rename to home/config/fish/shell_aliases.fish
diff --git a/config/fish/shell_funcs.fish b/home/config/fish/shell_funcs.fish
similarity index 100%
rename from config/fish/shell_funcs.fish
rename to home/config/fish/shell_funcs.fish
diff --git a/config/htop/htoprc b/home/config/htop/htoprc
similarity index 100%
rename from config/htop/htoprc
rename to home/config/htop/htoprc
diff --git a/config/i3/config b/home/config/i3/config
similarity index 100%
rename from config/i3/config
rename to home/config/i3/config
diff --git a/config/i3/rofi b/home/config/i3/rofi
similarity index 100%
rename from config/i3/rofi
rename to home/config/i3/rofi
diff --git a/config/i3/rofi_window b/home/config/i3/rofi_window
similarity index 100%
rename from config/i3/rofi_window
rename to home/config/i3/rofi_window
diff --git a/config/karabiner/assets/complex_modifications/1672600379.json b/home/config/karabiner/assets/complex_modifications/1672600379.json
similarity index 100%
rename from config/karabiner/assets/complex_modifications/1672600379.json
rename to home/config/karabiner/assets/complex_modifications/1672600379.json
diff --git a/config/karabiner/karabiner.json b/home/config/karabiner/karabiner.json
similarity index 100%
rename from config/karabiner/karabiner.json
rename to home/config/karabiner/karabiner.json
diff --git a/config/nvim/init.vim b/home/config/nvim/init.vim
similarity index 100%
rename from config/nvim/init.vim
rename to home/config/nvim/init.vim
diff --git a/config/polybar/battery-combined-shell.sh b/home/config/polybar/battery-combined-shell.sh
similarity index 100%
rename from config/polybar/battery-combined-shell.sh
rename to home/config/polybar/battery-combined-shell.sh
diff --git a/config/polybar/config b/home/config/polybar/config
similarity index 100%
rename from config/polybar/config
rename to home/config/polybar/config
diff --git a/config/polybar/i3wmthemer_bar_launch.sh b/home/config/polybar/i3wmthemer_bar_launch.sh
similarity index 100%
rename from config/polybar/i3wmthemer_bar_launch.sh
rename to home/config/polybar/i3wmthemer_bar_launch.sh
diff --git a/config/tmuxinator/tidelift.yml b/home/config/tmuxinator/tidelift.yml
similarity index 100%
rename from config/tmuxinator/tidelift.yml
rename to home/config/tmuxinator/tidelift.yml
diff --git a/gitconfig b/home/gitconfig
similarity index 100%
rename from gitconfig
rename to home/gitconfig
diff --git a/gitignore b/home/gitignore
similarity index 100%
rename from gitignore
rename to home/gitignore
diff --git a/hushlogin b/home/hushlogin
similarity index 100%
rename from hushlogin
rename to home/hushlogin
diff --git a/pythonstartup.py b/home/pythonstartup.py
similarity index 100%
rename from pythonstartup.py
rename to home/pythonstartup.py
diff --git a/shell_aliases b/home/shell_aliases
similarity index 100%
rename from shell_aliases
rename to home/shell_aliases
diff --git a/shell_funcs b/home/shell_funcs
similarity index 100%
rename from shell_funcs
rename to home/shell_funcs
diff --git a/tmux.conf b/home/tmux.conf
similarity index 93%
rename from tmux.conf
rename to home/tmux.conf
index f1a2c64..fb96764 100644
--- a/tmux.conf
+++ b/home/tmux.conf
@@ -18,8 +18,6 @@ set -g @batt_discharging_icon "👎"
set -g @batt_attached_icon "😐"
-# Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
-run '~/.tmux/plugins/tpm/tpm'
bind '"' split-window -c "#{pane_current_path}"
bind % split-window -h -c "#{pane_current_path}"
@@ -29,6 +27,9 @@ bind - split-window -v -c "#{pane_current_path}"# Split panes vertically
set -g @continuum-restore 'on'
-set-option -g default-command "reattach-to-user-namespace -l zsh"
+set-option -g default-command "reattach-to-user-namespace -l fish"
set-option -g set-titles on
+
+# Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
+run '~/.tmux/plugins/tpm/tpm'
diff --git a/hosts/ts-tl-mbp/home-manager.nix b/hosts/ts-tl-mbp/home-manager.nix
index b490ff2..6f04acf 100644
--- a/hosts/ts-tl-mbp/home-manager.nix
+++ b/hosts/ts-tl-mbp/home-manager.nix
@@ -11,9 +11,9 @@
};
home.packages = with pkgs; [
+ bat
ctags
exa
- bat
fzf
ripgrep
wget
@@ -22,13 +22,17 @@
programs.tmux = {
enable = true;
};
- #home.file.".tmux".source = "../../tmux";
- #home.file.".tmux.conf".source = "../../tmux.conf";
+ home.file = {
+ ".tmux.conf" = {
+ source = ../../home/tmux.conf;
+ recursive = true;
+ };
+ };
programs.git = {
enable = true;
includes = [
- { path = "~/code/tyrel.dev/dotfiles/gitconfig"; }
+ { path = "~/code/tyrel.dev/dotfiles/home/gitconfig"; }
];
aliases = {
ap = "add -p";
@@ -41,22 +45,10 @@
programs.neovim = {
enable = true;
};
- xdg.configFile = {
- "nvim" = {
- source = ../../config/nvim;
- recursive = true;
- };
- };
-
programs.fish = {
enable = true;
};
- xdg.configFile = {
- "fish" = {
- source = ../../config/fish;
- recursive = true;
- };
- };
+
programs.htop = {
@@ -64,18 +56,25 @@
};
#xdg.configFile = {
# "htop" = {
- # source = ../../config/htop;
+ # source = ../../home/config/htop;
# recursive = true;
# };
#};
-
- # Brew's XDG CONFIGS
+ # XDG CONFIGS
xdg.configFile = {
+ "nvim" = {
+ source = ../../home/config/nvim;
+ recursive = true;
+ };
+ "fish" = {
+ source = ../../home/config/fish;
+ recursive = true;
+ };
"karabiner" = {
- source = ../../config/karabiner;
+ source = ../../home/config/karabiner;
recursive = true;
};
};
diff --git a/rebuild.sh b/rebuild.sh
index 6c313f7..6c6af87 100755
--- a/rebuild.sh
+++ b/rebuild.sh
@@ -1,4 +1,4 @@
#!/bin/bash
git add . # YOLO
-./result/sw/bin/darwin-rebuild switch --flake .
+./result/sw/bin/darwin-rebuild switch --flake _macos
diff --git a/tmux/plugins/tmux-battery b/tmux/plugins/tmux-battery
deleted file mode 160000
index 09be78c..0000000
--- a/tmux/plugins/tmux-battery
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 09be78c35ee84f858f724442b94ad045ade23eb0
diff --git a/tmux/plugins/tmux-continuum b/tmux/plugins/tmux-continuum
deleted file mode 160000
index 90f4a00..0000000
--- a/tmux/plugins/tmux-continuum
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 90f4a00c41de094864dd4e29231253bcd80d4409
diff --git a/tmux/plugins/tmux-sensible b/tmux/plugins/tmux-sensible
deleted file mode 160000
index e91b178..0000000
--- a/tmux/plugins/tmux-sensible
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e91b178ff832b7bcbbf4d99d9f467f63fd1b76b5
diff --git a/tmux/plugins/tmux-themepack b/tmux/plugins/tmux-themepack
deleted file mode 160000
index 748ab16..0000000
--- a/tmux/plugins/tmux-themepack
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 748ab165adf6b5f74ed10d6a416dc55cd1906033
diff --git a/tmux/plugins/tpm b/tmux/plugins/tpm
deleted file mode 160000
index 95f7833..0000000
--- a/tmux/plugins/tpm
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 95f78336c3972f3e6648b7b3db754f2224320a5e