Skip to content

Commit 204fef1

Browse files
ADGEfficiencyADGEfficiency
authored
Air 2025-09-12 (#67)
1 parent 99ba32c commit 204fef1

File tree

23 files changed

+285
-204
lines changed

23 files changed

+285
-204
lines changed

‎.github/workflows/test.yml‎

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,10 @@ jobs:
99
XDG_CONFIG_HOME: ${{ github.workspace }}
1010
steps:
1111
- uses: actions/checkout@v3
12-
- run: make nix-pkgs OS=ubuntu devShell=''
13-
- run: . ./nix/load-ubuntu.sh && make test -o setup-nix OS=ubuntu STOW_ARGS='--v
14-
--adopt'
15-
- run: . ./nix/load-ubuntu.sh && sudo -E make setup-ubuntu -o setup-nix OS=ubuntu
16-
STOW_ARGS='--v --adopt'
17-
# TODO having problems with zsh being available
18-
# can't set $PATH correctly
19-
# - run: . ./nix/load-linux.sh && sudo -E make js python OS=linux
20-
# macos:
21-
# runs-on: macos-latest
22-
# env:
23-
# XDG_CONFIG_HOME: ${{ github.workspace }}
24-
# NIXPKGS_ALLOW_BROKEN: 1
25-
# steps:
26-
# - uses: actions/checkout@v3
27-
# - uses: actions/setup-node@v3
28-
# with:
29-
# node-version: 16
30-
# - run: make nix-pkgs OS=macos
31-
# - run: . ./nix/load-macos.sh && make test -o setup-nix OS=macos STOW_ARGS='--v
32-
# --adopt'
12+
macos:
13+
runs-on: macos-latest
14+
env:
15+
XDG_CONFIG_HOME: ${{ github.workspace }}
16+
NIXPKGS_ALLOW_BROKEN: 1
17+
steps:
18+
- uses: actions/checkout@v3

‎Makefile‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ setup-stow:
2626

2727
STOW_ARGS=-vv
2828
dotfiles: setup-stow
29-
stow $(STOW_ARGS) -d dotfiles -t $(HOME) $(OS)
30-
stow $(STOW_ARGS) dotfiles
31-
stow $(STOW_ARGS) yabai
29+
stow "$(STOW_ARGS)" -d dotfiles -t "$(HOME)"$(OS)
30+
stow "$(STOW_ARGS)" dotfiles
31+
stow "$(STOW_ARGS)" yabai
3232
ln -sf ~/dotfiles/fish ~/.config/fish\
3333

34-
test: setup-nix
35-
bash ./nix/load-$(OS).sh && bash ./tests/*.sh
34+
test: nix-pkgs
35+
. ./nix/load-"$(OS)".sh && bash ./tests/*.sh
3636

3737
.PHONY: setup-uv python js
3838

@@ -64,12 +64,12 @@ setup-vim:
6464

6565
setup-nix:
6666
curl -L https://nixos.org/nix/install | sh
67-
. ./nix/load-$(OS).sh && nix-channel --add https://nixos.org/channels/nixpkgs-unstable unstable
68-
. ./nix/load-$(OS).sh && nix-channel --update
67+
. ./nix/load-"$(OS)".sh && nix-channel --add https://nixos.org/channels/nixpkgs-unstable unstable
68+
. ./nix/load-"$(OS)".sh && nix-channel --update
6969

7070
NIX_ARGS=--extra-experimental-features nix-command --extra-experimental-features flakes
7171
nix-pkgs: setup-nix
72-
. ./nix/load-$(OS).sh && cd nix && nix flake update $(NIX_ARGS) && nix profile install $(NIX_ARGS)
72+
. ./nix/load-"$(OS)".sh && cd nix && nix flake update "$(NIX_ARGS)" && (nix profile upgrade "$(NIX_ARGS)" nix || nix profile install "$(NIX_ARGS)" .)
7373

7474
.PHONY: setup-brew brew-pkgs
7575

@@ -78,6 +78,6 @@ setup-brew:
7878
brew update; brew upgrade
7979

8080
brew-pkgs: setup-brew
81-
brew install hadolint vale actionlint mactex pandoc fzf keychain wordnet
81+
brew install hadolint vale actionlint mactex pandoc fzf keychain wordnet entr
8282
brew install koekeishiya/formulae/yabai
8383
brew install koekeishiya/formulae/skhd

‎README.md‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# dotfiles
22

3-
Setup and configuration for my terminal based developer workflow:
3+
Setup and configuration for my terminal based developer workflow (MacOS/Ubuntu):
44

55
- Zsh for a shell
66
- Nix for package management of shell programs
@@ -10,6 +10,12 @@ Setup and configuration for my terminal based developer workflow:
1010

1111
This repo should be cloned into `$HOME` and set as `$XDG_CONFIG_HOME`.
1212

13+
You can setup your machine using commands in `Makefile`. Commonly setting up a machine involves:
14+
15+
- Installing packages with Nix or Homebrew
16+
- Setting up symlinks with Stow
17+
- Setting up tmux & Zsh
18+
1319
## Use
1420

1521
### Ubuntu
@@ -86,6 +92,12 @@ Neovim config is in `./nvim`. To use the Neovim setup, put this folder into `$XD
8692

8793
I use Lazy for package management in Neovim - it will install packages when you first open the editor.
8894

95+
### Shell Customization
96+
97+
The `s` command opens a fuzzy file finder (fzf) to search and open files in `$EDITOR`. Run `s` in any directory, or pass a path like `s ~/projects`. Supports multi-select with Tab.
98+
99+
Lot's of aliases - see `scripts/aliases.sh`.
100+
89101
### Getting Kitty to Play Nice on macOS
90102

91103
Had weird issue with the first execution of Kitty not loading the `kitty.conf` correctly - fixed with:
@@ -112,5 +124,3 @@ Had weird issue with the first execution of Kitty not loading the `kitty.conf` c
112124
113125
$ launchctl load ~/Library/LaunchAgents/setenv.XDG_CONFIG_HOME.plist
114126
```
115-
116-

‎dotfiles/.envrc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
source_env_if_exists ~/.env.secret
22
export TRACE=0
3+
source .venv/bin/activate

‎dotfiles/.luarc.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"workspace.library": [
3-
"/Users/adam/dotfiles/nvim",
3+
"/Users/adamgreen/dotfiles/nvim",
44
"${3rd}/luassert/library",
55
"${3rd}/luv/library"
66
]

‎nix/flake.lock‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎nix/flake.nix‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
defaultPackage = with pkgs; buildEnv {
1616
name = "shell";
1717
paths = [
18-
actionlint
18+
# actionlint # Installed via Homebrew to avoid nokogiri build issues
1919
go-tools
2020
bash
2121
bat
@@ -32,6 +32,8 @@
3232
entr
3333
findutils
3434
# fish
35+
fd
36+
csvlens
3537
flyctl
3638
gh
3739
git
@@ -60,7 +62,7 @@
6062
nodePackages_latest.prettier
6163
nodePackages_latest.sql-formatter
6264
nodePackages_latest.stylelint
63-
nodejs_20
65+
nodejs_22
6466
ov
6567
pandoc
6668
ripgrep

‎nvim/.luarc.json‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"$schema": "https://raw.githubusercontent.com/sumneko/vscode-lua/master/setting/schema.json",
3+
"runtime": {
4+
"version": "LuaJIT"
5+
},
6+
"diagnostics": {
7+
"globals": ["vim"]
8+
},
9+
"workspace": {
10+
"library": [
11+
"$VIMRUNTIME",
12+
"${3rd}/luv/library",
13+
"${3rd}/luassert/library"
14+
],
15+
"checkThirdParty": false
16+
},
17+
"telemetry": {
18+
"enable": false
19+
}
20+
}

‎nvim/lazy-lock.json‎

Lines changed: 46 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,64 @@
11
{
2-
"CopilotChat.nvim": { "branch": "main", "commit": "a89f5f1162b04a0962e5f4c3cdf248a81e7e53cb" },
3-
"LuaSnip": { "branch": "master", "commit": "c9b9a22904c97d0eb69ccb9bab76037838326817" },
2+
"CopilotChat.nvim": { "branch": "main", "commit": "df5376c132382dd47e3e552612940cbf25b3580c" },
3+
"LuaSnip": { "branch": "master", "commit": "3732756842a2f7e0e76a7b0487e9692072857277" },
44
"Vim-Jinja2-Syntax": { "branch": "master", "commit": "2c17843b074b06a835f88587e1023ceff7e2c7d1" },
5-
"barbar.nvim": { "branch": "master", "commit": "807bede7ef1d8e2ac5f108e9ac8123b1e2d321e3" },
5+
"barbar.nvim": { "branch": "master", "commit": "539d73def39c9172b4d4d769f14090e08f37b29d" },
66
"blink-cmp-copilot": { "branch": "main", "commit": "439cff78780c033aa23cf061d7315314b347e3c1" },
7-
"blink-cmp-dictionary": { "branch": "master", "commit": "5f1a703416e5090b9633c43873dba8ba03b0fb23" },
8-
"blink-emoji.nvim": { "branch": "master", "commit": "a77aebc092ebece1eed108f301452ae774d6b67a" },
9-
"blink-ripgrep.nvim": { "branch": "main", "commit": "56084d1f45c8621d23d4bac724c2dc50b1eb75db" },
10-
"blink.cmp": { "branch": "main", "commit": "cb5e346d9e0efa7a3eee7fd4da0b690c48d2a98e" },
7+
"blink-cmp-dictionary": { "branch": "master", "commit": "944b3b215b01303672d4213758db7c5c5a1e3c92" },
8+
"blink-emoji.nvim": { "branch": "master", "commit": "066013e4c98a9318408ee3f1ca2dbcb6fa3e4c06" },
9+
"blink-ripgrep.nvim": { "branch": "main", "commit": "b181a42925e5bec11030516124b0123c2a297abb" },
10+
"blink.cmp": { "branch": "main", "commit": "b19413d214068f316c78978b08264ed1c41830ec" },
1111
"blink.compat": { "branch": "main", "commit": "2ed6d9a28b07fa6f3bface818470605f8896408c" },
12-
"bullets.vim": { "branch": "master", "commit": "8f3259e807c40b91d247f612823295ab99777a65" },
13-
"conform.nvim": { "branch": "master", "commit": "eebc724d12c5579d733d1f801386e0ceb909d001" },
12+
"bullets.vim": { "branch": "master", "commit": "89294b8930e660936374fb763ac48a1ac51dd29c" },
13+
"conform.nvim": { "branch": "master", "commit": "328c2f1dda56f933d3337a1316e1020ba30ba6aa" },
1414
"copilot-cmp": { "branch": "master", "commit": "15fc12af3d0109fa76b60b5cffa1373697e261d1" },
15-
"copilot.lua": { "branch": "master", "commit": "0a7502946845fb14b860a6384c709a791bbab96a" },
16-
"dbtpal": { "branch": "main", "commit": "706134b879eb2f48b2abf56f29e95a30a52cf398" },
15+
"copilot.lua": { "branch": "master", "commit": "e78d1ffebdf6ccb6fd8be4e6898030c1cf5f9b64" },
16+
"dbtpal": { "branch": "main", "commit": "981eab51609362712c64e3cf3fb773fe11f859b9" },
1717
"diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
18-
"emmet-vim": { "branch": "master", "commit": "6c511a8d7d2863066f32e25543e2bb99d505172c" },
19-
"friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" },
18+
"emmet-vim": { "branch": "master", "commit": "e98397144982d1e75b20d94d55a82de3ec8f648d" },
19+
"friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
2020
"git-conflict.nvim": { "branch": "main", "commit": "4bbfdd92d547d2862a75b4e80afaf30e73f7bbb4" },
21-
"gitsigns.nvim": { "branch": "main", "commit": "17ab794b6fce6fce768430ebc925347e349e1d60" },
21+
"gitsigns.nvim": { "branch": "main", "commit": "5813e4878748805f1518cee7abb50fd7205a3a48" },
2222
"indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
23-
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
24-
"lualine.nvim": { "branch": "master", "commit": "0ea56f91b7f51a37b749c050a5e5dfdd56b302b3" },
25-
"mini.icons": { "branch": "main", "commit": "397ed3807e96b59709ef3292f0a3e253d5c1dc0a" },
26-
"mini.nvim": { "branch": "main", "commit": "e7538b549361c9ac8416a07b0223ce03c508bfe7" },
27-
"nvim-autopairs": { "branch": "master", "commit": "2a406cdd8c373ae7fe378a9e062a5424472bd8d8" },
28-
"nvim-bqf": { "branch": "main", "commit": "e20417d5e589e03eaaaadc4687904528500608be" },
23+
"lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
24+
"leap.nvim": { "branch": "main", "commit": "f19d43590c4b6d31188ee1ea2954d2b7558a9e11" },
25+
"lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" },
26+
"markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
27+
"mini.icons": { "branch": "main", "commit": "ff2e4f1d29f659cc2bad0f9256f2f6195c6b2428" },
28+
"mini.nvim": { "branch": "main", "commit": "b7231b65d15611a99168bc5a94a84cb8e4c85c21" },
29+
"nvim-autopairs": { "branch": "master", "commit": "c2a0dd0d931d0fb07665e1fedb1ea688da3b80b4" },
30+
"nvim-bqf": { "branch": "main", "commit": "ba2b365969d7c2c6301d48e13aeee59568765529" },
2931
"nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
30-
"nvim-lint": { "branch": "master", "commit": "5b1bdf306bd3e565908145279e8bbfc594dac3b3" },
31-
"nvim-lspconfig": { "branch": "master", "commit": "4ea9083b6d3dff4ddc6da17c51334c3255b7eba5" },
32-
"nvim-treesitter": { "branch": "master", "commit": "0e21ee8df6235511c02bab4a5b391d18e165a58d" },
33-
"nvim-treesitter-context": { "branch": "master", "commit": "439789a9a8df9639ecd749bb3286b77117024a6f" },
34-
"nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" },
35-
"nvim-web-devicons": { "branch": "master", "commit": "c90dee4e930ab9f49fa6d77f289bff335b49e972" },
36-
"obsidian.nvim": { "branch": "main", "commit": "e0eb92c5afcacf5bf11e4735079a538fd1486ea9" },
37-
"oil.nvim": { "branch": "master", "commit": "302bbaceeafc690e6419e0c8296e804d60cb9446" },
32+
"nvim-lint": { "branch": "master", "commit": "7a64f4067065c16a355d40d0d599b8ca6b25de6d" },
33+
"nvim-lspconfig": { "branch": "master", "commit": "c4f67bf85b01a57e3c130352c0a0e453ab8cd5b9" },
34+
"nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
35+
"nvim-treesitter-context": { "branch": "master", "commit": "64dd4cf3f6fd0ab17622c5ce15c91fc539c3f24a" },
36+
"nvim-treesitter-textobjects": { "branch": "master", "commit": "5ca4aaa6efdcc59be46b95a3e876300cfead05ef" },
37+
"nvim-ts-autotag": { "branch": "main", "commit": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc" },
38+
"nvim-web-devicons": { "branch": "master", "commit": "f66cdfef5e84112045b9ebc3119fee9bddb3c687" },
39+
"obsidian.nvim": { "branch": "main", "commit": "ae1f76a75c7ce36866e1d9342a8f6f5b9c2caf9b" },
40+
"oil.nvim": { "branch": "master", "commit": "cbcb3f997f6f261c577b943ec94e4ef55108dd95" },
3841
"peek.nvim": { "branch": "master", "commit": "5820d937d5414baea5f586dc2a3d912a74636e5b" },
39-
"plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
40-
"telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" },
41-
"telescope-git-file-history.nvim": { "branch": "master", "commit": "c27d99ba88ec5f0b6d2b9f9bc67dd3d14c610b25" },
42-
"telescope-makefile": { "branch": "master", "commit": "6e5b5767751dbf73ad4f126840dcf1abfc38e891" },
43-
"telescope.nvim": { "branch": "master", "commit": "a4ed82509cecc56df1c7138920a1aeaf246c0ac5" },
44-
"trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
45-
"undotree": { "branch": "master", "commit": "b951b87b46c34356d44aa71886aecf9dd7f5788a" },
42+
"plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
43+
"semshi": { "branch": "master", "commit": "7f18bedc70cbb7aa68dcc6df5e730d88e4527622" },
44+
"telescope-fzf-native.nvim": { "branch": "main", "commit": "6fea601bd2b694c6f2ae08a6c6fab14930c60e2c" },
45+
"telescope-git-file-history.nvim": { "branch": "master", "commit": "e7d495319f2a04df96402057a6992ea970f8914d" },
46+
"telescope-makefile": { "branch": "master", "commit": "f35425d7d53d92a04215c3714a5819811d2842c3" },
47+
"telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
48+
"telescope.nvim": { "branch": "master", "commit": "3d757e586ff0bfc85bdb7b46c9d3d932147a0cde" },
49+
"trouble.nvim": { "branch": "main", "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a" },
50+
"undotree": { "branch": "master", "commit": "0f1c9816975b5d7f87d5003a19c53c6fd2ff6f7f" },
4651
"vim": { "branch": "master", "commit": "d4b0823100c702af127cba8dd5595a8f599041ec" },
47-
"vim-argwrap": { "branch": "master", "commit": "f3e26a5ad249d09467804b92e760d08b1cc457a1" },
52+
"vim-argwrap": { "branch": "master", "commit": "03615d1eed248408567bc8fa6a5a8c94ef3cd170" },
4853
"vim-bufkill": { "branch": "master", "commit": "3113181d0c1bfb8719f3ddcd2e2f35a8d763d1e5" },
4954
"vim-closetag": { "branch": "master", "commit": "d0a562f8bdb107a50595aefe53b1a690460c3822" },
50-
"vim-fugitive": { "branch": "master", "commit": "4a745ea72fa93bb15dd077109afbb3d1809383f2" },
55+
"vim-fugitive": { "branch": "master", "commit": "61b51c09b7c9ce04e821f6cf76ea4f6f903e3cf4" },
5156
"vim-grepper": { "branch": "master", "commit": "acaaf32edaa11d82fb972d2af36b949ec3042928" },
52-
"vim-markdown-toc": { "branch": "master", "commit": "aa9cc3b07791db5cbe5f29d661763bc0eb4fb7c1" },
57+
"vim-markdown-toc": { "branch": "master", "commit": "66026b323379c9a712c6169cd43153216acef090" },
5358
"vim-one": { "branch": "master", "commit": "187f5c85b682c1933f8780d4d419c55d26a82e24" },
5459
"vim-python-pep8-indent": { "branch": "master", "commit": "60ba5e11a61618c0344e2db190210145083c91f8" },
55-
"vim-table-mode": { "branch": "master", "commit": "e4365bde024f73e205eefa2fb78e3029ddb92ea9" },
60+
"vim-repeat": { "branch": "master", "commit": "65846025c15494983dafe5e3b46c8f88ab2e9635" },
61+
"vim-table-mode": { "branch": "master", "commit": "bb025308a45c67c7c8f0763ba37bc2ee3f534df0" },
5662
"winresizer": { "branch": "master", "commit": "9bd559a03ccec98a458e60c705547119eb5350f3" },
57-
"zen-mode.nvim": { "branch": "main", "commit": "863f150ca321b3dd8aa1a2b69b5f411a220e144f" }
63+
"zen-mode.nvim": { "branch": "main", "commit": "8564ce6d29ec7554eb9df578efa882d33b3c23a7" }
5864
}

‎nvim/lua/config/command.lua‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ vim.cmd([[
2525

2626
-- Search in personal notes
2727
local function searchPersonalNotes()
28-
require("telescope.builtin").find_files({
28+
require("telescope.builtin").find_files(require("telescope.themes").get_ivy({
2929
prompt_title = "<Personal Notes>",
3030
search_dirs = { "~/personal", "~/programming-resources" },
3131
path_display = { "absolute" },
32-
})
32+
}))
3333
end
3434
_G.searchPersonalNotes = searchPersonalNotes
3535
-- :S

0 commit comments

Comments
 (0)