Skip to content

Commit

Permalink
Migrate to chezmoi (#3)
Browse files Browse the repository at this point in the history
* Chezmoi everything

* Ignore file, better instructions

* Template zshenv and ignore some stuff

* Adding python venv script

* Adding conda main env

* Adding Brewfile

* Better org

* Use fzf omz plugin and add fd for fzf

* Minor path update

* Remove some tmux commands

* Simplify gitignore

* Adding tree-sitter confi

* Renamed a file

* treesit emacs

* Emacs 28 on eagle and better ignore for linux

* Simplify ccls on other machines

* Spack manager builds for eagle

* rename

* Adding visit host file

* Update conda env

* Better emacs modeline and add anzu

* Emacs fix for GUI mode on osx

* Emacs icons for gui

* Replace deprecated fasd with z.lua, track iterm2 config

* Emacs completing icons only on graphics

* zplug auto install

* p10k and better iterm

* remove fasd

* add zenburn to emacs

* Adding ellis config

* Add a bat config file

* Minor changes to brew

* Larger history
  • Loading branch information
marchdf authored May 15, 2023
1 parent f76619c commit e1f8fa0
Show file tree
Hide file tree
Showing 51 changed files with 6,598 additions and 3,039 deletions.
3 changes: 3 additions & 0 deletions .chezmoi.toml.tmpl
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[edit]
command = "emacs"
args = ["-nw"]
14 changes: 14 additions & 0 deletions .chezmoiignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
README.md
LICENSE.md
conda-env

{{- if ne .chezmoi.os "darwin" }}
.config/karabiner
.config/iterm2
.vscode
Library
{{- end }}

{{- if ne .chezmoi.os "linux" }}
.tree-sitter
{{- end }}
54 changes: 54 additions & 0 deletions .chezmoitemplates/tree-sitter-config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
{
"parser-directories": [
"{{ .chezmoi.homeDir }}/tree-sitter-language-src"
],
"theme": {
"punctuation.bracket": 239,
"variable.parameter": {
"underline": true
},
"string": 28,
"module": 136,
"keyword": 56,
"constant": 94,
"variable.builtin": {
"bold": true
},
"attribute": {
"color": 124,
"italic": true
},
"function": 26,
"constructor": 136,
"operator": {
"bold": true,
"color": 239
},
"string.special": 30,
"function.builtin": {
"color": 26,
"bold": true
},
"punctuation.delimiter": 239,
"tag": 18,
"embedded": null,
"type.builtin": {
"bold": true,
"color": 23
},
"type": 23,
"constant.builtin": {
"bold": true,
"color": 94
},
"number": {
"color": 94,
"bold": true
},
"comment": {
"color": 245,
"italic": true
},
"property": 124
}
}
51 changes: 1 addition & 50 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,50 +1 @@
.DS_Store
.venv

*.pyc
Pipfile.lock

# beets
*/.config/beets/state.pickle

# irony
bin/bin/irony-server

# emacs files and folders
*/.emacs.d/.dap-breakpoints
*/.emacs.d/.extension/
*/.emacs.d/.last-package-update-day
*/.emacs.d/.lsp-session-v1
*/.emacs.d/abbrev_defs
*/.emacs.d/auto-save-list/
*/.emacs.d/backups/
*/.emacs.d/elpa/
*/.emacs.d/elpy/
*/.emacs.d/emms/cache
*/.emacs.d/emms/history
*/.emacs.d/emms/scores
*/.emacs.d/history
*/.emacs.d/irony/
*/.emacs.d/network-security.data
*/.emacs.d/projectile-bookmarks.eld
*/.emacs.d/projectile.cache
*/.emacs.d/recentf
*/.emacs.d/srecode-map.el
*/.emacs.d/tramp
*/.emacs.d/transient/
*/.emacs.d/tree-sitter/
*/.emacs.d/eln-cache/
*/.emacs.d/var
*/.emacs.d/projects

# vscode
vscode/.vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin
vscode/.vscode/extensions/llvm-org.lldb-vscode-0.1.0/lib
vscode/.vscode/extensions/llvm-org.lldb-vscode-0.1.0/node_modules
vscode/.vscode/extensions/llvm-org.lldb-vscode-0.1.0/package*.json

# karabiner
karabiner/.config/karabiner/automatic_backups/

# emacs
emacs/emacs.d-bkp/
.DS_Store
19 changes: 13 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,24 @@
Dotfiles
========

This repository includes all of my custom dotfiles. The setup scripts
symlinks the new dotfiles to those in the `~/dotfiles`.
This repository includes all of my custom dotfiles.

Installation
------------

Prerequisites: `GNU stow`, `zsh`, [`oh-my-zsh`](https://github.com/robbyrussell/oh-my-zsh), and [`fzf`](https://github.com/junegunn/fzf)
Prerequisites for installation are [`chezmoi`](https://www.chezmoi.io).

Then you can do the following:
``` bash
git clone [email protected]:marchdf/dotfiles.git ${HOME}/dotfiles
cd ~/dotfiles
./install.sh
chezmoi init [email protected]:marchdf/dotfiles.git
chezmoi diff
chezmoi apply -v
```

Improved experience
-------------------

The following will lead to an improved experience:
- `zsh`
- [`oh-my-zsh`](https://github.com/robbyrussell/oh-my-zsh)
- [`fzf`](https://github.com/junegunn/fzf)
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
9 changes: 2 additions & 7 deletions mymainconda.yml → conda-env/environment.yml
Original file line number Diff line number Diff line change
@@ -1,25 +1,21 @@
# Configuring:
# install miniconda
# conda config --set ssl_verify false
# conda env create -f mymainconda.yml
# conda env create -f environment.yml
name: main
channels:
- conda-forge
- defaults
dependencies:
- python=3.8
- python=3.10
- black
- h5py
- ipython
- line_profiler
- matplotlib
- mpi4py
- netcdf4
- nose
- numba
- numpy
- pandas
- pip
- pyyaml
- scikit-learn
- scipy
Expand All @@ -29,4 +25,3 @@ dependencies:
- toml
- yt
prefix: /home/mhenryde/miniconda3/envs/main

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
25 changes: 25 additions & 0 deletions dot_config/bat/config
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# This is `bat`s configuration file. Each line either contains a comment or
# a command-line option that you want to pass to `bat` by default. You can
# run `bat --help` to get a list of all possible configuration options.

# Specify desired highlighting theme (e.g. "TwoDark"). Run `bat --list-themes`
# for a list of all available themes
--theme="OneHalfDark"

# Enable this to use italic text on the terminal. This is not supported on all
# terminal emulators (like tmux, by default):
#--italic-text=always

# Uncomment the following line to disable automatic paging:
#--paging=never

# Uncomment the following line if you are using less version >= 551 and want to
# enable mouse scrolling support in `bat` when running inside tmux. This might
# disable text selection, unless you press shift.
#--pager="less --RAW-CONTROL-CHARS --quit-if-one-screen --mouse"

# Syntax mappings: map a certain filename pattern to a language.
# Example 1: use the C++ syntax for Arduino .ino files
# Example 2: Use ".gitignore"-style highlighting for ".ignore" files
#--map-syntax "*.ino:C++"
#--map-syntax ".ignore:Git Ignore"
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit e1f8fa0

Please sign in to comment.