Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: hironow/dotfiles
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b5c7c45bf536b519d474fb5e17f17c1bb451cbca
Choose a base ref
..
head repository: hironow/dotfiles
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 05619aa2f2d23ca747417773ff5dba660f52808c
Choose a head ref
Showing with 40 additions and 8 deletions.
  1. +7 −2 .env
  2. +5 −0 .gitignore
  3. +15 −0 .zshrc
  4. +7 −2 README.md
  5. +2 −0 dump/Brewfile
  6. +4 −4 mise.toml
9 changes: 7 additions & 2 deletions .env
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
#!/usr/bin/env bash
#/-------------------[DOTENV_PUBLIC_KEY]--------------------/
#/ public-key encryption for .env files /
#/ [how it works](https://dotenvx.com/encryption) /
#/----------------------------------------------------------/
DOTENV_PUBLIC_KEY="03a314d6400fc20312bda8f2de45527ad5131a997a3f499c6f39bc604870bcf98d"

export FOO_FROM_FILE="foo_from_file"
# .env
HELLO="encrypted:BJZ9rOjh8obcKXpxjqCZ4Ufb2x4K6ujVl+HGBZLufm2lecJKh/0rRJkaqnMuXqCXdi126TsCONlvgX8abdrifMaEueFyU5kYXabRkEBUGTJzUzbnrRAPXnzOo9IrsmYiEDe6/ZoC"
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -6,8 +6,13 @@ Brewfile.lock.json
venv
__pycache__

# private
private/

# env
.env.keys

# node
*-debug.log
*.log

15 changes: 15 additions & 0 deletions .zshrc
Original file line number Diff line number Diff line change
@@ -180,3 +180,18 @@ fi
if _cmd_exists terramate; then
alias t="terramate"
fi


# history settings
HISTFILE=~/.zsh_history
HISTSIZE=10000
SAVEHIST=10000
setopt APPEND_HISTORY
setopt SHARE_HISTORY
setopt HIST_IGNORE_DUPS
setopt HIST_IGNORE_ALL_DUPS
setopt HIST_IGNORE_SPACE
setopt HIST_SAVE_NO_DUPS
setopt HIST_REDUCE_BLANKS
setopt INC_APPEND_HISTORY
setopt HIST_EXPIRE_DUPS_FIRST
9 changes: 7 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -20,10 +20,14 @@ mx uv sync
mx make

# mise env
mise set

mx dotenvx run -- mise set
# mise env with github credentials (use gh extension)
gh do -- mise set

# set env by dotenvx (encrypted)
mx dotenvx set HELLO World
# set env by mise (plain, unencrypted)
mx mise set WORLD=hello
```

## references
@@ -32,3 +36,4 @@ gh do -- mise set
- [uv](https://github.com/astral-sh/uv)
- [gh do](https://github.com/k1LoW/gh-do)
- [localhost](https://blog.jxck.io/entries/2020-06-29/https-for-localhost.html)
- [dotenvx](https://dotenvx.com/)
2 changes: 2 additions & 0 deletions dump/Brewfile
Original file line number Diff line number Diff line change
@@ -7,6 +7,7 @@ tap "dagger/tap"
tap "danielbayley/adobe"
tap "dart-lang/dart"
tap "deploifai/deploifai"
tap "dotenvx/brew"
tap "fastly/tap"
tap "github/gh"
tap "go-delve/delve"
@@ -136,6 +137,7 @@ brew "bufbuild/buf/buf"
brew "cjbassi/gotop/gotop"
brew "crowdin/crowdin/crowdin@4"
brew "deploifai/deploifai/deploifai"
brew "dotenvx/brew/dotenvx"
brew "fastly/tap/fastly"
brew "goreleaser/tap/goreleaser"
brew "greymd/tools/teip"
8 changes: 4 additions & 4 deletions mise.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
min_version = "2024.1.1"

[env]
_.file = [".env"]
_.path = ["./target/debug", "./node_modules/.bin"]
FOO = "bar"
FOO_NUM = 1
_.file = [".env"] # encrypted by dotenvx
# below as plain dotenv
THIS_PROJECT = "{{config_root}}-{{cwd}}"
CERTIFICATES_DIR = "{{config_root}}/private/certificates/live/"
WORLD = "hello"


[tools]