Commit b0b81115da638eea16b4747229706cde7840b3de | config

flake.lock+32-53

 @@ -15,11 +15,11 @@
         "sf-pro": "sf-pro"
       },
       "locked": {
-        "lastModified": 1748299691,
+        "lastModified": 1752383772,
-        "narHash": "sha256-HMlx5HzeOOhpewq3y9UaSMP9AkhEo+AFJHZIWLQvJGw=",
+        "narHash": "sha256-I5Y0gUJS85lGEuuKr+tKSRUpJWeKavE+WmiAHRcyBaU=",
         "owner": "Lyndeno",
         "repo": "apple-fonts.nix",
-        "rev": "ec51ae2e8ba89adbb5188c40aa262a7418c48b00",
+        "rev": "875c694d7f0ec2020d7511264907a1f0e3262931",
         "type": "github"
       },
       "original": {
 @@ -89,11 +89,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1749398372,
+        "lastModified": 1753121425,
-        "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=",
+        "narHash": "sha256-TVcTNvOeWWk1DXljFxVRp+E0tzG1LhrVjOGGoMHuXio=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569",
+        "rev": "644e0fc48951a860279da645ba77fe4a6e814c5e",
         "type": "github"
       },
       "original": {
 @@ -257,11 +257,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1752093218,
+        "lastModified": 1753943136,
-        "narHash": "sha256-+3rXu8ewcNDi65/2mKkdSGrivQs5zEZVp5aYszXC0d0=",
+        "narHash": "sha256-eiEE5SabVcIlGSTRcRyBjmJMaYAV95SJnjy8YSsVeW4=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "206ed3c71418b52e176f16f58805c96e84555320",
+        "rev": "bd82507edd860c453471c46957cbbe3c9fd01b5c",
         "type": "github"
       },
       "original": {
 @@ -306,11 +306,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1752099881,
+        "lastModified": 1753293216,
-        "narHash": "sha256-mn6f4ci5C2jkyxgmBHQ4dI9V0/20DlyS6EbQz4w7znc=",
+        "narHash": "sha256-4hAm9PYNHAsR3MxH8MhSZt7mTiR8MlhyQilLJEPdaZs=",
         "owner": "moonlight-mod",
         "repo": "moonlight",
-        "rev": "dbef0c38e1c0066de5ec35a4d4219026b1bd7010",
+        "rev": "297a1b57c14ff18890382b2fe89f493ba349a730",
         "type": "github"
       },
       "original": {
 @@ -319,26 +319,6 @@
         "type": "github"
       }
     },
