Commit 3449484e73eaf94679f490f8c96a7b187997462d | config

flake.lock+113-71

 @@ -197,10 +197,7 @@
     },
     "flake-parts": {
       "inputs": {
-        "nixpkgs-lib": [
+        "nixpkgs-lib": "nixpkgs-lib"
-          "nixvim",
-          "nixpkgs"
-        ]
       },
       "locked": {
         "lastModified": 1743550720,
 @@ -315,7 +312,7 @@
     },
     "flake-utils_5": {
       "inputs": {
-        "systems": "systems_5"
+        "systems": "systems_6"
       },
       "locked": {
         "lastModified": 1705309234,
 @@ -333,7 +330,7 @@
     },
     "flake-utils_6": {
       "inputs": {
-        "systems": "systems_6"
+        "systems": "systems_7"
       },
       "locked": {
         "lastModified": 1710146030,
 @@ -351,7 +348,7 @@
     },
     "flake-utils_7": {
       "inputs": {
-        "systems": "systems_7"
+        "systems": "systems_8"
       },
       "locked": {
         "lastModified": 1705309234,
 @@ -527,34 +524,6 @@
         "type": "github"
       }
     },
-    "ixx": {
-      "inputs": {
-        "flake-utils": [
-          "nixvim",
-          "nuschtosSearch",
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "nixvim",
-          "nuschtosSearch",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1737371634,
-        "narHash": "sha256-fTVAWzT1UMm1lT+YxHuVPtH+DATrhYfea3B0MxG/cGw=",
-        "owner": "NuschtOS",
-        "repo": "ixx",
-        "rev": "a1176e2a10ce745ff8f63e4af124ece8fe0b1648",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NuschtOS",
-        "ref": "v0.0.7",
-        "repo": "ixx",
-        "type": "github"
-      }
-    },
     "langref": {
       "flake": false,
       "locked": {
 @@ -567,6 +536,21 @@
         "url": "https://raw.githubusercontent.com/ziglang/zig/0fb2015fd3422fc1df364995f9782dfe7255eccd/doc/langref.html.in"
       }
     },
+    "mnw": {
+      "locked": {
+        "lastModified": 1746338991,
+        "narHash": "sha256-GbyoHjf14LOxZQc+0NFblI4xf/uwGrYo3W8lwE4HcwI=",
+        "owner": "Gerg-L",
+        "repo": "mnw",
+        "rev": "c65407ee9387ef75985dad3e30f58c822c766ec1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Gerg-L",
+        "repo": "mnw",
+        "type": "github"
+      }
+    },
     "moonlight": {
       "inputs": {
         "flake-utils": "flake-utils",
 @@ -608,6 +592,32 @@
         "type": "github"
       }
     },
+    "nil": {
+      "inputs": {
+        "flake-utils": [
+          "nvf",
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "nvf",
+          "nixpkgs"
+        ],
+        "rust-overlay": "rust-overlay_2"
+      },
+      "locked": {
+        "lastModified": 1741118843,
+        "narHash": "sha256-ggXU3RHv6NgWw+vc+HO4/9n0GPufhTIUjVuLci8Za8c=",
+        "owner": "oxalica",
+        "repo": "nil",
+        "rev": "577d160da311cc7f5042038456a0713e9863d09e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "nil",
+        "type": "github"
+      }
+    },
     "nix-index-database": {
       "inputs": {
         "nixpkgs": [
 @@ -687,6 +697,21 @@
         "type": "github"
       }
     },
+    "nixpkgs-lib": {
+      "locked": {
+        "lastModified": 1743296961,
+        "narHash": "sha256-b1EdN3cULCqtorQ4QeWgLMrd5ZGOjLSLemfa00heasc=",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "rev": "e4822aea2a6d1cdd36653c134cacfd64c97ff4fa",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "type": "github"
+      }
+    },
     "nixpkgs-stable": {
       "locked": {
         "lastModified": 1746557022,
 @@ -765,28 +790,6 @@
         "type": "github"
       }
     },
-    "nixvim": {
-      "inputs": {
-        "flake-parts": "flake-parts",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "nuschtosSearch": "nuschtosSearch"
-      },
-      "locked": {
-        "lastModified": 1746625905,
-        "narHash": "sha256-El/fOZAhTDJRsPN5dro9F3cNHyclk00Acjl1nVQAEDI=",
-        "owner": "nix-community",
-        "repo": "nixvim",
-        "rev": "5c52e8f9e438b6850f2c7a6e4bf3f967a3a699fd",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nixvim",
-        "type": "github"
-      }
-    },
     "nur": {
       "inputs": {
         "flake-parts": "flake-parts_2",
 @@ -810,26 +813,28 @@
         "type": "github"
       }
     },
-    "nuschtosSearch": {
+    "nvf": {
       "inputs": {
+        "flake-parts": "flake-parts",
         "flake-utils": "flake-utils_3",
-        "ixx": "ixx",
+        "mnw": "mnw",
+        "nil": "nil",
         "nixpkgs": [
-          "nixvim",
           "nixpkgs"
-        ]
+        ],
+        "systems": "systems_4"
       },
       "locked": {
-        "lastModified": 1745046075,
+        "lastModified": 1746940940,
-        "narHash": "sha256-8v4y6k16Ra/fiecb4DxhsoOGtzLKgKlS+9/XJ9z0T2I=",
+        "narHash": "sha256-ASB3QVEoFK5//280uedYdt8jyDLhFa9zgj8qfc0S7Sk=",
-        "owner": "NuschtOS",
+        "owner": "notashelf",
-        "repo": "search",
+        "repo": "nvf",
-        "rev": "066afe8643274470f4a294442aadd988356a478f",
+        "rev": "815ed49d3693346122ef61da6d7443cd3cc21752",
         "type": "github"
       },
       "original": {
-        "owner": "NuschtOS",
+        "owner": "notashelf",
-        "repo": "search",
+        "repo": "nvf",
         "type": "github"
       }
     },
 @@ -857,8 +862,8 @@
         "nixos-cosmic": "nixos-cosmic",
         "nixpkgs": "nixpkgs_2",
         "nixpkgs-stable": "nixpkgs-stable_2",
-        "nixvim": "nixvim",
+        "nvf": "nvf",
-        "rust-overlay": "rust-overlay_2",
+        "rust-overlay": "rust-overlay_3",
         "stylix": "stylix",
         "zig": "zig",
         "zls": "zls"
 @@ -886,6 +891,28 @@
       }
     },
     "rust-overlay_2": {
+      "inputs": {
+        "nixpkgs": [
+          "nvf",
+          "nil",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1741055476,
+        "narHash": "sha256-52vwEV0oS2lCnx3c/alOFGglujZTLmObit7K8VblnS8=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "aefb7017d710f150970299685e8d8b549d653649",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
+    "rust-overlay_3": {
       "inputs": {
         "nixpkgs": [
           "nixpkgs"
 @@ -1005,7 +1032,7 @@
           "nixpkgs"
         ],
         "nur": "nur",
-        "systems": "systems_4",
+        "systems": "systems_5",
         "tinted-foot": "tinted-foot",
         "tinted-kitty": "tinted-kitty",
         "tinted-schemes": "tinted-schemes",
 @@ -1131,6 +1158,21 @@
         "type": "github"
       }
     },
+    "systems_8": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "tinted-foot": {
       "flake": false,
       "locked": {

flake.nix+136-93

...	@@ -1,5 +1,5 @@	...	@@ -1,5 +1,5 @@
1	{	1	{
2	description = "New Modular flake!";	2	description = "multi device configuration flake";
3	inputs = {	3	inputs = {
4	nixpkgs.url = "nixpkgs/nixos-unstable";	4	nixpkgs.url = "nixpkgs/nixos-unstable";
5	nixpkgs-stable.url = "nixpkgs/nixos-23.11";	5	nixpkgs-stable.url = "nixpkgs/nixos-23.11";
...	@@ -7,112 +7,155 @@	...	@@ -7,112 +7,155 @@
7	home-manager.url = "github:nix-community/home-manager/master";	7	home-manager.url = "github:nix-community/home-manager/master";
8	home-manager.inputs.nixpkgs.follows = "nixpkgs";	8	home-manager.inputs.nixpkgs.follows = "nixpkgs";
9		9
10	rust-overlay = {	10	rust-overlay.url = "github:oxalica/rust-overlay";
11	url = "github:oxalica/rust-overlay";	11	rust-overlay.inputs.nixpkgs.follows = "nixpkgs";
12	inputs.nixpkgs.follows = "nixpkgs";
13	};
14		12
15	apple-fonts = {	13	apple-fonts.url = "github:Lyndeno/apple-fonts.nix";
16	url = "github:Lyndeno/apple-fonts.nix";	14	apple-fonts.inputs.nixpkgs.follows = "nixpkgs";
17	inputs.nixpkgs.follows = "nixpkgs";
18	};
19		15
20	nixvim = {	16	nvf.url = "github:notashelf/nvf";
21	url = "github:nix-community/nixvim";	17	nvf.inputs.nixpkgs.follows = "nixpkgs";
22	inputs.nixpkgs.follows = "nixpkgs";
23	};
24		18
25	darwin = {	19	darwin.url = "github:lnl7/nix-darwin/master";
26	url = "github:lnl7/nix-darwin/master";	20	darwin.inputs.nixpkgs.follows = "nixpkgs";
27	inputs.nixpkgs.follows = "nixpkgs";
28	};
29		21
30	zig.url = "github:mitchellh/zig-overlay";	22	zig.url = "github:mitchellh/zig-overlay";
31	zls.url = "github:zigtools/zls?rev=a26718049a8657d4da04c331aeced1697bc7652b";	23	zls.url = "github:zigtools/zls?rev=a26718049a8657d4da04c331aeced1697bc7652b";
32		24
33	stylix = {	25	stylix.url = "github:danth/stylix";
34	url = "github:danth/stylix";	26	stylix.inputs.nixpkgs.follows = "nixpkgs";
35	inputs.nixpkgs.follows = "nixpkgs";
36	};
37		27
38	moonlight = {	28	moonlight.url = "github:moonlight-mod/moonlight"; # Add `/develop` to the flake URL to use nightly.
39	url = "github:moonlight-mod/moonlight"; # Add `/develop` to the flake URL to use nightly.	29	moonlight.inputs.nixpkgs.follows = "nixpkgs";
40	inputs.nixpkgs.follows = "nixpkgs";
41	};
42	nixos-cosmic = {
43	url = "github:lilyinstarlight/nixos-cosmic";
44	inputs.nixpkgs.follows = "nixpkgs";
45	};
46		30
47	nh = {	31	nixos-cosmic.url = "github:lilyinstarlight/nixos-cosmic";
48	url = "github:viperML/nh";	32	nixos-cosmic.inputs.nixpkgs.follows = "nixpkgs";
49	inputs.nixpkgs.follows = "nixpkgs";	33
50	};	34	nh.url = "github:viperML/nh";
51	nix-options-search = {	35	nh.inputs.nixpkgs.follows = "nixpkgs";
52	url = "github:madsbv/nix-options-search";	36
53	};	37	nix-options-search.url = "github:madsbv/nix-options-search";
54		38
55	nix-index-database.url = "github:nix-community/nix-index-database";	39	nix-index-database.url = "github:nix-community/nix-index-database";
56	nix-index-database.inputs.nixpkgs.follows = "nixpkgs";	40	nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
57	};	41	};
58	outputs = {	42	outputs =
59	nixpkgs,	43	{
60	nixos-cosmic,	44	nixpkgs,
61	nix-index-database,	45	nixos-cosmic,
62	darwin,	46	darwin,
63	...	47	...
64	} @ inputs: let	48	}@inputs:
65	overlays = [	49	let
66	inputs.zig.overlays.default	50	lib = nixpkgs.lib;
67	inputs.rust-overlay.overlays.default	51
68	inputs.nh.overlays.default	52	# TODO: apply these overlays sooner and remove uses of legacyPackages elsewhere.
69	];	53	overlays = [
70		54	inputs.zig.overlays.default
71	mkSystem = import ./lib/mkSystem.nix {	55	inputs.rust-overlay.overlays.default
72	inherit overlays nixpkgs inputs;	56	inputs.nh.overlays.default
73	};	57
74	in rec {	58	# https://github.com/LnL7/nix-darwin/issues/1041
75	# "nix run .#darwin-rebuild"	59	(_: prev: {
76	packages.aarch64-darwin.darwin-rebuild = darwin.packages.aarch64-darwin.darwin-rebuild;	60	karabiner-elements = prev.karabiner-elements.overrideAttrs (old: {
77	# "nix fmt ."	61	version = "14.13.0";
78	formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.alejandra;	62
79	formatter.aarch64-darwin = nixpkgs.legacyPackages.aarch64-darwin.alejandra;	63	src = prev.fetchurl {
80		64	inherit (old.src) url;
81	# natalie's desktop computer	65	hash = "sha256-gmJwoht/Tfm5qMecmq1N6PSAIfWOqsvuHU8VDJY8bLw=";
82	nixosConfigurations.nixos = mkSystem "nixos" {	66	};
83	user = "natalie";	67	});
84	host = "desktop";	68	})
85	system = "x86_64-linux";
86	extraModules = [
87	nixos-cosmic.nixosModules.default
88	];	69	];
89	};
90	# natalie's laptop
91	darwinConfigurations."Natalies-MacBook-Air" = mkSystem "Natalies-MacBook-Air" {
92	user = "natalie";
93	host = "laptop";
94	system = "aarch64-darwin";
95	};
96		70
97	# chloe's mac studio "sandwich"	71	# Users of this flake currently use x86_64 Linux and Apple Silicon
98	darwinConfigurations.sandwich = mkSystem "sandwich" {	72	systems = [
99	user = "chloe";	73	"x86_64-linux"
100	host = "sandwich";	74	"aarch64-darwin"
101	system = "aarch64-darwin";	75	];
102	};	76	forAllSystems =
103	# chloe's macbook air "paperback"	77	f:
104	darwinConfigurations.paperback = mkSystem "paperback" {	78	builtins.listToAttrs (
105	user = "chloe";	79	builtins.map (system: {
106	host = "paperback";	80	name = system;
107	system = "aarch64-darwin";	81	value = f (
108	};	82	inputs
		83	// {
		84	inherit system;
		85	pkgs = nixpkgs.legacyPackages.${system};
		86	}
		87	);
		88	}) systems
		89	);
109		90
110	# generate checks for "nix flake check --all-systems --no-build"	91	mkSystem = import ./lib/mkSystem.nix {
111	checks.aarch64-darwin = builtins.listToAttrs (builtins.map (name: let	92	inherit
112	d = darwinConfigurations.${name}.system;	93	overlays
113	in {	94	nixpkgs
114	name = "darwinConfiguration-" + d.name;	95	inputs
115	value = d;	96	mkNeovim
116	}) (builtins.attrNames darwinConfigurations));	97	;
117	};	98	};
		99	mkNeovim = import ./lib/mkNeovim.nix {
		100	inherit overlays nixpkgs inputs;
		101	};
		102	in
		103	rec {
		104	# "nix fmt"
		105	formatter = forAllSystems (inputs: inputs.pkgs.nixfmt-tree);
		106	packages = forAllSystems (
		107	{ system, ... }:
		108	{
		109	nvim-chloe = mkNeovim "chloe" system;
		110	nvim-natalie = mkNeovim "natalie" system;
		111	}
		112	// lib.optionalAttrs (system == "aarch64-darwin") {
		113	# "nix run .#darwin-rebuild"
		114	darwin-rebuild = darwin.packages.aarch64-darwin.darwin-rebuild;
		115	}
		116	);
		117
		118	# natalie's desktop computer
		119	nixosConfigurations.nixos = mkSystem "nixos" {
		120	user = "natalie";
		121	host = "desktop";
		122	system = "x86_64-linux";
		123	extraModules = [
		124	nixos-cosmic.nixosModules.default
		125	];
		126	};
		127	# natalie's laptop
		128	darwinConfigurations."Natalies-MacBook-Air" = mkSystem "Natalies-MacBook-Air" {
		129	user = "natalie";
		130	host = "laptop";
		131	system = "aarch64-darwin";
		132	};
		133
		134	# chloe's mac studio "sandwich"
		135	darwinConfigurations.sandwich = mkSystem "sandwich" {
		136	user = "chloe";
		137	host = "sandwich";
		138	system = "aarch64-darwin";
		139	};
		140	# chloe's macbook air "paperback"
		141	darwinConfigurations.paperback = mkSystem "paperback" {
		142	user = "chloe";
		143	host = "paperback";
		144	system = "aarch64-darwin";
		145	};
		146
		147	# generate checks for "nix flake check --all-systems --no-build"
		148	checks.aarch64-darwin = builtins.listToAttrs (
		149	builtins.map (
		150	name:
		151	let
		152	d = darwinConfigurations.${name}.system;
		153	in
		154	{
		155	name = "darwinConfiguration-" + d.name;
		156	value = d;
		157	}
		158	) (builtins.attrNames darwinConfigurations)
		159	);
		160	};
118	}	161	}

lib/mkNeovim.nix created+29

...	@@ -0,0 +1,29 @@
1	{
2	nixpkgs,
3	# TODO: apply overlays here
4	overlays,
5	inputs,
6	}:
7	user: system:
8	let
9	darwin = nixpkgs.lib.strings.hasSuffix "-darwin" system;
10
11	host = {
12	inherit darwin;
13	linux = !darwin;
14	};
15
16	userDir = ../users + "/${user}";
17	userConfig = import (userDir + "/user.nix");
18	in
19	(inputs.nvf.lib.neovimConfiguration {
20	pkgs = nixpkgs.legacyPackages.${system};
21	modules = builtins.filter (f: f != null) [
22	(../users + ("/" + user + "/vim.nix"))
23	../modules/neovim
24	];
25	extraSpecialArgs = {
26	inherit host;
27	user = userConfig;
28	};
29	}).neovim

lib/mkSystem.nix+85-105

...	@@ -4,30 +4,21 @@	...	@@ -4,30 +4,21 @@
4	nixpkgs,	4	nixpkgs,
5	overlays,	5	overlays,
6	inputs,	6	inputs,
7	}: name: {	7	mkNeovim,
		8	}:
		9	name:
		10	{
8	user, # ./users/{name}	11	user, # ./users/{name}
9	host, # ./users/{name}/{host} (optional)	12	host, # ./users/{name}/{host} (optional)
10	system, # arch-os	13	system, # arch-os
11	extraModules ? [],	14	extraModules ? [ ],
12	}: let	15	}:
13	inherit (builtins) pathExists;	16	let
14	darwin = nixpkgs.lib.strings.hasSuffix "-darwin" system;	17	darwin = nixpkgs.lib.strings.hasSuffix "-darwin" system;
15	getInputModule = a: b:	18	getInputModule = a: b: inputs.${a}.${if darwin then "darwinModules" else "nixosModules"}.${b};
16	inputs.${
17	a
18	}.${
19	if darwin
20	then "darwinModules"
21	else "nixosModules"
22	}.${
23	b
24	};
25		19
26	# NixOS vs nix-darwin functions	20	# NixOS vs nix-darwin functions
27	systemFunc =	21	systemFunc = if darwin then inputs.darwin.lib.darwinSystem else nixpkgs.lib.nixosSystem;
28	if darwin
29	then inputs.darwin.lib.darwinSystem
30	else nixpkgs.lib.nixosSystem;
31		22
32	userDir = ../users + "/${user}";	23	userDir = ../users + "/${user}";
33	userConfig = import (userDir + "/user.nix");	24	userConfig = import (userDir + "/user.nix");
...	@@ -38,10 +29,7 @@	...	@@ -38,10 +29,7 @@
38	hostHomePath = hostDir + "/home.nix";	29	hostHomePath = hostDir + "/home.nix";
39	userHomePath = userDir + "/home.nix";	30	userHomePath = userDir + "/home.nix";
40		31
41	pathOrNull = a:	32	pathOrNull = a: if builtins.pathExists a then a else null;
42	if pathExists a
43	then a
44	else null;
45		33
46	# Arguments passed to all module files	34	# Arguments passed to all module files
47	args = {	35	args = {
...	@@ -50,100 +38,92 @@	...	@@ -50,100 +38,92 @@
50	# Details about the host machine	38	# Details about the host machine
51	host = {	39	host = {
52	inherit darwin name;	40	inherit darwin name;
		41	linux = !darwin;
53	};	42	};
54	user = ({	43	user =
55	# This acts as formal documentation for what is allowed in user.nix	44	(
56	username, # unix username	45	{
57	name, # your display name	46	# This acts as formal documentation for what is allowed in user.nix
58	email, # for identity in programs such as git	47	username, # unix username
59	dotfilesDir, # location to `../.`	48	name, # your display name
60	timeZone ? "America/Los_Angeles",	49	email, # for identity in programs such as git
61	# Stylix/Theming	50	dotfilesDir, # location to `../.`
62	theme ? null, # theme name for stylix	51	timeZone ? "America/Los_Angeles",
63	sexuality ? null, # pride flag for hyfetch	52	# Stylix/Theming
64	font ? null, # font to use	53	theme ? null, # theme name for stylix
65	term, # preferred $TERM	54	sexuality ? null, # pride flag for hyfetch
66	editor, # preferred $EDITOR	55	font ? null, # font to use
67	browser ? null, # preferred $BROWSER	56	term, # preferred $TERM
68	} @ user:	57	editor, # preferred $EDITOR
69	user)	58	browser ? null, # preferred $BROWSER
70	userConfig;	59	}@user:
		60	user
		61	)
		62	userConfig;
71	};	63	};
72	systemSettings = rec {	64	systemSettings = rec {
73	inherit darwin;	65	inherit darwin;
74	homeDir = "/${	66	homeDir = "/${if darwin then "Users" else "home"}/${userConfig.username}";
75	if darwin
76	then "Users"
77	else "home"
78	}/${userConfig.username}";
79	};	67	};
		68
		69	mainHomeImports = builtins.filter (f: f != null) [
		70	(pathOrNull userHomePath)
		71	(pathOrNull hostHomePath)
		72	{
		73	home.packages = [
		74	(mkNeovim user system)
		75	];
		76	}
		77	];
