Commit 6f01e88f0c1a18633c86fcafb7ff2785d398730f | config

author	Natalie Marks <nmarks413@gmail.com> 2025-07-22 16:20:01-07:00
committer	Natalie Marks <nmarks413@gmail.com> 2025-07-22 16:20:01-07:00
log	6f01e88f0c1a18633c86fcafb7ff2785d398730f
tree	ab1e15f686a81d82a2b8170e4238c1d48edfa912
parent	d7d5390a94dbc250d173bf75c1f38eebed056520
parent	71b0ce756a8d96ba765e7fbb776f70ae03d5690a
signature	Commit is signed but in an unrecognized format.

4 files changed, 47 insertions(+), 24 deletions(-)

modules/neovim/default.nix+7-21

...	...	@@ -5,6 +5,7 @@
5	5	...
6	6	}:
7	7	{
	8	imports = [ ./options.nix ];
8	9	# based on default options from upstream:
9	10	# https://github.com/NotAShelf/nvf/blob/main/configuration.nix
10	11	#
...	...	@@ -18,24 +19,6 @@
18	19	enable = true;
19	20	};
20	21
21		undoFile.enable = true;
22
23		options = {
24		tabstop = 2;
25		softtabstop = 2;
26		shiftwidth = 2;
27		swapfile = false;
28		showmode = false;
29		foldlevel = 99;
30		foldcolumn = "1";
31		foldlevelstart = 99;
32		foldenable = true;
33		foldmethod = "expr";
34		#Default to treesitter folding
35		foldexpr = "v:lua.vim.treesitter.foldexpr()";
36		};
37
38
39	22	visuals = {
40	23	# notification system
41	24	# https://github.com/j-hui/fidget.nvim
...	...	@@ -110,7 +93,6 @@
110	93	css.enable = true;
111	94	html.enable = true;
112	95	markdown.enable = true;
113		nix.enable = true;
114	96	python.enable = true;
115	97	rust.crates.enable = true;
116	98	rust.enable = true;
...	...	@@ -119,8 +101,12 @@
119	101	lua.enable = true;
120	102	# sort-lines: off
121	103
122		ts.format.enable = true; # deno fmt is enabled elsewhere
123		nix.format.type = "nixfmt"; # looks so much nicer
	104	ts.format.enable = false; # deno fmt is enabled elsewhere
	105	nix = {
	106	enable = true;
	107	format.type = "nixfmt"; # looks so much nicer
	108	lsp.options.autoArchive = true;
	109	};
124	110	};
125	111	formatter.conform-nvim = {
126	112	enable = true;

modules/neovim/options.nix created+26

...	...	@@ -0,0 +1,26 @@
	1	{ ... }:
	2	{
	3	config.vim.options = {
	4	# Indentation
	5	tabstop = 2;
	6	softtabstop = 2;
	7	shiftwidth = 2;
	8	showmode = false;
	9
	10	# Default to treesitter folding
	11	foldenable = true;
	12	foldmethod = "expr";
	13	foldexpr = "v:lua.vim.treesitter.foldexpr()";
	14	foldlevel = 99;
	15	foldcolumn = "1";
	16	foldlevelstart = 99;
	17
	18	# Case-insensitive find-in-file
	19	ignorecase = true;
	20	smartcase = true;
	21
	22	# Enable swapfile, but not in the same location as the source files.
	23	undofile = true;
	24	swapfile = true;
	25	};
	26	}

users/chloe/home.nix+2-1

...	...	@@ -19,6 +19,7 @@ in
19	19	];
20	20	# packages to install for desktop environments (non-server)
21	21	desktop = [
	22	git-town
22	23	];
23	24	# packages to install on all servers
24	25	server = [ ];
...	...	@@ -46,7 +47,7 @@ in
46	47	shader = "cursor-smear-black.glsl";
47	48	package = null;
48	49	settings = {
49		theme = "catppuccin-latte";
	50	theme = "light:catppuccin-latte,dark:catppuccin-macchiato";
50	51	font-family = "AT Name Mono";
51	52	adjust-cursor-thickness = 1;
52	53	minimum-contrast = 1.1;

users/chloe/paperback/home.nix+12-2

...	...	@@ -2,8 +2,16 @@
2	2	{
3	3	# these programs are not globally installed to reduce distractions.
4	4	# most of these are needed for my work environment.
5		programs.bun.enable = true;
6		programs.zed-editor.enable = true;
	5	programs = {
	6	bun.enable = true;
	7	zed-editor.enable = true;
	8	zsh.profileExtra = ''
	9	_bun() {
	10	local context state line
	11	_arguments -C '*:file:_files'
	12	}
	13	'';
	14	};
7	15	home.packages = with pkgs; [
8	16	doppler
9	17	nodejs_22
...	...	@@ -14,5 +22,7 @@
14	22	yt-dlp
15	23	spotdl
16	24	zig
	25	ssm-session-manager-plugin
	26	awscli
17	27	];
18	28	}