Merge branch 'main' into chore/remote-updates 6b03dcd5
Steve Simkins · 2025-07-17 15:41 17 file(s) · +289 −30
.gitignore +1 −0
1 1
/zed/conversations/*
2 2
.DS_Store
3 3
/zed/.config/zed/prompts/prompts-library-db.0.mdb/
4 +
*/.DS_Store
4 5
README.md +23 −7
1 -
## Steve's Dotfiles
1 +
# Dotfiles
2 2
3 -
Here's a collection of dotfiles that I use regularly on my MacOS development environment. If you want to use them simply copy them to their appropriate locations, majority of them being in `~/.config`.
3 +
A collection of MacOS dotfiles I use in my developement environment
4 4
5 -
![screenshot](https://github.com/stevedylandev/dotfiles/blob/5230b7f924e3bb30ef477d99af6bc2f41cd7bce6/assets/screenshot.png)
5 +
![screenshot](assets/screenshot.png)
6 6
7 -
**A few things to be aware of:**
7 +
## Installation
8 8
9 -
- Alacritty is expecting a Nerd font patched verson of [Commit Mono](https://commitmono.com/) which I have included in `assets` since it is open source!
10 -
- The color scheme is `base16-black-metal-bathory`, which should be available in any theme plugin that offers base16
9 +
To manage dotfiles I use a tool called [fling](https://github.com/bbkane/fling), which is similar to stow but in my opinion a bit more clear and fool proof. If you with to use fling to manage these dotfiles, all you have to do is the following:
11 10
12 -
Feel free to [reach out](mailto:hello@stevedylan.dev) if you have any questions!
11 +
1. Clone the dotfiles to your machine and `cd` into the directory
12 +
2. Make an empty directory where you want the files to be synced. e.g., `nvim` would be `mkdir -p ~/.config/nvim`
13 +
3. Run the fling command to make a symlink: `fling link -s nvim -l ~/.config/nvim`
14 +
15 +
This will ask you to confirm the decision and create the symlink. Any time you edit your dot files the changes will actually happen in ~/dotfiles making it easier to manage them with git.
16 +
17 +
If you don't wish to use fling you can simply copy and paste these as you wish.
18 +
19 +
## Features
20 +
21 +
- Custom theme which I've named "Darkmatter" exists in the [wezterm](wezterm/.wezterm.lua), [ghostty](ghostty/config), [nushell](nushell/darkmatter.nu), [nvim](https://github.com/stevedylandev/darkmatter-nvim), and [zed](https://github.com/stevedylandev/darkmatter-zed).
22 +
- A patched version of [Commit Mono](https://commitmono.com) which includes nerd fonts
23 +
- Custom prompt made with [starship](starship/starship.toml)
24 +
- Brewfile and cargofile with most of my packages (I update occasionally)
25 +
26 +
## Questions
27 +
28 +
Feel free to [reach out](mailto:hello@stevedylan.dev) if you have any questions! I'm always more than willing to help fellow terminal nerds like me :)
assets/.DS_Store (deleted) +0 −0

Binary file — no preview.

assets/screenshot.png +0 −0

Binary file — no preview.

assets/wallpaper.png (added) +0 −0

Binary file — no preview.

macchina/macchina.toml (added) +59 −0
1 +
# Specifies the network interface to use for the LocalIP readout
2 +
interface = "wlan0"
3 +
4 +
# Lengthen uptime output
5 +
long_uptime = true
6 +
7 +
# Lengthen shell output
8 +
long_shell = false
9 +
10 +
# Lengthen kernel output
11 +
long_kernel = false
12 +
13 +
# Toggle between displaying the current shell or your user's default one.
14 +
current_shell = true
15 +
16 +
# Toggle between displaying the number of physical or logical cores of your
17 +
# processor.
18 +
physical_cores = true
19 +
20 +
# Disks to show disk usage for. Defaults to `["/"]`.
21 +
# disks = ["/", "/home/user"]
22 +
23 +
# Show percentage next to disk information
24 +
# disk_space_percentage = true
25 +
26 +
# Show percentage next to memory information
27 +
# memory_percentage = true
28 +
29 +
# Themes need to be placed in "$XDG_CONFIG_DIR/macchina/themes" beforehand.
30 +
# e.g.:
31 +
#  if theme path is /home/foo/.config/macchina/themes/Sodium.toml
32 +
#  theme should be uncommented and set to "Sodium"
33 +
#
34 +
theme = "Lithium"
35 +
36 +
# Displays only the specified readouts.
37 +
# Accepted values (case-sensitive):
38 +
#   - Host
39 +
#   - Machine
40 +
#   - Kernel
41 +
#   - Distribution
42 +
#   - OperatingSystem
43 +
#   - DesktopEnvironment
44 +
#   - WindowManager
45 +
#   - Resolution
46 +
#   - Backlight
47 +
#   - Packages
48 +
#   - LocalIP
49 +
#   - Terminal
50 +
#   - Shell
51 +
#   - Uptime
52 +
#   - Processor
53 +
#   - ProcessorLoad
54 +
#   - Memory
55 +
#   - Battery
56 +
#   - GPU
57 +
#   - DiskSpace
58 +
# Example:
59 +
#   show = ["Battery", "Memory", ...]
macchina/themes/Beryllium.toml (added) +27 −0
1 +
# Beryllium
2 +
3 +
spacing         = 3
4 +
hide_ascii      = true
5 +
key_color       = "green"
6 +
separator       = ""
7 +
8 +
[box]
9 +
border          = "plain"
10 +
visible         = true
11 +
12 +
[palette]
13 +
glyph           = "○"
14 +
spacing         = 2
15 +
visible         = true
16 +
17 +
[bar]
18 +
glyph           = "○"
19 +
hide_delimiters = true
20 +
visible         = true
21 +
22 +
[box.inner_margin]
23 +
x               = 2
24 +
y               = 1
25 +
26 +
[custom_ascii]
27 +
color           = "green"
macchina/themes/Helium.toml (added) +53 −0
1 +
# Helium
2 +
3 +
hide_ascii      = false
4 +
spacing         = 2
5 +
padding         = 0
6 +
separator       = "->"
7 +
key_color       = "Blue"
8 +
separator_color = "Yellow"
9 +
10 +
[bar]
11 +
glyph           = "o"
12 +
symbol_open     = "("
13 +
symbol_close    = ")"
14 +
hide_delimiters = false
15 +
visible         = false
16 +
17 +
[box]
18 +
title           = " Helium "
19 +
border          = "rounded"
20 +
visible         = false
21 +
22 +
[box.inner_margin]
23 +
x               = 2
24 +
y               = 1
25 +
26 +
[custom_ascii]
27 +
color           = "Yellow"
28 +
29 +
[randomize]
30 +
key_color       = false
31 +
separator_color = false
32 +
33 +
[keys]
34 +
host            = "Host"
35 +
kernel          = "Kernel"
36 +
battery         = "Battery"
37 +
os              = "OS"
38 +
de              = "DE"
39 +
wm              = "WM"
40 +
distro          = "Distro"
41 +
terminal        = "Terminal"
42 +
shell           = "Shell"
43 +
packages        = "Packages"
44 +
uptime          = "Uptime"
45 +
memory          = "Memory"
46 +
machine         = "Machine"
47 +
local_ip        = "IP"
48 +
backlight       = "Brightness"
49 +
resolution      = "Resolution"
50 +
cpu_load        = "CPU Load"
51 +
cpu             = "CPU"
52 +
gpu             = "GPU"
53 +
disk_space      = "Disk Space"
macchina/themes/Hydrogen.toml (added) +53 −0
1 +
# Hydrogen
2 +
3 +
spacing         = 2
4 +
padding         = 0
5 +
hide_ascii      = true
6 +
separator       = ">"
7 +
key_color       = "Cyan"
8 +
separator_color = "White"
9 +
10 +
[palette]
11 +
type = "Full"
12 +
visible = false
13 +
14 +
[bar]
15 +
glyph           = "ߋ"
16 +
symbol_open     = '['
17 +
symbol_close    = ']'
18 +
hide_delimiters = true
19 +
visible         = true
20 +
21 +
[box]
22 +
border          = "plain"
23 +
visible         = true
24 +
25 +
[box.inner_margin]
26 +
x               = 1
27 +
y               = 0
28 +
29 +
[randomize]
30 +
key_color       = false
31 +
separator_color = false
32 +
33 +
[keys]
34 +
host            = "Host"
35 +
kernel          = "Kernel"
36 +
battery         = "Battery"
37 +
os              = "OS"
38 +
de              = "DE"
39 +
wm              = "WM"
40 +
distro          = "Distro"
41 +
terminal        = "Terminal"
42 +
shell           = "Shell"
43 +
packages        = "Packages"
44 +
uptime          = "Uptime"
45 +
memory          = "Memory"
46 +
machine         = "Machine"
47 +
local_ip        = "Local IP"
48 +
backlight       = "Brightness"
49 +
resolution      = "Resolution"
50 +
cpu_load        = "CPU Load"
51 +
cpu             = "CPU"
52 +
gpu             = "GPU"
53 +
disk_space      = "Disk Space"
macchina/themes/Lithium.toml (added) +60 −0
1 +
# Lithium
2 +
3 +
spacing         = 1
4 +
padding         = 0
5 +
hide_ascii      = true
6 +
separator       = " "
7 +
key_color       = "Yellow"
8 +
separator_color = "Yellow"
9 +
10 +
[palette]
11 +
type            = "Light"
12 +
glyph           = "●"
13 +
spacing         = 2
14 +
visible         = true
15 +
16 +
[bar]
17 +
glyph           = "●"
18 +
symbol_open     = '('
19 +
symbol_close    = ')'
20 +
visible         = false
21 +
hide_delimiters = true
22 +
23 +
[box]
24 +
title           = " "
25 +
border          = "plain"
26 +
visible         = false
27 +
28 +
[box.inner_margin]
29 +
x               = 2
30 +
y               = 1
31 +
32 +
[custom_ascii]
33 +
color           = "Yellow"
34 +
35 +
[randomize]
36 +
key_color       = false
37 +
separator_color = false
38 +
pool            = "base"
39 +
40 +
[keys]
41 +
host            = "Host"
42 +
kernel          = "Kernel"
43 +
battery         = "Battery"
44 +
os              = "OS"
45 +
de              = "DE"
46 +
wm              = "WM"
47 +
distro          = "Distro"
48 +
terminal        = "Terminal"
49 +
shell           = "Shell"
50 +
packages        = "Packages"
51 +
uptime          = "Uptime"
52 +
memory          = "Memory"
53 +
machine         = "Machine"
54 +
local_ip        = "IP"
55 +
backlight       = "Brightness"
56 +
resolution      = "Resolution"
57 +
cpu_load        = "CPU Load"
58 +
cpu             = "CPU"
59 +
gpu             = "GPU"
60 +
disk_space      = "Disk Space"
nushell/black-metal-bathory.nu → nushell/darkmatter.nu +0 −0
nushell/config.nu +1 −0
928 928
alias nf = neofetch
929 929
alias fl = fastfetch -c ~/.config/fastfetch/presets/examples/8.jsonc
930 930
alias ff = fastfetch -c ~/.config/fastfetch/presets/examples/20.jsonc
931 +
alias nvimrc = nvim ~/.config/nvim
931 932
alias shitter = ssh itter
932 933
alias tailscale = /Applications/Tailscale.app/Contents/MacOS/Tailscale
933 934
alias ai = aichat
nushell/env.nu +1 −1
110 110
# To load from a custom file you can use:
111 111
# source ~/.config/nushell/env.nu
112 112
113 -
source ~/.config/nushell/black-metal-bathory.nu
113 +
source ~/.config/nushell/darkmatter.nu
114 114
# source ~/.config/nushell/zoxide.nu
115 115
source ~/.config/nushell/git-completions.nu
116 116
source ~/.cargo/env.nu
nvim/lazy-lock.json +4 −4
1 1
{
2 2
  "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
3 -
  "LuaSnip": { "branch": "master", "commit": "eda5be8f0ce9816278671f0b578cdbb8b762c701" },
4 -
  "base16-nvim": { "branch": "master", "commit": "daa30e5a4795f35eaa1ff4040f2c8ba3f7beb84a" },
3 +
  "LuaSnip": { "branch": "master", "commit": "66b5c2707e624dcd2cd3605676c64a2efe47e9d1" },
5 4
  "blink.cmp": { "branch": "main", "commit": "9bcb14b43852a6f2bfd5ac9ef29cb5cf09b1b39b" },
6 5
  "conform.nvim": { "branch": "master", "commit": "973f3cb73887d510321653044791d7937c7ec0fa" },
6 +
  "darkmatter-nvim": { "branch": "main", "commit": "c79d9218d3477b038060c0d592c4b22be22161d4" },
7 7
  "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
8 -
  "gitsigns.nvim": { "branch": "main", "commit": "362fe61f9f19e9bceff178792780df5cce118a7d" },
8 +
  "gitsigns.nvim": { "branch": "main", "commit": "4666d040b60d1dc0e474ccd9a3fd3c4d67b4767c" },
9 9
  "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
10 10
  "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" },
11 11
  "lualine.nvim": { "branch": "master", "commit": "a94fc68960665e54408fe37dcf573193c4ce82c9" },
14 14
  "nvim-surround": { "branch": "main", "commit": "8dd9150ca7eae5683660ea20cec86edcd5ca4046" },
15 15
  "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
16 16
  "nvim-treesitter-textobjects": { "branch": "master", "commit": "89ebe73cd2836db80a22d9748999ace0241917a5" },
17 -
  "nvim-web-devicons": { "branch": "master", "commit": "19d6211c78169e78bab372b585b6fb17ad974e82" },
17 +
  "nvim-web-devicons": { "branch": "master", "commit": "a1366758b3a232036dc97be8ca41184aa3f50506" },
18 18
  "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
19 19
  "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" },
20 20
  "vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" },
nvim/lua/plugins/colorschemes.lua +2 −2
1 1
return {
2 -
	"stevedylandev/base16-nvim",
2 +
	"stevedylandev/darkmatter-nvim",
3 3
	lazy = false,
4 4
	priority = 1000,
5 5
	config = function()
6 -
		vim.cmd.colorscheme "base16-black-metal-bathory"
6 +
		vim.cmd.colorscheme "darkmatter"
7 7
	end,
8 8
}
opencode/opencode.json +2 −3
1 1
{
2 -
  "$schema": "https://opencode.ai/config.json",
3 -
  "theme": "black-metal-black-metal-bathory",
4 -
    "model": "anthropic/claude-sonnet-4-20250514",
2 +
	"$schema": "https://opencode.ai/config.json",
3 +
	"model": "anthropic/claude-sonnet-4-20250514"
5 4
}
zed/settings.json +3 −13
20 20
	"icon_theme": "Zed (Default)",
21 21
	"ui_font_family": "Berkeley Mono",
22 22
	"language_models": {
23 -
		"anthropic": {
24 -
			"version": "1"
25 -
		},
23 +
		"anthropic": {},
26 24
		"ollama": {
27 25
			"api_url": "http://localhost:11434",
28 26
			"available_models": [
94 92
			]
95 93
		}
96 94
	},
97 -
	"show_copilot_suggestions": false,
95 +
98 96
	"theme": "Darkmatter",
99 97
	"buffer_font_size": 13.0,
100 98
	"buffer_font_family": "Berkeley Mono",
106 104
	},
107 105
	"vertical_scroll_margin": 0,
108 106
	"vim": {
109 -
		"use_system_clipboard": "always",
110 -
		"use_multiline_find": true
107 +
		"use_system_clipboard": "always"
111 108
	},
112 109
	"tab_bar": {
113 110
		"show": false
133 130
		"font_family": "BerkeleyMono Nerd Font",
134 131
		"font_size": 14,
135 132
		"line_height": "standard",
136 -
		"toolbar": {
137 -
			"title": true
138 -
		},
139 133
		"working_directory": "current_project_directory",
140 134
		"button": false
141 135
	},
161 155
			"provider": "anthropic",
162 156
			"model": "claude-sonnet-4-latest"
163 157
		},
164 -
		"version": "2",
165 158
		"button": false,
166 159
		"default_view": "text_thread"
167 160
	},
171 164
	"languages": {
172 165
		"TypeScript": {
173 166
			"prettier": { "allowed": false }
174 -
		},
175 -
		"Solidity": {
176 -
			"formatter": "language_server"
177 167
		}
178 168
	},
179 169
	"formatter": {