80	in	78	in
81	systemFunc {	79	systemFunc {
82	inherit system;	80	inherit system;
83		81
84	modules =	82	modules =
85	builtins.filter (f: f != null)	83	builtins.filter (f: f != null) [
86	[	84	# Apply our overlays. Overlays are keyed by system type so we have
87	# Apply our overlays. Overlays are keyed by system type so we have	85	# to go through and apply our system type. We do this first so
88	# to go through and apply our system type. We do this first so	86	# the overlays are available globally.
89	# the overlays are available globally.	87	{ nixpkgs.overlays = overlays; }
90	{nixpkgs.overlays = overlays;}
91		88
92	# Modules shared between nix-darwin and NixOS	89	# Modules shared between nix-darwin and NixOS
93	../modules/shared	90	../modules/shared
94	# Modules for the specific OS	91	# Modules for the specific OS
95	(	92	(if darwin then ../modules/macos else ../modules/nixos)
96	if darwin
97	then ../modules/macos
98	else ../modules/nixos
99	)
100		93
101	# The user-wide configuration.nix	94	# The user-wide configuration.nix
102	(pathOrNull userConfigPath)	95	(pathOrNull userConfigPath)
103	# The host-wide configuration.nix	96	# The host-wide configuration.nix
104	(	97	(pathOrNull hostConfigPath)
105	pathOrNull hostConfigPath
106	)
107		98
108	# Set up nix-index and enable comma for easy one-shot command use	99	# Set up nix-index and enable comma for easy one-shot command use
109	# https://github.com/nix-community/comma	100	# https://github.com/nix-community/comma
110	(getInputModule "nix-index-database" "nix-index")	101	(getInputModule "nix-index-database" "nix-index")
111	{programs.nix-index-database.comma.enable = true;}	102	{ programs.nix-index-database.comma.enable = true; }
112		103
113	# Themes for all programs	104	# Themes for all programs
114	(getInputModule "stylix" "stylix")	105	(getInputModule "stylix" "stylix")
115		106
116	# Home manager	107	# Home manager
117	(getInputModule "home-manager" "home-manager")	108	(getInputModule "home-manager" "home-manager")
118	{	109	{
119	home-manager = {	110	home-manager = {
120	useGlobalPkgs = true;	111	useGlobalPkgs = true;
121	useUserPackages = true;	112	useUserPackages = true;
122	backupFileExtension = "hm-backup";	113	backupFileExtension = "hm-backup";
123	# Arguments passed to all module files	114	# Arguments passed to all module files
124	extraSpecialArgs =	115	extraSpecialArgs = args // {
125	args	116	inherit mainHomeImports;
126	// {
127	mainHomeImports = builtins.filter (f: f != null) [
128	(
129	pathOrNull userHomePath
130	)
131	(
132	pathOrNull hostHomePath
133	)
134	#Can't have conditional import path
135	../modules/macos/tiling/sketchybar-home.nix
136	];
137	};
138	# can't find how to make this an array without the param
139	users.${userConfig.username} = ../modules/home-manager.nix;
140	};	117	};
141	users.users.${userConfig.username}.home = systemSettings.homeDir;	118	# can't find how to make this an array without the param
142	}	119	users.${userConfig.username} = ../modules/home;
		120	};
		121	users.users.${userConfig.username}.home = systemSettings.homeDir;
		122	}
143		123
144	# Arguments passed to all module files	124	# Arguments passed to all module files
145	{config._module.args = args;}	125	{ config._module.args = args; }
146	]	126	]
147	# Add extra modules specified from config	127	# Add extra modules specified from config
148	++ extraModules;	128	++ extraModules;
149	}	129	}