-    "nh": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1751375534,
-        "narHash": "sha256-9z1W64dDVtVxqgPzUbjIQqRfygg1hdivUOZ6d/H+yFg=",
-        "owner": "viperML",
-        "repo": "nh",
-        "rev": "d0abb8eebe32f79ce4659e68dd777cf497a5d3d2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "viperML",
-        "repo": "nh",
-        "type": "github"
-      }
-    },
     "nix-index-database": {
       "inputs": {
         "nixpkgs": [
 @@ -346,11 +326,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1751774635,
+        "lastModified": 1753589988,
-        "narHash": "sha256-DuOznGdgMxeSlPpUu6Wkq0ZD5e2Cfv9XRZeZlHWMd1s=",
+        "narHash": "sha256-y1JlcMB2dKFkrr6g+Ucmj8L//IY09BtSKTH/A7OU7mU=",
         "owner": "nix-community",
         "repo": "nix-index-database",
-        "rev": "85686025ba6d18df31cc651a91d5adef63378978",
+        "rev": "f0736b09c43028fd726fb70c3eb3d1f0795454cf",
         "type": "github"
       },
       "original": {
 @@ -397,11 +377,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1751984180,
+        "lastModified": 1753694789,
-        "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=",
+        "narHash": "sha256-cKgvtz6fKuK1Xr5LQW/zOUiAC0oSQoA9nOISB0pJZqM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0",
+        "rev": "dc9637876d0dcc8c9e5e22986b857632effeb727",
         "type": "github"
       },
       "original": {
 @@ -453,11 +433,11 @@
         "systems": "systems_3"
       },
       "locked": {
-        "lastModified": 1753085278,
+        "lastModified": 1754043154,
-        "narHash": "sha256-jOGYaMh4KBhzTqer3G66ki17CL7e822PExkcgWiQoWE=",
+        "narHash": "sha256-Q47BVxwocPZ1GEDs6gKGH00eso74i0gTEPNuF8Kj0T8=",
         "owner": "notashelf",
         "repo": "nvf",
-        "rev": "08991be77a9f641facbddeca619388727661427d",
+        "rev": "69659e078b6531698255deda280c9407b34e29ea",
         "type": "github"
       },
       "original": {
 @@ -485,7 +465,6 @@
         "darwin": "darwin",
         "home-manager": "home-manager",
         "moonlight": "moonlight",
-        "nh": "nh",
         "nix-index-database": "nix-index-database",
         "nix-options-search": "nix-options-search",
         "nixpkgs": "nixpkgs_2",
 @@ -503,11 +482,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1752028888,
+        "lastModified": 1753930086,
-        "narHash": "sha256-LRj3/PUpII6taWOrX1w/OeI6f1ncND02PP/kEHvPCqU=",
+        "narHash": "sha256-Os6Ta5zamfAllmQNlvkbGZLHn06zJy3hVXRk+Dy2yMo=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "a0f1c656e053463b47639234b151a05e4441bb19",
+        "rev": "17b672c10c1798696a516cb879edbc2ebd0f58a4",
         "type": "github"
       },
       "original": {
 @@ -543,7 +522,7 @@
     "sf-compact": {
       "flake": false,
       "locked": {
-        "narHash": "sha256-J72Lyt2wy83E46wN8w6/Rih9kilM9wEjtY6KnbF0DsA=",
+        "narHash": "sha256-VMCf2Mhmx/qhLRQxlTAsQWxtonS27kPW+oTYBBRWHMg=",
         "type": "file",
         "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Compact.dmg"
       },
 @@ -591,7 +570,7 @@
     "sf-pro": {
       "flake": false,
       "locked": {
-        "narHash": "sha256-Q/pOQ4MGhW/ZtLka+UUQcwSoZFDWW34XvutxL4GvzUY=",
+        "narHash": "sha256-RX6X2ltVE88Hp1g9tpSywMT3UfdLpRxgw92KRpiAues=",
         "type": "file",
         "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Pro.dmg"
       },
 @@ -697,11 +676,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1751688498,
+        "lastModified": 1753676490,
-        "narHash": "sha256-6kYe6ozYDvsHAxV1zbSxg0oRWF4TzTfOUUJsR6MJlYY=",
+        "narHash": "sha256-XeifEftxYGP/gzp6O1yO1S1W+MEx4Xvrgeu84ryRPNQ=",
         "owner": "youwen5",
         "repo": "zen-browser-flake",
-        "rev": "b5d422dc2b28eb77a21fbdf60aca9a6e63d5a1ab",
+        "rev": "77024f4557204bb4d526893d42db2e6f50727fab",
         "type": "github"
       },
       "original": {
 @@ -717,11 +696,11 @@
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1752063248,
+        "lastModified": 1753963984,
-        "narHash": "sha256-albe9Q066T4IesTRfaNpEcNQ09ABwU6esFUDyfb472U=",
+        "narHash": "sha256-JPiCLZHuNk11XYYCqoLoKYIgdUu2WpNccTzl4ljycTQ=",
         "owner": "mitchellh",
         "repo": "zig-overlay",
-        "rev": "6f9a3c160daca2a701a638a7ea7b0e675c1a1848",
+        "rev": "45772b76cdb103bd300abac4a85a34518dee65a0",
         "type": "github"
       },
       "original": {

flake.nix-4

...	@@ -28,8 +28,6 @@	...	@@ -28,8 +28,6 @@
28	url = "github:youwen5/zen-browser-flake";	28	url = "github:youwen5/zen-browser-flake";
29	inputs.nixpkgs.follows = "nixpkgs";	29	inputs.nixpkgs.follows = "nixpkgs";
30	};	30	};
31	nh.url = "github:viperML/nh";
32	nh.inputs.nixpkgs.follows = "nixpkgs";
33		31
34	nix-options-search.url = "github:madsbv/nix-options-search";	32	nix-options-search.url = "github:madsbv/nix-options-search";
35		33
...	@@ -49,8 +47,6 @@	...	@@ -49,8 +47,6 @@
49	overlays = [	47	overlays = [
50	inputs.zig.overlays.default	48	inputs.zig.overlays.default
51	inputs.rust-overlay.overlays.default	49	inputs.rust-overlay.overlays.default
52	inputs.nh.overlays.default
53	inputs.moonlight.overlays.default
54		50
55	# https://github.com/LnL7/nix-darwin/issues/1041	51	# https://github.com/LnL7/nix-darwin/issues/1041
56	(_: prev: {	52	(_: prev: {

modules/home/default.nix+69-66

...	@@ -23,82 +23,85 @@ in	...	@@ -23,82 +23,85 @@ in
23	description = "set the ghostty shader, relative to 'files/ghostty'";	23	description = "set the ghostty shader, relative to 'files/ghostty'";
24	};	24	};
25	};	25	};
26	config.programs = {	26	config = {
27	home-manager.enable = true;	27	home.shell = {
28	nix-index.enable = true;	28	enableShellIntegration = true;
29
30	direnv = {
31	enableZshIntegration = true;
32	nix-direnv.enable = config.programs.direnv.enable;
33	};	29	};
		30	programs = {
		31	home-manager.enable = true;
		32	nix-index.enable = true;
34		33
35	git = {	34	direnv = {
36	enable = true;	35	nix-direnv.enable = config.programs.direnv.enable;
37	userName = lib.mkDefault user.name;	36	};
38	userEmail = lib.mkDefault user.email;
39	ignores = [
40	(lib.mkIf host.darwin ".DS_Store") # When using Finder
41	(lib.mkIf host.darwin "._*") # When using non-APFS drives
42	# ViM and Neovim
43	".*.swp"
44	".nvimlog"
45	];
46	};
47		37
48	atuin = {	38	git = {
49	enableBashIntegration = true;	39	enable = true;
50	enableFishIntegration = true;	40	userName = lib.mkDefault user.name;
51	daemon.enable = cfg.atuin.enable;	41	userEmail = lib.mkDefault user.email;
52	};	42	ignores = [
53	bat = {	43	(lib.mkIf host.darwin ".DS_Store") # When using Finder
54	extraPackages = with pkgs.bat-extras; [	44	(lib.mkIf host.darwin "._*") # When using non-APFS drives
55	batdiff	45	# ViM and Neovim
56	batman	46	".*.swp"
57	batgrep	47	".nvimlog"
58	batwatch	48	];
59	batpipe	49	};
60	prettybat	50
61	];	51	atuin = {
62	};	52	daemon.enable = cfg.atuin.enable;
63	hyfetch = {	53	};
64	settings = {	54
65	backend = "fastfetch";	55	bat = {
66	preset = user.sexuality;	56	extraPackages = with pkgs.bat-extras; [
67	mode = "rgb";	57	batdiff
68	light_dark = "dark";	58	batman
69	lightness = {	59	batgrep
70	};	60	batwatch
71	color_align = {	61	batpipe
72	mode = "horizontal";	62	prettybat
		63	];
		64	};
		65	hyfetch = {
		66	settings = {
		67	backend = "fastfetch";
		68	preset = user.sexuality;
		69	mode = "rgb";
		70	light_dark = "dark";
		71	lightness = {
		72	};
		73	color_align = {
		74	mode = "horizontal";
		75	};
73	};	76	};
74	};	77	};
75	};	78	fastfetch.enable = cfg.hyfetch.enable;
76	fastfetch.enable = cfg.hyfetch.enable;
77		79
78	fish = {	80	fish = {
79	plugins = [	81	plugins = [
80	{	82	{
81	name = "tide";	83	name = "tide";
82	inherit (pkgs.fishPlugins.tide) src;	84	inherit (pkgs.fishPlugins.tide) src;
		85	}
		86	{
		87	name = "!!";
		88	inherit (pkgs.fishPlugins.bang-bang) src;
		89	}
		90	];
		91	shellAliases = {
83	}	92	}
84	{
85	name = "!!";
86	inherit (pkgs.fishPlugins.bang-bang) src;
87	}
88	];
89	shellAliases =
90	{ }
91	// lib.optionalAttrs (!host.darwin) {	93	// lib.optionalAttrs (!host.darwin) {
92	reboot-windows = "sudo efibootmgr --bootnext 0000; sudo reboot -h now";	94	reboot-windows = "sudo efibootmgr --bootnext 0000; sudo reboot -h now";
93	};	95	};
94	shellInit = ''	96	shellInit = ''
95	batman --export-env \| source	97	batman --export-env \| source
96	test -r '/Users/${user.username}/.opam/opam-init/init.fish' && source '/Users/${user.username}/.opam/opam-init/init.fish' > /dev/null 2> /dev/null; or true	98	test -r '/Users/${user.username}/.opam/opam-init/init.fish' && source '/Users/${user.username}/.opam/opam-init/init.fish' > /dev/null 2> /dev/null; or true
97	'';	99	'';
98	};	100	};
99		101
100	ghostty.settings.custom-shader = lib.mkIf (	102	ghostty.settings.custom-shader = lib.mkIf (
101	cfg.ghostty.shader != null	103	cfg.ghostty.shader != null
102	) "${../../files/ghostty}/${cfg.ghostty.shader}";	104	) "${../../files/ghostty}/${cfg.ghostty.shader}";
		105	};
103	};	106	};
104	}	107	}

modules/neovim/default.nix+1

...	@@ -69,6 +69,7 @@	...	@@ -69,6 +69,7 @@
69	signatureHelp = null;	69	signatureHelp = null;
70	toggleFormatOnSave = null;	70	toggleFormatOnSave = null;
71	};	71	};
		72	servers.nixd.init_options.autoArchive = true;