modules/home-manager.nix deleted-82

...	@@ -1,82 +0,0 @@
1	# This contains default configurations for set of programs
2	# and configuration, but does not enable many things on it's own.
3	{
4	pkgs,
5	lib,
6	config,
7	user,
8	host,
9	mainHomeImports,
10	...
11	}: let
12	cfg = config.programs;
13	in {
14	imports = mainHomeImports;
15	programs = {
16	home-manager.enable = true;
17	nix-index.enable = true;
18
19	direnv = {
20	enableZshIntegration = true;
21	nix-direnv.enable = config.programs.direnv.enable;
22	};
23
24	git = {
25	enable = true;
26	userName = lib.mkDefault user.name;
27	userEmail = lib.mkDefault user.email;
28	ignores = [
29	(lib.mkIf host.darwin ".DS_Store") # When using Finder
30	(lib.mkIf host.darwin "._*") # When using non-APFS drives
31	# ViM and Neovim
32	".*.swp"
33	".nvimlog"
34	];
35	};
36
37	atuin = {
38	enableBashIntegration = true;
39	enableFishIntegration = true;
40	daemon.enable = cfg.atuin.enable;
41	};
42	bat = {
43	extraPackages = with pkgs.bat-extras; [batdiff batman batgrep batwatch batpipe prettybat];
44	};
45	hyfetch = {
46	settings = {
47	backend = "fastfetch";
48	preset = user.sexuality;
49	mode = "rgb";
50	light_dark = "dark";
51	lightness = {
52	};
53	color_align = {
54	mode = "horizontal";
55	};
56	};
57	};
58	fastfetch.enable = cfg.hyfetch.enable;
59
60	fish = {
61	plugins = [
62	{
63	name = "tide";
64	inherit (pkgs.fishPlugins.tide) src;
65	}
66	{
67	name = "!!";
68	inherit (pkgs.fishPlugins.bang-bang) src;
69	}
70	];
71	shellAliases =
72	{}
73	// lib.optionalAttrs (!host.darwin) {
74	reboot-windows = "sudo efibootmgr --bootnext 0000; sudo reboot -h now";
75	};
76	shellInit = ''
77	batman --export-env \| source
78	'';
79	##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
80	};
81	};
82	}

modules/home/default.nix created+93

...	@@ -0,0 +1,93 @@
1	# This contains default configurations for set of programs
2	# and configuration, but does not enable many things on it's own.
3	{
4	pkgs,
5	lib,
6	config,
7	user,
8	host,
9	mainHomeImports,
10	...
11	}:
12	let
13	cfg = config.programs;
14	in
15	{
16	imports = mainHomeImports ++ [
17	./macos/sketchybar.nix
18	];
19	programs = {
20	home-manager.enable = true;
21	nix-index.enable = true;
22
23	direnv = {
24	enableZshIntegration = true;
25	nix-direnv.enable = config.programs.direnv.enable;
26	};
27
28	git = {
29	enable = true;
30	userName = lib.mkDefault user.name;
31	userEmail = lib.mkDefault user.email;
32	ignores = [
33	(lib.mkIf host.darwin ".DS_Store") # When using Finder
34	(lib.mkIf host.darwin "._*") # When using non-APFS drives
35	# ViM and Neovim
36	".*.swp"
37	".nvimlog"
38	];
39	};
40
41	atuin = {
42	enableBashIntegration = true;
43	enableFishIntegration = true;
44	daemon.enable = cfg.atuin.enable;
45	};
46	bat = {
47	extraPackages = with pkgs.bat-extras; [
48	batdiff
49	batman
50	batgrep
51	batwatch
52	batpipe
53	prettybat
54	];
55	};
56	hyfetch = {
57	settings = {
58	backend = "fastfetch";
59	preset = user.sexuality;
60	mode = "rgb";
61	light_dark = "dark";
62	lightness = {
63	};
64	color_align = {
65	mode = "horizontal";
66	};
67	};
68	};
69	fastfetch.enable = cfg.hyfetch.enable;
70
71	fish = {
72	plugins = [
73	{
74	name = "tide";
75	inherit (pkgs.fishPlugins.tide) src;
76	}
77	{
78	name = "!!";
79	inherit (pkgs.fishPlugins.bang-bang) src;
80	}
81	];
82	shellAliases =
83	{ }
84	// lib.optionalAttrs (!host.darwin) {
85	reboot-windows = "sudo efibootmgr --bootnext 0000; sudo reboot -h now";
86	};
87	shellInit = ''
88	batman --export-env \| source
89	'';
90	##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
91	};
92	};
93	}

modules/home/macos/sketchybar.nix created+408

...	@@ -0,0 +1,408 @@
1	{
2	pkgs,
3	lib,
4	config,
5	host,
6	...
7	}:
8	let
9	# folder = "${config.home.homeDirectory}.dotfiles/files/sketchybar";
10	# folder = "~/.dotfiles/files/sketchybar";
11	folder = ../../../files/sketchybar;
12	in
13	lib.mkIf (host.darwin) {
14	home.file =
15	lib.attrsets.mapAttrs
16	(
17	file: value: (lib.attrsets.overrideExisting value { enable = config.shared.darwin.tiling.enable; })
18	)
19	{
20	sketchybarrc = {
21	executable = true;
22	target = ".config/sketchybar/sketchybarrc";
23	text = ''
24	#!/usr/bin/env sh
25
26	source "$HOME/.config/sketchybar/colors.sh" # Loads all defined colors
27	source "$HOME/.config/sketchybar/icons.sh" # Loads all defined icons
28
29	ITEM_DIR="$HOME/.config/sketchybar/items" # Directory where the items are configured
30	PLUGIN_DIR="$HOME/.config/sketchybar/plugins" # Directory where all the plugin scripts are stored
31
32	FONT="SF Pro" # Needs to have Regular, Bold, Semibold, Heavy and Black variants
33	PADDINGS=3 # All paddings use this value (icon, label, background)
34
35	# Setting up and starting the helper process
36	HELPER=git.felix.helper
37	killall helper
38	cd $HOME/.config/sketchybar/helper && make
39	$HOME/.config/sketchybar/helper/helper $HELPER > /dev/null 2>&1 &
40
41	# Unload the macOS on screen indicator overlay for volume change
42	# launchctl unload -F /System/Library/LaunchAgents/com.apple.OSDUIHelper.plist > /dev/null 2>&1 &
43
44	# Setting up the general bar appearance and default values
45	${pkgs.sketchybar}/bin/sketchybar --bar height=40 \
46	color=$BAR_COLOR \
47	shadow=off \
48	position=top \
49	sticky=on \
50	padding_right=0 \
51	padding_left=0 \
52	corner_radius=12 \
53	y_offset=0 \
54	margin=2 \
55	blur_radius=0 \
56	notch_width=0 \
57	--default updates=when_shown \
58	icon.font="$FONT:Bold:14.0" \
59	icon.color=$ICON_COLOR \
60	icon.padding_left=$PADDINGS \
61	icon.padding_right=$PADDINGS \
62	label.font="$FONT:Semibold:13.0" \
63	label.color=$LABEL_COLOR \
64	label.padding_left=$PADDINGS \
65	label.padding_right=$PADDINGS \
66	background.padding_right=$PADDINGS \
67	background.padding_left=$PADDINGS \
68	background.height=26 \
69	background.corner_radius=9 \
70	popup.background.border_width=2 \
71	popup.background.corner_radius=11 \
72	popup.background.border_color=$POPUP_BORDER_COLOR \
73	popup.background.color=$POPUP_BACKGROUND_COLOR \
74	popup.background.shadow.drawing=on
75
76	# Left
77	source "$ITEM_DIR/apple.sh"
78	source "$ITEM_DIR/spaces.sh"
79	source "$ITEM_DIR/front_app.sh"
80
81	# Center
82	# source "$ITEM_DIR/spotify.sh"
83	source "$ITEM_DIR/calendar.sh"
84
85	# Right
86	# source "$ITEM_DIR/brew.sh"
87	# source "$ITEM_DIR/github.sh"
88	source "$ITEM_DIR/volume.sh"
89	# source "$ITEM_DIR/divider.sh"
90	# source "$ITEM_DIR/cpu.sh"
91
92	# Forcing all item scripts to run (never do this outside of sketchybarrc)
93	${pkgs.sketchybar}/bin/sketchybar --update
94
95	echo "sketchybar configuation loaded.."
96	'';
97	};
98	icons = {
99	executable = true;
100	target = ".config/sketchybar/icons.sh";
101	source = folder + /icons.sh;
102	};
103	colors = {
104	executable = true;
105	target = ".config/sketchybar/colors.sh";
106	text = ''
107	#!/usr/bin/env sh
108	# Color Palette
109	export BLACK=0xff4c4f69
110	export WHITE=0xffeff1f5
111	export RED=0xffd20f39
112	export GREEN=0xff40a02b
113	export BLUE=0xff1e66f5
114	export YELLOW=0xffdf8e1d
115	export ORANGE=0xfffe640b
116	export MAGENTA=0xffea76cb
117	export GREY=0xff9ca0b0
118	export TRANSPARENT=0xff000000
119	export BLUE2=0xff7287fd
120	export FLAMINGO=0xffdd7878
121
122	# General bar colors
123	export BAR_COLOR=0xeff1f5ff # Color of the bar
124	export ICON_COLOR=0xff4c4f69
125	export LABEL_COLOR=0xff4c4f69 # Color of all labels
126	export BACKGROUND_1=0xffbcc0cc
127	export BACKGROUND_2=0xffbcc0cc
128
129	export POPUP_BACKGROUND_COLOR=$BLACK
130	export POPUP_BORDER_COLOR=$WHITE
131
132	export SHADOW_COLOR=$BLACK
133	'';
134	};
135	items_apple = {
136	executable = true;
137	target = ".config/sketchybar/items/apple.sh";
138	source = folder + /items/executable_apple.sh;
139	};
140	items_brew = {
141	executable = true;
142	target = ".config/sketchybar/items/brew.sh";
143	source = folder + /items/executable_brew.sh;
144	};
145	items_calendar = {
146	executable = true;
147	target = ".config/sketchybar/items/calendar.sh";
148	text = ''
149	#!/usr/bin/env sh
150
151	sketchybar --add item calendar center \
152	--set calendar icon=cal \
153	display=1 \
154	icon.font="$FONT:Black:12.0" \
155	icon.padding_right=0 \
156	label.width=50 \
157	label.align=right \
158	background.padding_left=15 \
159	update_freq=30 \
160	script="$PLUGIN_DIR/calendar.sh" \
161	click_script="$PLUGIN_DIR/zen.sh"
162	'';
163	};
164	items_cpu = {
165	executable = true;
166	target = ".config/sketchybar/items/cpu.sh";
167	source = folder + /items/executable_cpu.sh;
168	};
169	items_divider = {
170	executable = true;
171	target = ".config/sketchybar/items/divider.sh";
172	source = folder + /items/executable_divider.sh;
173	};
174	items_front_app = {
175	executable = true;
176	target = ".config/sketchybar/items/front_app.sh";
177	text = ''
178	#!/usr/bin/env sh
179	FRONT_APP_SCRIPT='sketchybar --set $NAME label="$INFO"'
180	sketchybar --add event window_focus \
181	--add event windows_on_spaces \
182	--add item system.aerospace left \
183	--set system.aerospace script="$PLUGIN_DIR/aerospace.sh" \
184	icon.font="$FONT:Bold:16.0" \
185	label.drawing=off \
186	icon.width=30 \
187	icon=$YABAI_GRID \
188	icon.color=$BLACK \
189	updates=on \
190	display=active \
191	--subscribe system.aerospace window_focus \
192	windows_on_spaces \
193	mouse.clicked \
194	--add item front_app left \
195	--set front_app script="$FRONT_APP_SCRIPT" \
196	icon.drawing=off \
197	background.padding_left=0 \
198	background.padding_right=10 \
199	label.color=$BLACK \
200	label.font="$FONT:Black:12.0" \
201	display=active \
202	--subscribe front_app front_app_switched
203	'';
204	};
205	items_github = {
206	executable = true;
207	target = ".config/sketchybar/items/github.sh";
208	source = folder + /items/executable_github.sh;
209	};
210	items_spaces = {
211	executable = true;
212	target = ".config/sketchybar/items/spaces.sh";
213	# label.background.color=$BACKGROUND_2
214	text = ''
215	${pkgs.sketchybar}/bin/sketchybar --add event aerospace_workspace_change
216	${pkgs.sketchybar}/bin/sketchybar --add event aerospace_mode_change
217	for sid in $(${pkgs.aerospace}/bin/aerospace list-workspaces --all); do
218	${pkgs.sketchybar}/bin/sketchybar --add item space.$sid left \
219	--subscribe space.$sid aerospace_workspace_change \
220	--subscribe space.$sid aerospace_mode_change \
221	--set space.$sid \
222	icon=$sid \
223	icon.padding_left=22 \
224	icon.padding_right=22 \
225	icon.highlight_color=$WHITE \
226	icon.highlight=off \
227	icon.color=0xff4c566a \
228	background.padding_left=-8 \
229	background.padding_right=-8 \
230	background.color=$BACKGROUND_1 \
231	background.drawing=on \
232	script="$PLUGIN_DIR/aerospace.sh $sid" \
233	click_script="aerospace workspace $sid" \
234	label.font="Iosevka Nerd Font:Regular:16.0" \
235	label.padding_right=33 \
236	label.background.height=26 \
237	label.background.drawing=on \
238	label.background.corner_radius=9 \
239	label.drawing=off
240	done
241	${pkgs.sketchybar}/bin/sketchybar --add item separator left \
242	--set separator icon= \
243	icon.font="Iosevka Nerd Font:Regular:16.0" \
244	background.padding_left=26 \
245	background.padding_right=15 \
246	label.drawing=off \
247	display=active \
248	icon.color=$GREEN
249	'';
250	};
251	items_spotify = {
252	executable = true;
253	target = ".config/sketchybar/items/spotify.sh";
254	source = folder + /items/executable_spotify.sh;
255	};
256	items_volume = {
257	executable = true;
258	target = ".config/sketchybar/items/volume.sh";
259	text = ''
260	INITIAL_WIDTH=$(osascript -e 'set ovol to output volume of (get volume settings)')
261	${pkgs.sketchybar}/bin/sketchybar --add item volume right \
262	--subscribe volume volume_change \
263	--set volume script="$PLUGIN_DIR/volume.sh" \
264	updates=on \
265	icon.background.drawing=on \
266	icon.background.color=$FLAMINGO \
267	icon.background.height=8 \
268	icon.background.corner_radius=3 \
269	icon.width=$INITIAL_WIDTH \
270	width=100 \
271	icon.align=right \
272	label.drawing=off \
273	background.drawing=on \
274	background.color=$BACKGROUND_2 \
275	background.height=8 \
276	background.corner_radius=3 \
277	align=left
278
279	${pkgs.sketchybar}/bin/sketchybar --add alias "Control Center,Sound" right \
280	--rename "Control Center,Sound" volume_alias \
281	--set volume_alias icon.drawing=off \
282	label.drawing=off \
283	alias.color=$BLUE2 \
284	background.padding_right=0 \
285	background.padding_left=5 \
286	width=50 \
287	align=right \
288	click_script="$PLUGIN_DIR/volume_click.sh"
289
290	'';
291	};
292	plugins_brew = {
293	executable = true;
294	target = ".config/sketchybar/plugins/brew.sh";
295	source = folder + /plugins/executable_brew.sh;
296	};
297	plugins_calendar = {
298	executable = true;
299	target = ".config/sketchybar/plugins/calendar.sh";
300	source = folder + /plugins/executable_calendar.sh;
301	};
302	plugins_github = {
303	executable = true;
304	target = ".config/sketchybar/plugins/github.sh";
305	source = folder + /plugins/executable_github.sh;
306	};
307	plugins_icon_map = {
308	executable = true;
309	target = ".config/sketchybar/plugins/icon_map.sh";
310	source = folder + /plugins/executable_icon_map.sh;
311	};
312	plugins_space = {
313	executable = true;
314	target = ".config/sketchybar/plugins/space.sh";
315	source = folder + /plugins/executable_space.sh;
316	};
317	plugins_spotify = {
318	executable = true;
319	target = ".config/sketchybar/plugins/spotify.sh";
320	source = folder + /plugins/executable_spotify.sh;
321	};
322	plugins_volume = {
323	executable = true;
324	target = ".config/sketchybar/plugins/volume.sh";
325	text = ''
326	#!/usr/bin/env sh
327	WIDTH=100
328
329	volume_change() {
330	# INITIAL_WIDTH=$(${pkgs.sketchybar}/bin/sketchybar --query $NAME \| ${pkgs.jq}/bin/jq ".icon.width")
331	# if [ "$INITIAL_WIDTH" -eq "0" ]; then
332	# ${pkgs.sketchybar}/bin/sketchybar --animate tanh 30 --set $NAME width=$WIDTH icon.width=$INFO
333	# else
334	# ${pkgs.sketchybar}/bin/sketchybar --set $NAME icon.width=$INFO width=$WIDTH
335	# fi
336	${pkgs.sketchybar}/bin/sketchybar --set $NAME icon.width=$INFO
337
338
339	# sleep 5
340	# FINAL_WIDTH=$(${pkgs.sketchybar}/bin/sketchybar --query $NAME \| ${pkgs.jq}/bin/jq ".icon.width")
341	# if [ "$FINAL_WIDTH" -eq "$INFO" ]; then
342	# ${pkgs.sketchybar}/bin/sketchybar --animate tanh 30 --set $NAME width=0 icon.width=0
343	# fi
344	}
345
346	case "$SENDER" in
347	"volume_change") volume_change
348	;;
349	esac
350	'';
351	};
352	plugins_volume_click = {
353	executable = true;
354	target = ".config/sketchybar/plugins/volume_click.sh";
355	text = ''
356	#!/usr/bin/env sh
357	MUTED=$(osascript -e 'output muted of (get volume settings)')
358	if [ "$MUTED" = "false" ]; then
359	osascript -e 'set volume output muted true'
360	else
361	osascript -e 'set volume output muted false'
362	fi
363	'';
364	};
365	plugins_zen = {
366	executable = true;
367	target = ".config/sketchybar/plugins/zen.sh";
368	source = folder + /plugins/executable_zen.sh;
369	};
370	plugins_aerospace = {
371	executable = true;
372	target = ".config/sketchybar/plugins/aerospace.sh";
373	text = ''
374	#!/usr/bin/env bash
375	source "$HOME/.config/sketchybar/colors.sh" # Loads all defined colors
376
377	highlight_focused_workspace() {
378	if [[ "$1" = "$FOCUSED_WORKSPACE" ]]
379	then
380	${pkgs.sketchybar}/bin/sketchybar --animate tanh 20 --set $NAME icon.highlight=on label.width=0
381	else
382	${pkgs.sketchybar}/bin/sketchybar --animate tanh 20 --set $NAME icon.highlight=off label.width=dynamic
383	fi
384	}
385
386	illuminate_mode() {
387	if [[ "$mode" = "service" ]]
388	then
389	${pkgs.sketchybar}/bin/sketchybar --animate tanh 20 --set $NAME background.color=$ORANGE
390	elif [[ "$mode" = "resize" ]]
391	then
392	${pkgs.sketchybar}/bin/sketchybar --animate tanh 20 --set $NAME background.color=$GREEN
393	else
394	${pkgs.sketchybar}/bin/sketchybar --animate tanh 20 --set $NAME background.color=$BACKGROUND_1
395	fi
396	}
397	case "$SENDER" in
398	"aerospace_workspace_change")
399	highlight_focused_workspace $1
400	;;
401	"aerospace_mode_change")
402	illuminate_mode
403	;;
404	esac
405	'';
406	};
407	};
408	}

modules/macos/icons.nix+8-8

 @@ -2,17 +2,18 @@
   lib,
   config,
   ...
-}: let
+}:
+let
   cfg = config.environment.customIcons;
-  inherit
+  inherit (lib)
-    (lib)
     mkEnableOption
     mkIf
     mkMerge
     mkOption
     types
     ;
-in {
+in
+{
   options.environment.customIcons = {
     enable = mkEnableOption "environment.customIcons";
     clearCacheOnActivation = mkEnableOption "environment.customIcons.clearCacheOnActivation";
 @@ -21,8 +22,8 @@ in {
       type = types.listOf (
         types.submodule {
           options = {
-            path = mkOption {type = types.path;};
+            path = mkOption { type = types.path; };
-            icon = mkOption {type = types.path;};
+            icon = mkOption { type = types.path; };
           };
         }
       );
 @@ -46,8 +47,7 @@ in {
                 set imageData to (current application's NSImage's alloc()'s initWithContentsOfFile:iconPath)
                 (current application's NSWorkspace's sharedWorkspace()'s setIcon:imageData forFile:destPath options:2)
               EOF
-            '')
+            '') cfg.icons
-            cfg.icons
           ))
         }

modules/macos/mac-app-store.nix+6-5

 @@ -3,7 +3,8 @@
   lib,
   pkgs,
   ...
-}: let
+}:
+let
   types = lib.types;
   # Mapping of Mac App Store applications.
 @@ -23,12 +24,13 @@
   # the resolved configuration from the user
   masApps = config.shared.darwin.macAppStoreApps;
-in {
+in
+{
   options = {
     # Installs Mac Applications via name using homebrew.
     shared.darwin.macAppStoreApps = lib.mkOption {
       type = types.listOf types.str;
-      default = [];
+      default = [ ];
     };
   };
   config = lib.mkIf (builtins.length masApps > 0) {
 @@ -37,8 +39,7 @@ in {
       builtins.map (name: {
         inherit name;
         value = allMasApps.${name};
-      })
+      }) masApps
-      masApps
     );
   };
 }

modules/macos/system.nix+28-9

 @@ -3,9 +3,11 @@
   pkgs,
   lib,
   ...
-}: let
+}:
+let
   tiling = config.shared.darwin.tiling.enable;