72	};	73	};
73	treesitter = {	74	treesitter = {
74	enable = true;	75	enable = true;

modules/nixos/ld.nix+9-1

 @@ -63,7 +63,7 @@
     nss
     openssl
     pango
-    # pipewire
+    pipewire
     stdenv.cc.cc
     systemd
     vulkan-loader
 @@ -82,5 +82,13 @@
     xorg.libxkbfile
     xorg.libxshmfence
     zlib
+    libxslt
+    # Stolen from https://github.com/Mic92/dotfiles/blob/57cf7fdf8705a5362fc19114b8395cdbf7668e94/nixos/modules/nix-ld.nix#L6-L58
+    flite
+    gtk2
+    gtk2-x11
+    libsecret
+    xorg.libXinerama
   ];
 }

users/chloe/vim.nix+30

...	@@ -16,6 +16,36 @@ _: {	...	@@ -16,6 +16,36 @@ _: {
16	};	16	};
17	};	17	};
18	};	18	};
		19	autocomplete.blink-cmp = {
		20	enable = true;
		21	mappings = {
		22	close = null;
		23	complete = null;
		24	confirm = null;
		25	next = null;
		26	previous = null;
		27	scrollDocsDown = null;
		28	scrollDocsUp = null;
		29	};
		30
		31	setupOpts = {
		32	keymap = {
		33	preset = "super-tab";
		34	};
		35	completion = {
		36	ghost_text.enabled = false;
		37	list.selection.preselect = true;
		38	trigger = {
		39	show_in_snippet = true;
		40	};
		41	accept.auto_brackets.enabled = true;
		42	};
		43	signature = {
		44	enabled = true;
		45	};
		46	};
		47	};
		48