-in {
+in
+{
   # Use touchid or watch to activate sudo
   security.pam.services.sudo_local = {
     enable = true;
 @@ -59,6 +61,10 @@ in {
         # Autohide menu bar for tiling window manager
         _HIHideMenuBar = tiling;
+        # Use the expanded save dialog by default
+        NSNavPanelExpandedStateForSaveMode = true;
+        NSNavPanelExpandedStateForSaveMode2 = true;
       };
       # minimal dock
       dock = {
 @@ -84,18 +90,31 @@ in {
         AppleShowAllExtensions = true;
         ShowPathbar = true;
         FXEnableExtensionChangeWarning = false;
-        # TODO: default to list view and not saving .DS_Store
+        FXPreferredViewStyle = "Nlsv"; # List View
+        ShowExternalHardDrivesOnDesktop = false;
+        ShowHardDrivesOnDesktop = false;
+        ShowRemovableMediaOnDesktop = false;
+        NewWindowTarget = "Home";
       };
       CustomSystemPreferences = {
+        NSGlobalDomain = {
+          NSStatusItemSelectionPadding = 1;
+          NSStatusItemSelectionSpacing = 1;
+        };
         "com.apple.universalaccess" = {
           closeViewTrackpadGestureZoomEnabled = 1;
+          # TODO: enable zoom. this doesn't do enough
+        };
+        "com.apple.desktopservices" = {
+          # Prevents the Finder from reading DS_Store files on network
+          # shares, potentially. See https://support.apple.com/en-us/102064
+          DSDontWriteNetworkStores = 1;
+        };
+        "com.apple.dock" = {
+          workspaces-edge-delay = 0.15;
         };
-        "com.apple.symbolichotkeys" = {
+        "com.apple.CrashReporter" = {
-          AppleSymbolicHotKeys = {
+          DialogType = "developer"; # display crash reports when apps crash.
-            "64" = {
-              enabled = false;
-            };
-          };
         };
       };
     };

modules/macos/tiling/aerospace.nix+41-13

 @@ -2,7 +2,8 @@
   config,
   pkgs,
   ...
-}: {
+}:
+{
   services.aerospace = {
     enable = config.shared.darwin.tiling.enable;
     settings = {
 @@ -85,8 +86,8 @@
         alt-shift-8 = "move-node-to-workspace 8";
         alt-shift-9 = "move-node-to-workspace 9";
-        cmd-h = []; # Disable "hide application"
+        cmd-h = [ ]; # Disable "hide application"
-        cmd-alt-h = []; # Disable "hide others"
+        cmd-alt-h = [ ]; # Disable "hide others"
         # # See: https://nikitabobko.github.io/AeroSpace/commands#workspace-back-and-forth
         # alt-tab = "workspace-back-and-forth";
 @@ -97,22 +98,49 @@
         alt-shift-semicolon = "mode service";
       };
       mode.service.binding = {
-        esc = ["reload-config" "mode main"];
+        esc = [
-        r = ["flatten-workspace-tree" "mode main"]; # reset layout
+          "reload-config"
-        f = ["layout floating tiling" "mode main"]; # Toggle between floating and tiling layout
+          "mode main"
-        backspace = ["close-all-windows-but-current" "mode main"];
+        ];
+        r = [
+          "flatten-workspace-tree"
+          "mode main"
+        ]; # reset layout
+        f = [
+          "layout floating tiling"
+          "mode main"
+        ]; # Toggle between floating and tiling layout
+        backspace = [
+          "close-all-windows-but-current"
+          "mode main"
+        ];
         # sticky is not yet supported https://github.com/nikitabobko/AeroSpace/issues/2
         #s = ["layout sticky tiling", "mode main"]
-        alt-shift-h = ["join-with left" "mode main"];
+        alt-shift-h = [
-        alt-shift-j = ["join-with down" "mode main"];
+          "join-with left"
-        alt-shift-k = ["join-with up" "mode main"];
+          "mode main"
-        alt-shift-l = ["join-with right" "mode main"];
+        ];
+        alt-shift-j = [
+          "join-with down"
+          "mode main"
+        ];
+        alt-shift-k = [
+          "join-with up"
+          "mode main"
+        ];
+        alt-shift-l = [
+          "join-with right"
+          "mode main"
+        ];
         down = "volume down";
         up = "volume up";
-        shift-down = ["volume set 0" "mode main"];
+        shift-down = [
+          "volume set 0"
+          "mode main"
+        ];
       };
       after-startup-command = [
         "exec-and-forget sketchybar"
 @@ -131,7 +159,7 @@
           "if" = {
             app-id = "com.mitchellh.ghostty";
           };
-          run = ["layout floating"];
+          run = [ "layout floating" ];
           check-further-callbacks = true;
         }
       ];

modules/macos/tiling/default.nix+4-2

...	@@ -1,6 +1,8 @@	...	@@ -1,6 +1,8 @@
1	{lib, ...}: let	1	{ lib, ... }:
		2	let
2	inherit (lib) types;	3	inherit (lib) types;
3	in {	4	in
		5	{
4	imports = [	6	imports = [
5	./sketchybar.nix	7	./sketchybar.nix
6	./aerospace.nix	8	./aerospace.nix

modules/macos/tiling/sketchybar.nix+2-1

...	@@ -2,7 +2,8 @@	...	@@ -2,7 +2,8 @@
2	config,	2	config,
3	pkgs,	3	pkgs,
4	...	4	...
5	}: {	5	}:
		6	{
6	services.sketchybar = {	7	services.sketchybar = {
7	enable = config.shared.darwin.tiling.enable;	8	enable = config.shared.darwin.tiling.enable;
8	package = pkgs.sketchybar;	9	package = pkgs.sketchybar;

modules/neovim/default.nix created+140

...	@@ -0,0 +1,140 @@
1	{
2	config,
3	lib,
4	host,
5	...
6	}:
7	{
8	# based on default options from upstream:
9	# https://github.com/NotAShelf/nvf/blob/main/configuration.nix
10	#
11	# a full list of options is available too:
12	# https://notashelf.github.io/nvf/options.html
13	#
14	# override level 999 is used to not conflict with mkDefault as used by nvf.
15	# which allows user configurations to disable/override anything here.
16	vim = lib.mkOverride 999 {
17	theme = {
18	enable = true;
19	};
20	visuals = {
21	# notification system
22	# https://github.com/j-hui/fidget.nvim
23	fidget-nvim.enable = true;
24	# highlight undo / paste / autoformat / macros
25	# https://github.com/tzachar/highlight-undo.nvim
26	highlight-undo.enable = true;
27	# indentation guides
28	# https://github.com/lukas-reineke/indent-blankline.nvim
29	indent-blankline.enable = false;
30	# extra icons
31	nvim-web-devicons.enable = true;
32	# https://github.com/petertriho/nvim-scrollbar
33	nvim-scrollbar.enable = false;
34	};
35	lsp = {
36	# Must be enabled for language modules to hook into the LSP API.
37	enable = true;
38	formatOnSave = true;
39	# show errors inline
40	# https://github.com/folke/trouble.nvim
41	trouble.enable = true;
42	# show lightbulb icon in gutter to indicate code actions
43	# https://github.com/kosayoda/nvim-lightbulb
44	lightbulb.enable = true;
45	# show icons in auto-completion menu
46	# https://github.com/onsails/lspkind.nvim
47	lspkind.enable = config.vim.autocomplete.blink-cmp.enable;
48	};
49	debugger = {
50	nvim-dap = {
51	enable = true;
52	ui.enable = true;
53	};
54	};
55	languages = {
56	enableFormat = true;
57	enableTreesitter = true;
58	enableExtraDiagnostics = true;
59
60	# sort-lines: on
61	assembly.enable = true;
62	bash.enable = true;
63	clang.enable = true;
64	css.enable = true;
65	html.enable = true;
66	nix.enable = true;
67	rust.crates.enable = true;
68	rust.enable = true;
69	ts.enable = true;
70	zig.enable = true;
71	# sort-lines: off
72
73	nix.format.type = "nixfmt"; # looks so much nicer
74	};
75	filetree = {
76	neo-tree = {
77	enable = true;
78	};
79	};
80	tabline = {
81	nvimBufferline.enable = true;
82	};
83	autocomplete = {
84	blink-cmp.enable = true;
85	};
86	statusline = {
87	lualine = {
88	enable = true;
89	refresh = {
90	statusline = 100;
91	tabline = 100;
92	winbar = 100;
93	};
94	};
95	};
96	binds = {
97	whichKey.enable = true;
98	cheatsheet.enable = true;
99	# discourages bad keyboard habit, e.g. disables arrow keys, explains better binds
100	# https://github.com/m4xshen/hardtime.nvim
101	hardtime-nvim.enable = true;
102	hardtime-nvim.setupOpts = {
103	disable_mouse = false;
104	restriction_mode = "hint"; # default behavior is lenient
105	};
106	};
107	ui = {
108	borders.enable = true;
109	# https://github.com/norcalli/nvim-colorizer.lua
110	colorizer.enable = true;
111	# https://github.com/RRethy/vim-illuminate
112	illuminate.enable = true;
113	breadcrumbs = {
114	enable = false;
115	navbuddy.enable = config.vim.ui.breadcrumbs.enable;
116	};
117	smartcolumn = {
118	enable = true;
119	setupOpts.custom_colorcolumn = {
120	# this is a freeform module, it's `buftype = int;` for configuring column position
121	nix = "110";
122	ruby = "120";
123	java = "130";
124	go = [
125	"90"
126	"130"
127	];
128	};
129	};
130	};
131	notes = {
132	todo-comments.enable = true;
133	};
134	git = {
135	enable = true;
136	gitsigns.enable = true;
137	gitsigns.codeActions.enable = false; # throws an annoying debug message
138	};
139	};
140	}

modules/nixos/boot.nix+2-1

...	@@ -1,4 +1,5 @@	...	@@ -1,4 +1,5 @@
1	{pkgs, ...}: {	1	{ pkgs, ... }:
		2	{
2	boot = {	3	boot = {
3	kernelPackages = pkgs.linuxPackages_latest; # _zen, _hardened, _rt, _rt_latest, etc.	4	kernelPackages = pkgs.linuxPackages_latest; # _zen, _hardened, _rt, _rt_latest, etc.
4	loader = {	5	loader = {

modules/nixos/default.nix+9-4

...	@@ -1,4 +1,9 @@	...	@@ -1,4 +1,9 @@
1	{ lib, pkgs, ... }: {	1	{
		2	lib,
		3	pkgs,
		4	...
		5	}:
		6	{
2	imports = [	7	imports = [
3	./boot.nix	8	./boot.nix
4	./ld.nix	9	./ld.nix
...	@@ -7,8 +12,8 @@	...	@@ -7,8 +12,8 @@
7	];	12	];
8	# make 'shared.darwin' not an error to define.	13	# make 'shared.darwin' not an error to define.
9	options.shared.darwin = lib.mkOption {	14	options.shared.darwin = lib.mkOption {
10	type = lib.types.anything;	15	type = lib.types.anything;
11	default = {};	16	default = { };
12	description = "no-op on linux";	17	description = "no-op on linux";
13	};	18	};
14	}	19	}

modules/nixos/ld.nix+2-1

...	@@ -1,4 +1,5 @@	...	@@ -1,4 +1,5 @@
1	{pkgs, ...}: {	1	{ pkgs, ... }:
		2	{
2	programs.nix-ld.enable = true;	3	programs.nix-ld.enable = true;
3		4
4	# "minimum" amount of libraries needed for most games to run without steam-run	5	# "minimum" amount of libraries needed for most games to run without steam-run

modules/nixos/nvidia.nix+7-5

...	@@ -2,10 +2,12 @@	...	@@ -2,10 +2,12 @@
2	pkgs,	2	pkgs,
3	config,	3	config,
4	...	4	...
5	}: let	5	}:
		6	let
6	nvidiaDriverChannel = config.boot.kernelPackages.nvidiaPackages.latest;	7	nvidiaDriverChannel = config.boot.kernelPackages.nvidiaPackages.latest;
7	in {	8	in
8	services.xserver.videoDrivers = ["nvidia"];	9	{
		10	services.xserver.videoDrivers = [ "nvidia" ];
9		11
10	nixpkgs.config = {	12	nixpkgs.config = {
11	nvidia.acceptLicense = true;	13	nvidia.acceptLicense = true;
...	@@ -18,7 +20,7 @@ in {	...	@@ -18,7 +20,7 @@ in {
18	];	20	];
19		21
20	# Blacklist nouveau to avoid conflicts	22	# Blacklist nouveau to avoid conflicts
21	boot.blacklistedKernelModules = ["nouveau"];	23	boot.blacklistedKernelModules = [ "nouveau" ];
22	environment.variables = {	24	environment.variables = {
23	LIBVA_DRIVER_NAME = "nvidia"; # Hardware video acceleration	25	LIBVA_DRIVER_NAME = "nvidia"; # Hardware video acceleration
24	XDG_SESSION_TYPE = "wayland"; # Force Wayland	26	XDG_SESSION_TYPE = "wayland"; # Force Wayland
...	@@ -80,7 +82,7 @@ in {	...	@@ -80,7 +82,7 @@ in {
80	};	82	};
81		83
82	nix.settings = {	84	nix.settings = {
83	substituters = ["https://cuda-maintainers.cachix.org"];	85	substituters = [ "https://cuda-maintainers.cachix.org" ];
84	trusted-public-keys = [	86	trusted-public-keys = [
85	"cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E="	87	"cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E="
86	];	88	];

modules/nixos/services.nix+4-3

...	@@ -1,4 +1,5 @@	...	@@ -1,4 +1,5 @@
1	{pkgs, ...}: {	1	{ pkgs, ... }:
		2	{
2	services = {	3	services = {
3	avahi = {	4	avahi = {
4	enable = true;	5	enable = true;
...	@@ -39,7 +40,7 @@	...	@@ -39,7 +40,7 @@
39	# Enable CUPS to print documents.	40	# Enable CUPS to print documents.
40	printing = {	41	printing = {
41	enable = true;	42	enable = true;
42	drivers = [pkgs.brlaser]; # Brother printer driver	43	drivers = [ pkgs.brlaser ]; # Brother printer driver
43	};	44	};
44		45
45	pipewire = {	46	pipewire = {
...	@@ -54,7 +55,7 @@	...	@@ -54,7 +55,7 @@
54		55
55	openssh = {	56	openssh = {
56	enable = true;	57	enable = true;
57	ports = [22];	58	ports = [ 22 ];
58	settings = {	59	settings = {
59	PasswordAuthentication = true;	60	PasswordAuthentication = true;
60	UseDns = true;	61	UseDns = true;

modules/nixvim/default.nix deleted-96

...	@@ -1,96 +0,0 @@
1	{
2	pkgs,
3	inputs,
4	nixvim,
5	...
6	}: {
7	imports = [
8	./opts.nix
9	./keymaps.nix
10	./plugins
11	];
12	programs.nixvim = {
13	enable = true;
14
15	globals = {
16	#Set leader to space, and localleader to \
17	mapleader = " ";
18	maplocalleader = "\\";
19
20	have_nerd_font = true;
21	};
22
23	clipboard = {
24	providers = {
25	wl-copy.enable = true; # For Wayland
26	xsel.enable = true; # For X11
27	};
28
29	# Sync clipboard between OS and Neovim
30	# Remove this option if you want your OS clipboard to remain independent.
31	register = "unnamedplus";
32	};
33
34	opts = {
35	# Show line numbers
36	number = true;
37	# You can also add relative line numbers, to help with jumping.
38	# Experiment for yourself to see if you like it!
39	#relativenumber = true
40
41	# Enable mouse mode, can be useful for resizing splits for example!
42	mouse = "a";
43
44	# Don't show the mode, since it's already in the statusline
45	showmode = false;
46
47	# Enable break indent
48	breakindent = true;
49
50	# Save undo history
51	undofile = true;
52
53	# Case-insensitive searching UNLESS \C or one or more capital letters in the search term
54	ignorecase = true;
55	smartcase = true;
56
57	# Keep signcolumn on by default
58	signcolumn = "yes";
59
60	# Decrease update time
61	updatetime = 250;
62
63	# Decrease mapped sequence wait time
64	# Displays which-key popup sooner
65	timeoutlen = 300;
66
67	# Configure how new splits should be opened
68	splitright = true;
69	splitbelow = true;
70
71	# Sets how neovim will display certain whitespace characters in the editor
72	# See `:help 'list'`
73	# and `:help 'listchars'`
74	list = true;
75	# NOTE: .__raw here means that this field is raw lua code
76	listchars.__raw = "{ tab = '» ', trail = '·', nbsp = '␣' }";
77
78	# Preview substitutions live, as you type!
79	inccommand = "split";
80
81	# Show which line your cursor is on
82	cursorline = true;
83
84	# Minimal number of screen lines to keep above and below the cursor.
85	scrolloff = 10;
86
87	# if performing an operation that would fail due to unsaved changes in the buffer (like `:q`),
88	# instead raise a dialog asking if you wish to save the current file(s)
89	# See `:help 'confirm'`
90	confirm = true;
91
92	# See `:help hlsearch`
93	hlsearch = true;
94	};
95	};
96	}

modules/nixvim/icons.nix deleted-189

...	@@ -1,189 +0,0 @@
1	{lib, ...}: {
2	options.nvix.icons = lib.mkOption {
3	type = lib.types.attrs;
4	default = {};
5	};
6	config.nvix.icons = {
7	kind = {
8	Array = "";
9	Boolean = "";
10	Class = "";
11	Color = "";
12	Constant = "";
13	Constructor = "";
14	Enum = "";
15	EnumMember = "";
16	Event = "";
17	Field = "";
18	File = "";
19	Folder = "";
20	Function = "";
21	Interface = "";
22	Key = "";
23	Keyword = "";
24	Method = "";
25	Module = "";
26	Namespace = "";
27	Null = "ﳠ";
28	Number = "";
29	Object = "";
30	Operator = "";
31	Package = "";
32	Property = "";
33	Reference = "";
34	Snippet = "";
35	String = "";
36	Struct = "";
37	Text = "";
38	TypeParameter = "";
39	Unit = "";
40	Value = "";
41	Variable = "";
42	Copilot = "";
43	TabNine = "⌬";
44	};
45	git = {
46	LineAdded = "";
47	LineModified = "";
48	LineRemoved = "";
49	FileDeleted = "";
50	FileIgnored = "󰫙";
51	FileRenamed = "";
52	FileStaged = "✓";
53	FileUnmerged = "";
54	FileMerged = "";
55	FileUnstaged = "";
56	FileUntracked = "◌";
57	FileChanged = "󰉺";
58	Copied = "󰆏";
59	Ignored = "";
60	Diff = "";
61	Repo = "";
62	Octoface = "";
63	Branch = "";
64	};
65	ui = {
66	lazy = {
67	ft = "";
68	lazy = "󰂠 ";
69	loaded = "";
70	not_loaded = "";
71	};
72	ArrowCircleDown = "";
73	ArrowCircleLeft = "";
74	ArrowCircleRight = "";
75	ArrowCircleUp = "";
76	BoldArrowDown = "";
77	BoldArrowLeft = "";
78	BoldArrowRight = "";
79	BoldArrowUp = "";
80	BoldClose = "";
81	BoldDividerLeft = "";
82	BoldDividerRight = "";
83	BoldLineLeft = "▎";
84	BookMark = "";
85	BoxChecked = "";
86	Bug = "";
87	Stacks = "";
88	Scopes = "";
89	Watches = "";
90	DebugConsole = "";
91	Calendar = "";
92	Check = "";
93	ChevronRight = ">";
94	ChevronShortDown = "";
95	ChevronShortLeft = "";
96	ChevronShortRight = "";
97	ChevronShortUp = "";
98	Circle = "";
99	Close = "";
100	CloudDownload = "";
101	Code = "";
102	Comment = "";
103	Dashboard = "";
104	DividerLeft = "";
105	DividerRight = "";
106	DoubleChevronRight = "»";
107	Ellipsis = "";
108	EmptyFolder = "";
109	EmptyFolderOpen = "";
110	ExitCircle = "󰿅";
111	File = "";
112	FileSymlink = "";
113	Files = "";
114	FileRename = "";
115	FindFile = "󰈞";
116	FindText = "";
117	Fire = "";
118	Folder = "";
119	FolderOpen = "";
120	FolderSymlink = "";
121	Forward = "";
122	Gear = "";
123	History = "";
124	Lightbulb = "";
125	LineLeft = "▏";
126	LineMiddle = "│";
127	List = "";
128	Lock = "";
129	NewFile = "";
130	Note = "";
131	Package = "";
132	Pencil = "󰏫";
133	Plus = "";
134	Project = "";
135	Search = "";
136	SignIn = "";
137	SignOut = "";
138	Tab = "";
139	Table = "";
140	Target = "󰀘";
141	Telescope = "";
142	Text = "";
143	Tree = "";
144	Triangle = "󰐊";
145	TriangleShortArrowDown = "";
146	TriangleShortArrowLeft = "";
147	TriangleShortArrowRight = "";
148	TriangleShortArrowUp = "";
149	};
150	diagnostics = {
151	BoldError = "";
152	Error = "";
153	BoldWarning = "";
154	Warning = "";
155	BoldInformation = "";
156	Information = "";
157	BoldQuestion = "";
158	Question = "";
159	BoldHint = "";
160	Hint = "󰌶";
161	Debug = "";
162	Trace = "✎";
163	};
164	misc = {
165	Robot = "ﮧ";
166	Squirrel = "";
167	Tag = "";
168	Watch = "";
169	Smiley = "";
170	Package = "";
171	CircuitBoard = "";
172	LualineFmt = "";
173	};
174	nvtree_chad = {
175	default = "󰈚";
176	symlink = "";
177	folder = {
178	default = "";
179	empty = "";
180	empty_open = "";
181	open = "";
182	symlink = "";
183	symlink_open = "";
184	arrow_open = "";
185	arrow_closed = "";
186	};
187	};
188	};
189	}

modules/nixvim/keymaps.nix deleted-42

...	@@ -1,42 +0,0 @@
1	{pkgs, ...}: {
2	programs.nixvim = {
3	keymaps = [
4	# Keybinds to make split navigation easier.
5	# Use CTRL+<hjkl> to switch between windows
6	#
7	# See `:help wincmd` for a list of all window commands
8	{
9	mode = "n";
10	key = "<C-h>";
11	action = "<C-w><C-h>";
12	options = {
13	desc = "Move focus to the left window";
14	};
15	}
16	{
17	mode = "n";
18	key = "<C-l>";
19	action = "<C-w><C-l>";
20	options = {
21	desc = "Move focus to the right window";
22	};
23	}
24	{
25	mode = "n";
26	key = "<C-j>";
27	action = "<C-w><C-j>";
28	options = {
29	desc = "Move focus to the lower window";
30	};
31	}
32	{
33	mode = "n";
34	key = "<C-k>";
35	action = "<C-w><C-k>";
36	options = {
37	desc = "Move focus to the upper window";
38	};
39	}
40	];
41	};
42	}

modules/nixvim/opts.nix deleted-65

...	@@ -1,65 +0,0 @@
1	{pkgs, ...}: {
2	programs.nixvim = {
3	opts = {
4	# Show line numbers
5	number = true;
6	relativenumber = true;
7
8	shiftwidth = 2;
9
10	# Enable mouse mode, can be useful for resizing splits for example!
11	mouse = "a";
12
13	# Don't show the mode, since it's already in the statusline
14	showmode = false;
15
16	# Enable break indent
17	breakindent = true;
18
19	# Save undo history
20	undofile = true;
21
22	# Case-insensitive searching UNLESS \C or one or more capital letters in the search term
23	ignorecase = true;
24	smartcase = true;
25
26	# Keep signcolumn on by default
27	signcolumn = "yes";
28
29	# Decrease update time
30	updatetime = 250;
31
32	# Decrease mapped sequence wait time
33	# Displays which-key popup sooner
34	timeoutlen = 300;
35
36	# Configure how new splits should be opened
37	splitright = true;
38	splitbelow = true;
39
40	# Sets how neovim will display certain whitespace characters in the editor
41	# See `:help 'list'`
42	# and `:help 'listchars'`
43	list = true;
44	# NOTE: .__raw here means that this field is raw lua code
45	listchars.__raw = "{ tab = '» ', trail = '·', nbsp = '␣' }";
46
47	# Preview substitutions live, as you type!
48	inccommand = "split";
49
50	# Show which line your cursor is on
51	cursorline = true;
52
53	# Minimal number of screen lines to keep above and below the cursor.
54	scrolloff = 10;
55
56	# if performing an operation that would fail due to unsaved changes in the buffer (like `:q`),
57	# instead raise a dialog asking if you wish to save the current file(s)
58	# See `:help 'confirm'`
59	confirm = true;
60
61	# See `:help hlsearch`
62	hlsearch = true;
63	};
64	};
65	}

modules/nixvim/plugins/blink.nix deleted-69

...	@@ -1,69 +0,0 @@
1	{
2	lib,
3	pkgs,
4	...
5	}: {
6	programs.nixvim = {
7	extraPackages = with pkgs; [
8	gh
9	wordnet
10	glab
11	];
12
13	extraPlugins = [
14	];
15
16	plugins = {
17	blink-cmp = {
18	enable = true;
19
20	lazyLoad.settings.event = [
21	"InsertEnter"
22	"CmdlineEnter"
23	];
24
25	settings = {
26	keymap.preset = "super-tab";
27	completion = {
28	accept.auto_brackets.enabled = false;
29	ghost_test.enabled = false;
30
31	list.selection = {
32	preselect = true;
33	auto_insert = false;
34	};
35
36	documentation = {
37	auto_show = true;
38
39	window.border = "rounded";
40	};
41	};
42
43	menu.draw.components = {
44	kind_icon.text.__raw = ''
45	function(ctx)
46	local kind_icon, _, _ = require('mini.icons').get('lsp', ctx.kind)
47	-- Check for both nil and the default fallback icon
48	if not kind_icon or kind_icon == '󰞋' then
49	-- Use our configured kind_icons
50	return require('blink.cmp.config').appearance.kind_icons[ctx.kind] or ""
51	end
52	return kind_icon
53	end,
54	-- Optionally, you may also use the highlights from mini.icons
55	highlight = function(ctx)
56	local _, hl, _ = require('mini.icons').get('lsp', ctx.kind)
57	return hl
58	end
59	'';
60	};
61	};
62
63	fuzzy = {
64	implementation = "prefer_rust_with_warning";
65	};
66	};
67	};
68	};
69	}

modules/nixvim/plugins/default.nix deleted-6

...	@@ -1,6 +0,0 @@
1	{pkgs, ...}: {
2	imports = [
3	./blink.nix
4	./lz-n.nix
5	];
6	}

modules/nixvim/plugins/lz-n.nix deleted-7

...	@@ -1,7 +0,0 @@
1	{pkgs, ...}: {
2	programs.nixvim.plugins = {
3	lz-n = {
4	enable = true;
5	};
6	};
7	}

modules/shared/default.nix+7-1

 @@ -1,9 +1,15 @@
 # shared is used by nixos-rebuild and darwin-rebuild
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   imports = [
     # sort-lines:start
     ./user-system-settings.nix
     ./nix.nix
     # sort-lines:end
   ];
+  # install neovim globally, but let home-manager install
+  # the per-user configured one.
+  environment.systemPackages = [
+    pkgs.neovim
+  ];
 }

modules/shared/nix.nix+7-3

 @@ -1,10 +1,11 @@
-{inputs, ...}: {
+{ inputs, ... }:
+{
   nixpkgs.config = {
     allowUnfree = true;
   };
   nix = {
-    nixPath = ["nixpkgs = ${inputs.nixpkgs}"];
+    nixPath = [ "nixpkgs = ${inputs.nixpkgs}" ];
     extraOptions = ''
       warn-dirty = false
     '';
 @@ -14,7 +15,10 @@
     };
     settings = {
-      experimental-features = ["nix-command" "flakes"];
+      experimental-features = [
+        "nix-command"
+        "flakes"
+      ];
       substituters = [
         "https://cache.nixos.org/?priority=10"

modules/shared/user-system-settings.nix+5-3

 @@ -1,10 +1,12 @@
 # applies user settings for the system
 {
+  config,
   pkgs,
   user,
   lib,
   ...
-}: {
+}:
+{
   # Set your time zone.
   time.timeZone = user.timeZone;
 @@ -17,8 +19,8 @@
       BROWSER = user.browser;
     };
-  stylix = {
+  stylix = lib.mkIf (user ? "theme" && user.theme != null) {
-    enable = user ? "theme";
+    enable = false;
     base16Scheme = "${pkgs.base16-schemes}/share/themes/${user.theme}.yaml";
     fonts = lib.optionalAttrs (user ? "font") {

nvim created+13

...	@@ -0,0 +1,13 @@
1	#!/bin/sh
2	username="$(id -u -n)"
3	if [ "$username" = "clo" ]; then
4	name="chloe";
5	elif [ "$username" = "nmarks" ]; then
6	name="natalie";
7	fi
8	if [ -z "$name" ]; then
9	echo "Configure this wrapper script with your name." >2
10	exit 1
11	fi
12	exec nix run ".#nvim-$name" -- "$@"
13

readme.md+12-8

 @@ -1,13 +1,14 @@
 # nix config
-this setup allows natalie and chloe to share common configuration between their machines, but also share useful modules between each other.
+this setup allows natalie and chloe to share common configuration between their
+machines, but also share useful modules between each other.
 ```
 lib/ # reusable functions
 modules/ # reusable modules
     +-- macos/   # nix-darwin configurations
     +-- nixos/   # linux configurations
-    +-- nixvim/  # neovim configurations
+    +-- neovim/  # nvf configurations
     +-- shared/  # shared between nixos-rebuild & darwin-rebuild
     +-- home-manager.nix # home program presets
 users/
 @@ -15,6 +16,7 @@ users/
     |   +-- user.nix               # info about her
     |   +-- configuration.nix      # for all hosts
     |   +-- home.nix               # for all hosts
+    |   +-- vim.nix                # for neovim
     |   +-- sandwich/
     |   |   +-- configuration.nix  # per host
     |   |   +-- home.nix
 @@ -25,7 +27,8 @@ users/
         ...
 ```
-A new machine can be added by adding a new definition in `flake.nix`. Note that the user and host `configuration.nix` and `home.nix` files are
+A new machine can be added by adding a new definition in `flake.nix`. Note that
+the user and host `configuration.nix` and `home.nix` files are
 ## macOS installation instructions
 @@ -40,11 +43,12 @@ While this installs, now is a good time to perform manual setup steps:
 - Setup your SSH keys in `~/.ssh`
 - Configure the device hostname in System Settings in
-    - About -> Name
+  - About -> Name
-    - General -> Sharing -> Local Hostname
+  - General -> Sharing -> Local Hostname
 - Make sure you're logged into iCloud / Mac App Store
 - `xcode-select --install` to make sure Git and other utilities are available.
-- Optional: Disable app verification with `sudo spctl --master-disable`, then, go to System Settings -> Privacy to allow unsigned apps.
+- Optional: Disable app verification with `sudo spctl --master-disable`, then,
+  go to System Settings -> Privacy to allow unsigned apps.
 Once Nix is installed, open a new shell and clone the repository:
 @@ -55,11 +59,11 @@ git clone https://git.paperclover.net/clo/config.git
 git clone git@git.paperclover.net:clo/config
 ```
-The location of the cloned repository must match what is in your `user.nix` file.
+The location of the cloned repository must match what is in your `user.nix`
+file.
 Setup `nix-darwin` using the `switch` helper:
 ```
 ./switch
 ```

sample.keys created+9

...	@@ -0,0 +1,9 @@
1	global {
2	cmd + opt + backtick -> app "Keyboard Maestro"
3	}
4
5	device WorkLouder {
6	a -> {
7	if app "REAPER" -> key cmd + shift
8	}
9	}

users/chloe/configuration.nix+17-2

 @@ -1,9 +1,12 @@
 # Configuration applied to all of chloe's machines
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
   # packages for all machines
   environment.systemPackages = with pkgs; [
-    neovim
   ];
+  # services for all machines
+  services.karabiner-elements.enable = true;
   # configuration for shared modules.
   # all custom options in 'shared' for clarity.
   shared.darwin = {
 @@ -12,16 +15,28 @@
       "magnet"
     ];
   };
   # system preferences
   system.defaults = {
     NSGlobalDomain = {
       KeyRepeat = 1;
       InitialKeyRepeat = 10;
     };
+    dock = {
+      show-recents = false;
+    };
     CustomUserPreferences = {
       NSGlobalDomain = {
         # TODO: how to change system accent color
         AppleHighlightColor = "1.000000 0.874510 0.701961 Orange";
+        # control how the fn keys operate
+        # 0 = default to media keys, 1 = default to FN1-12
+        "com.apple.keyboard.fnState" = 1;
+        NSUserKeyEquivalents = {
+          Minimize = "@~^\\Uf70f"; # set minimize to a stupidly hard key to press
+        };
       };
     };
   };

users/chloe/home.nix+73-11

...	@@ -1,24 +1,86 @@	...	@@ -1,24 +1,86 @@
		1	{ pkgs, host, ... }:
		2	let
		3	hostServer = false;
		4	in
1	{	5	{
2	inputs,
3	pkgs,
4	lib,
5	...
6	}: {
7	home = {	6	home = {
8	stateVersion = "23.05"; # Please read the comment before changing.	7	stateVersion = "23.05"; # Please read the comment before changing.
9	packages = [	8	packages =
10	pkgs.neovim	9	with pkgs;
11	pkgs.nh	10	let
12	pkgs.ffmpeg	11	# packages to always install
13	];	12	all = [
		13	ffmpeg
		14	ripgrep
		15	uv
		16	nh
		17	];
		18	# packages to install for desktop environments (non-server)
		19	desktop = [
		20	];
		21	# packages to install on all servers
		22	server = [ ];
		23	# packages to install on macOS desktops
		24	darwin = [
		25	raycast
		26	];
		27	# packages to install on linux desktops
		28	linux = [
		29	reaper # TODO: why does this break on macOS
		30	];
		31	in
		32	all ++ (if host.darwin then darwin else linux) ++ (if hostServer then server else desktop);
14	};	33	};
15	programs = {	34	programs = {
16	# sort-lines:start	35	# sort-lines:start
		36	bat.enable = true;
		37	btop.enable = true;
		38	fd.enable = true;
17	hyfetch.enable = true;	39	hyfetch.enable = true;
18	zsh.enable = true;
19	# sort-lines:end	40	# sort-lines:end
20		41
		42	# zsh is the shell i use
		43	zsh = {
		44	enable = true;
		45	enableCompletion = true;
		46	autosuggestion.enable = true;
		47	syntaxHighlighting.enable = true;
		48
		49	history.size = 10000;
		50
		51	shellAliases = {
		52	switch = "nh darwin switch ~/config";
		53	};
		54	profileExtra = ''
		55	function python() {
		56	dirname=$(dirname $1 2>/dev/null)
		57	if [ -z "$dirname" ]; then
		58	dirname=$(pwd)
		59	fi
		60	uv run --project "$dirname" "$@"
		61	}
		62	'';
		63	};
		64
21	# use a git-specific email	65	# use a git-specific email
22	git.userEmail = "git@paperclover.net";	66	git.userEmail = "git@paperclover.net";
		67
		68	ssh = {
		69	enable = true;
		70	matchBlocks = rec {
		71	zenith = {
		72	user = "clo";
		73	port = 222;
		74	};
		75	"nas.paperclover.net" = zenith;
		76	};
		77	};
		78	neovide = {
		79	enable = !hostServer;
		80	settings = {
		81	font.normal = "AT Name Mono";
		82	font.size = 13;
		83	};
		84	};
23	};	85	};
24	}	86	}

users/chloe/paperback/configuration.nix deleted-5

...	@@ -1,5 +0,0 @@
1	{pkgs, ...}: {
2	environment.systemPackages = with pkgs; [
3	reaper
4	];
5	}

users/chloe/paperback/home.nix created+17

...	@@ -0,0 +1,17 @@
1	{ pkgs, ... }:
2	{
3	# these programs are not globally installed to reduce distractions.
4	# most of these are needed for my work environment.
5	programs.bun.enable = true;
6	programs.zed-editor.enable = true;
7	home.packages = with pkgs; [
8	doppler
9	nodejs_22
10	rustup
11	typescript
12	pm2
13	pnpm
14	yt-dlp
15	spotdl
16	];
17	}

users/chloe/sandwich/configuration.nix+2-6

 @@ -1,9 +1,5 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
-  environment.systemPackages = with pkgs; [
+{
-    ffmpeg
-    ripgrep
-    reaper
-  ];
   shared.darwin = {
     macAppStoreApps = [
       "final-cut-pro"

users/chloe/user.nix+1-1

...	@@ -8,7 +8,7 @@	...	@@ -8,7 +8,7 @@
8	dotfilesDir = "~/config"; # absolute path of the local repo	8	dotfilesDir = "~/config"; # absolute path of the local repo
9		9
10	# Stylix/Theming	10	# Stylix/Theming
11	theme = "catppuccin-mocha";	11	theme = null;
12	#font	12	#font
13	sexuality = "lesbian"; # hyfetch	13	sexuality = "lesbian"; # hyfetch
14		14

users/chloe/vim.nix created+20

...	@@ -0,0 +1,20 @@
1	{ ... }:
2	{
3	vim.theme.extraConfig = ''
4	if vim.g.neovide then
5	vim.g.neovide_cursor_trail_size = 0.3
6	vim.g.neovide_scroll_animation_length = 0.1;
7
8	vim.keymap.set('n', '<D-s>', ':w<CR>') -- Save
9	vim.keymap.set('v', '<D-c>', '"+y') -- Copy
10	vim.keymap.set('n', '<D-v>', '"+P') -- Paste normal mode
11	vim.keymap.set('v', '<D-v>', '"+P') -- Paste visual mode
12	vim.keymap.set('c', '<D-v>', '<C-R>+') -- Paste command mode
13	vim.keymap.set('i', '<D-v>', '<ESC>l"+Pli') -- Paste insert mode
14	end
15	vim.api.nvim_set_keymap("", '<D-v>', '+p<CR>', { noremap = true, silent = true})
16	vim.api.nvim_set_keymap('!', '<D-v>', '<C-R>+', { noremap = true, silent = true})
17	vim.api.nvim_set_keymap('t', '<D-v>', '<C-R>+', { noremap = true, silent = true})
18	vim.api.nvim_set_keymap('v', '<D-v>', '<C-R>+', { noremap = true, silent = true})
19	'';
20	}

users/natalie/configuration.nix+2-1

...	@@ -4,7 +4,8 @@	...	@@ -4,7 +4,8 @@
4	pkgs,	4	pkgs,
5	host,	5	host,
6	...	6	...
7	}: {	7	}:
		8	{
8	services.tailscale.enable = true;	9	services.tailscale.enable = true;
9	fonts.packages = with pkgs; [	10	fonts.packages = with pkgs; [
10	nerd-fonts.fira-code	11	nerd-fonts.fira-code

users/natalie/desktop/configuration.nix+23-16

 @@ -3,7 +3,8 @@
   user,
   host,
   ...
-}: {
+}:
+{
   imports = [
     # Include the results of the hardware scan.
     ./hardware-configuration.nix
 @@ -16,7 +17,7 @@
       enable = true;
       # Certain features, including CLI integration and system authentication support,
       # require enabling PolKit integration on some desktop environments (e.g. Plasma).
-      polkitPolicyOwners = [user.username];
+      polkitPolicyOwners = [ user.username ];
     };
     noisetorch.enable = true;
 @@ -31,14 +32,9 @@
       flake = "/home/nmarks/.dotfiles#nixosConfigurations.nixos";
     };
-    neovim = {
-      enable = true;
-      defaultEditor = true;
-    };
     steam = {
       enable = true;
-      package = with pkgs; steam.override {extraPkgs = pkgs: [attr];};
+      package = with pkgs; steam.override { extraPkgs = pkgs: [ attr ]; };
     };
     git = {
 @@ -62,7 +58,7 @@
   xdg.portal = {
     enable = true;
-    extraPortals = with pkgs; [xdg-desktop-portal-gtk];
+    extraPortals = with pkgs; [ xdg-desktop-portal-gtk ];
   };
   virtualisation = {
     containers.enable = true;
 @@ -75,7 +71,10 @@
     libvirtd.enable = true;
   };
-  nix.settings.trusted-users = ["root" user.username];
+  nix.settings.trusted-users = [
+    "root"
+    user.username
+  ];
   systemd = {
     targets = {
       sleep.enable = false;
 @@ -84,16 +83,16 @@
       hybrid-sleep.enable = false;
     };
-    packages = [pkgs.observatory];
+    packages = [ pkgs.observatory ];
-    services.monitord.wantedBy = ["multi-user.target"];
+    services.monitord.wantedBy = [ "multi-user.target" ];
   };
   i18n = {
     # Select internationalisation properties.
     defaultLocale = "en_US.UTF-8";
-    supportedLocales = ["all"];
+    supportedLocales = [ "all" ];
     extraLocaleSettings = {
       LC_ADDRESS = "en_US.UTF-8";
 @@ -133,7 +132,11 @@
     shell = pkgs.fish;
     isNormalUser = true;
     description = user.name;
-    extraGroups = ["networkmanager" "wheel" "docker"];
+    extraGroups = [
+      "networkmanager"
+      "wheel"
+      "docker"
+    ];
     # openssh.authorizedKeys.keyFiles = ["~/.ssh/id_ed25519.pub"];
     packages = with pkgs; [
       firefox
 @@ -157,12 +160,16 @@
     # wireless.enable = true; # Enables wireless support via wpa_supplicant.
     networkmanager.enable = true;
     firewall = {
-      allowedTCPPorts = [22 80 443];
+      allowedTCPPorts = [
+        22
+        80
+        443
+      ];
       enable = true;
     };
     interfaces.enp11s0.wakeOnLan = {
       enable = true;
-      policy = ["magic"];
+      policy = [ "magic" ];
     };
   };

users/natalie/desktop/hardware-configuration.nix+17-7

 @@ -7,15 +7,22 @@
   pkgs,
   modulesPath,
   ...
-}: {
+}:
+{
   imports = [
     (modulesPath + "/installer/scan/not-detected.nix")
   ];
-  boot.initrd.availableKernelModules = ["nvme" "ahci" "xhci_pci" "usbhid" "sd_mod"];
+  boot.initrd.availableKernelModules = [
-  boot.initrd.kernelModules = [];
+    "nvme"
-  boot.kernelModules = ["kvm-amd"];
+    "ahci"
-  boot.extraModulePackages = [];
+    "xhci_pci"
+    "usbhid"
+    "sd_mod"
+  ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-amd" ];
+  boot.extraModulePackages = [ ];
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/5838d50d-e6e8-4ad2-a25e-524f4c46da35";
 @@ -25,7 +32,10 @@
   fileSystems."/boot/efi" = {
     device = "/dev/disk/by-uuid/2319-EE79";
     fsType = "vfat";
-    options = ["fmask=0022" "dmask=0022"];
+    options = [
+      "fmask=0022"
+      "dmask=0022"
+    ];
   };
   fileSystems."/home/nmarks/Games/steam" = {
 @@ -34,7 +44,7 @@
   };
   swapDevices = [
-    {device = "/dev/disk/by-uuid/a4128bb9-239c-4aa9-9777-5067feb77b28";}
+    { device = "/dev/disk/by-uuid/a4128bb9-239c-4aa9-9777-5067feb77b28"; }
   ];
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking

users/natalie/desktop/home.nix+3-7

 @@ -6,12 +6,8 @@
   userSettings,
   systemSettings,
   ...
-}: {
+}:
-  imports = [
+{
-    inputs.nixvim.homeManagerModules.nixvim
-    #set up nixvim
-    # ../../modules/nixvim
-  ];
   home = {
     stateVersion = "23.05"; # Please read the comment before changing.
 @@ -32,7 +28,7 @@
       path-of-building
       wineWowPackages.stable
       winetricks
-      (prismlauncher.override {gamemodeSupport = true;})
+      (prismlauncher.override { gamemodeSupport = true; })
       #window manager stuff
       wofi

users/natalie/home.nix+2-1

...	@@ -2,7 +2,8 @@	...	@@ -2,7 +2,8 @@
2	pkgs,	2	pkgs,
3	lib,	3	lib,
4	...	4	...
5	} @ args: {	5	}@args:
		6	{
6	programs = {	7	programs = {
7	# sort-lines:start	8	# sort-lines:start
8	atuin.enable = true;	9	atuin.enable = true;

users/natalie/laptop/configuration.nix+3-3

...	@@ -1,6 +1,6 @@	...	@@ -1,6 +1,6 @@
1	{pkgs, ...}: {	1	{ pkgs, ... }:
		2	{
2	environment.systemPackages = with pkgs; [	3	environment.systemPackages = with pkgs; [
3	neovim
4	pinentry_mac	4	pinentry_mac
5	signal-desktop-bin	5	signal-desktop-bin
6	];	6	];
...	@@ -8,7 +8,7 @@	...	@@ -8,7 +8,7 @@
8	# Custom configuration modules in "modules" are shared between users,	8	# Custom configuration modules in "modules" are shared between users,
9	# and can be configured in this "shared" namespace	9	# and can be configured in this "shared" namespace
10	shared.darwin = {	10	shared.darwin = {
11	macAppStoreApps = ["wireguard"];	11	macAppStoreApps = [ "wireguard" ];
12	};	12	};
13		13
14	# Create /etc/zshrc that loads the nix-darwin environment.	14	# Create /etc/zshrc that loads the nix-darwin environment.

users/natalie/laptop/home.nix+2-6

 @@ -6,12 +6,8 @@
   user,
   host,
   ...
-} @ args: {
+}@args:
-  imports = [
+{
-    inputs.nixvim.homeManagerModules.nixvim
-    #set up nixvim
-    # ../../modules/nixvim
-  ];
   home = {
     stateVersion = "23.05"; # Please read the comment before changing.
     # shell = pkgs.fish;

users/natalie/packages.nix+5-3

...	@@ -1,6 +1,7 @@	...	@@ -1,6 +1,7 @@
1	# Packages installed with home-manager	1	# Packages installed with home-manager
2	{pkgs, ...}:	2	{ pkgs, ... }:
3	with pkgs; [	3	with pkgs;
		4	[
4	#general development	5	#general development
5	just	6	just
6	pkg-config	7	pkg-config
...	@@ -35,7 +36,7 @@ with pkgs; [	...	@@ -35,7 +36,7 @@ with pkgs; [
35	nh	36	nh
36		37
37	#terminal stuff	38	#terminal stuff
38	(btop.override {cudaSupport = true;})	39	(btop.override { cudaSupport = true; })
39	tmux	40	tmux
40	zellij	41	zellij
41	lazygit	42	lazygit
...	@@ -78,6 +79,7 @@ with pkgs; [	...	@@ -78,6 +79,7 @@ with pkgs; [
78	statix	79	statix
79		80
80	#neovim deps	81	#neovim deps
		82	# TODO: from clo, maybe u can remove all of these? i don't wanna break tho
81	lua51Packages.lua	83	lua51Packages.lua
82	lua51Packages.luarocks-nix	84	lua51Packages.luarocks-nix
83	codespell	85	codespell

users/natalie/user.nix+1-1

...	@@ -3,7 +3,7 @@ rec {	...	@@ -3,7 +3,7 @@ rec {
3	name = "Natalie"; # name/identifier	3	name = "Natalie"; # name/identifier
4	email = "nmarks413@gmail.com"; # email (used for certain configurations)	4	email = "nmarks413@gmail.com"; # email (used for certain configurations)
5	dotfilesDir = "~/.dotfiles"; # absolute path of the local repo	5	dotfilesDir = "~/.dotfiles"; # absolute path of the local repo
6	theme = "catppuccin-mocha"; #name of theme that stylix will use	6	theme = "catppuccin-mocha"; # name of theme that stylix will use
7	browser = "firefox"; # Default browser; must select one from ./user/app/browser/	7	browser = "firefox"; # Default browser; must select one from ./user/app/browser/
8	term = "ghostty"; # Default terminal command;	8	term = "ghostty"; # Default terminal command;
9	font = "iosevka"; # Selected font	9	font = "iosevka"; # Selected font

users/natalie/vim.nix created+9

...	@@ -0,0 +1,9 @@
1	{ ... }:
2	{
3	vim = {
4	theme = {
5	name = "catppuccin";
6	style = "mocha";
7	};
8	};
9	}

author	Natalie Marks <nmarks413@gmail.com> 2025-05-19 17:37:00-07:00
committer	Natalie Marks <nmarks413@gmail.com> 2025-05-19 17:37:00-07:00
log	3449484e73eaf94679f490f8c96a7b187997462d
tree	67b10f3ef9a639c91fe4c7ab1b4fa5afcf2a0283
parent	1a6ac2017dfea76e017edf8e4a32bafc077eae6d
parent	be3db5e095ed7553faba41e6c589746b5f8c7ea5
signature	Commit is signed but in an unrecognized format.

Merge branch 'paperclover-chloe'