19	keymaps =	49	keymaps =
20	let	50	let
21	mkKeymap = mode: key: action: desc: {	51	mkKeymap = mode: key: action: desc: {

users/natalie/home.nix+1

...	@@ -12,6 +12,7 @@	...	@@ -12,6 +12,7 @@
12	direnv.enable = true;	12	direnv.enable = true;
13	fish.enable = true;	13	fish.enable = true;
14	man.generateCaches = false;	14	man.generateCaches = false;
		15	lsd.enable = true;
15	# sort-lines:end	16	# sort-lines:end
16	};	17	};
17		18

users/natalie/laptop/configuration.nix+1

...	@@ -28,6 +28,7 @@	...	@@ -28,6 +28,7 @@
28	fi	28	fi
29	'';	29	'';
30	};	30	};
		31	programs.fish.enable = true;
31		32
32	# Use homebrew to install casks	33	# Use homebrew to install casks
33	homebrew = {	34	homebrew = {

users/natalie/packages.nix+2-7

...	@@ -26,7 +26,6 @@ with pkgs;	...	@@ -26,7 +26,6 @@ with pkgs;
26	qemu	26	qemu
27	podman	27	podman
28	docker	28	docker
29	devenv
30		29
31	#productivity	30	#productivity
32	glance	31	glance
...	@@ -59,10 +58,7 @@ with pkgs;	...	@@ -59,10 +58,7 @@ with pkgs;
59	imagemagick	58	imagemagick
60		59
61	#chatting apps	60	#chatting apps
62	discord	61	(discord.override { withMoonlight = true; })
63	# (discord.override {
64	# withMoonlight = true;
65	# })
66	vesktop	62	vesktop
67		63
68	#media	64	#media
...	@@ -90,9 +86,8 @@ with pkgs;	...	@@ -90,9 +86,8 @@ with pkgs;
90	#programming languages	86	#programming languages
91	deno	87	deno
92	ruby	88	ruby
93	nodePackages.npm	89	# nodePackages.npm
94	go	90	go
95	coq
96	elan	91	elan
97		92
98	#browsers	93	#browsers

users/natalie/vim/coq.nix deleted-16

...	@@ -1,16 +0,0 @@
1	{ pkgs, ... }:
2	{
3
4	vim = {
5	# extraPackages = with pkgs; [
6	# coq_8_20
7	# coqPackages_8_20.stdlib
8	# ];
9	extraPlugins.Coqtail = {
10	# enabled = true;
11	package = pkgs.vimPlugins.Coqtail;
12	# lazy = true;
13	# ft = "coq";
14	};
15	};
16	}

users/natalie/vim/default.nix-1

...	@@ -5,7 +5,6 @@	...	@@ -5,7 +5,6 @@
5	./languages.nix	5	./languages.nix
6	./latex.nix	6	./latex.nix
7	./lean.nix	7	./lean.nix
8	./coq.nix
9	./visuals.nix	8	./visuals.nix
10	./mini.nix	9	./mini.nix
11	];	10	];

users/natalie/vim/languages.nix+9-40

...	@@ -9,54 +9,23 @@	...	@@ -9,54 +9,23 @@
9	vim = {	9	vim = {
10	extraPackages = with pkgs; [	10	extraPackages = with pkgs; [
11	python312Packages.pylatexenc	11	python312Packages.pylatexenc
12	nixd
13	];	12	];
14	lsp = {
15	servers = {
16	nil = {
17	settings.nil.nix.flake = {
18
19	autoArchive = true;
20	autoEvalInputs = true;
21
22	};
23	};
24	nixd = {
25	settings.nixd = {
26	nixpkgs.expr = ''import "${flake.inputs.nixpkgs}" { }'';
27
28	options =
29	{
30	home-manager = {
31	expr = ''(let pkgs = import "${flake.inputs.nixpkgs}" { }; lib = import "${flake.inputs.home-manager}/modules/lib/stdlib-extended.nix" pkgs.lib; in (lib.evalModules { modules = (import "${flake.inputs.home-manager}/modules/modules.nix") { inherit lib pkgs;check = false;}; })).options'';
32	# (builtins.getFlake "${flakePath}").${darwin}Configurations.${hostname}.options.home-manager.users.type.getSubOptions [ ]'';
33	};
34	}
35	// pkgs.lib.optionalAttrs host.darwin {
36	nix-darwin = {
37	expr = ''(let pkgs = import "${flake.inputs.nixpkgs}" { }; in (pkgs.lib.evalModules { modules = (import "${flake.inputs.darwin}/modules/module-list.nix"); check = false;})).options'';
38	# (builtins.getFlake "${flakePath}").darwinConfigurations.${hostname}.options'';
39	};
40	}
41	// pkgs.lib.optionalAttrs host.linux {
42	nixos = {
43	expr = ''(let pkgs = import "${flake.inputs.nixpkgs}" { }; in (pkgs.lib.evalModules { modules = (import "${flake.inputs.nixpkgs}/nixos/modules/module-list.nix"); check = false;})).options'';
44	# (builtins.getFlake "${flakePath}").nixosConfigurations.${hostname}.options'';
45	};
46	};
47	};
48	};
49	};
50	};
51	languages = {	13	languages = {
52	python.format.type = "ruff";	14	python = {
		15	format.type = "ruff";
		16	};
53	markdown = {	17	markdown = {
54	enable = true;	18	enable = true;
55	extensions.render-markdown-nvim = {	19	extensions.render-markdown-nvim = {
56	enable = true;	20	enable = true;
57	};	21	};
58	};	22	};
59	nix.format.enable = true;	23	nix = {
		24	lsp.servers = [
		25	"nil"
		26	"nixd"
		27	];
		28	};
60	};	29	};
61		30
62	formatter.conform-nvim = {	31	formatter.conform-nvim = {

author	Natalie Marks <nmarks413@gmail.com> 2025-08-02 14:38:29-07:00
committer	Natalie Marks <nmarks413@gmail.com> 2025-08-02 14:38:29-07:00
log	b0b81115da638eea16b4747229706cde7840b3de
tree	65bacb661052ed8c488386fafe2766947f564713
parent	866298a4f1e129b290d2fcfbdb5f53c7fc67af27
parent	992f77e656d298463aedea1290604b9a72b2a488
signature	Commit is signed but in an unrecognized format.

Merge branch 'main' of paperclover.dev:nix/config