nix/config
2
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/nats' into chloe

Browse source
This commit is contained in:
chloe caruso 2025-07-04 21:47:29 -07:00
commit 90fa812e6a
26 changed files with 1019 additions and 1230 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

686
flake.lock
View file

@ -15,11 +15,11 @@
"sf-pro": "sf-pro" "sf-pro": "sf-pro"
}, },
"locked": { "locked": {
"lastModified": 1740961576, "lastModified": 1748299691,
"narHash": "sha256-9L6d3owtajM72YvUOpK1zYle2nM0BpsuopbF9lm9lJs=", "narHash": "sha256-HMlx5HzeOOhpewq3y9UaSMP9AkhEo+AFJHZIWLQvJGw=",
"owner": "Lyndeno", "owner": "Lyndeno",
"repo": "apple-fonts.nix", "repo": "apple-fonts.nix",
"rev": "4df58996ed654f6ce9b71b41c1826484c6870739", "rev": "ec51ae2e8ba89adbb5188c40aa262a7418c48b00",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -28,73 +28,6 @@
"type": "github" "type": "github"
} }
}, },
"base16": {
"inputs": {
"fromYaml": "fromYaml"
},
"locked": {
"lastModified": 1746562888,
"narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=",
"owner": "SenchoPens",
"repo": "base16.nix",
"rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89",
"type": "github"
},
"original": {
"owner": "SenchoPens",
"repo": "base16.nix",
"type": "github"
}
},
"base16-fish": {
"flake": false,
"locked": {
"lastModified": 1622559957,
"narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=",
"owner": "tomyun",
"repo": "base16-fish",
"rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe",
"type": "github"
},
"original": {
"owner": "tomyun",
"repo": "base16-fish",
"type": "github"
}
},
"base16-helix": {
"flake": false,
"locked": {
"lastModified": 1736852337,
"narHash": "sha256-esD42YdgLlEh7koBrSqcT7p2fsMctPAcGl/+2sYJa2o=",
"owner": "tinted-theming",
"repo": "base16-helix",
"rev": "03860521c40b0b9c04818f2218d9cc9efc21e7a5",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "base16-helix",
"type": "github"
}
},
"base16-vim": {
"flake": false,
"locked": {
"lastModified": 1732806396,
"narHash": "sha256-e0bpPySdJf0F68Ndanwm+KWHgQiZ0s7liLhvJSWDNsA=",
"owner": "tinted-theming",
"repo": "base16-vim",
"rev": "577fe8125d74ff456cf942c733a85d769afe58b7",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "base16-vim",
"rev": "577fe8125d74ff456cf942c733a85d769afe58b7",
"type": "github"
}
},
"darwin": { "darwin": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -102,11 +35,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1747820204, "lastModified": 1751313918,
"narHash": "sha256-oY/mH8K1LOd+YbO58sw9ORtOdTxy3rR9lvTzOJKVUtA=", "narHash": "sha256-HsJM3XLa43WpG+665aGEh8iS8AfEwOIQWk3Mke3e7nk=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "e2676937faf868111dcea6a4a9cf4b6549907c9d", "rev": "e04a388232d9a6ba56967ce5b53a8a6f713cdfcf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -116,54 +49,7 @@
"type": "github" "type": "github"
} }
}, },
"firefox-gnome-theme": {
"flake": false,
"locked": {
"lastModified": 1744642301,
"narHash": "sha256-5A6LL7T0lttn1vrKsNOKUk9V0ittdW0VEqh6AtefxJ4=",
"owner": "rafaelmardojai",
"repo": "firefox-gnome-theme",
"rev": "59e3de00f01e5adb851d824cf7911bd90c31083a",
"type": "github"
},
"original": {
"owner": "rafaelmardojai",
"repo": "firefox-gnome-theme",
"type": "github"
}
},
"flake-compat": { "flake-compat": {
"flake": false,
"locked": {
"lastModified": 1746162366,
"narHash": "sha256-5SSSZ/oQkwfcAz/o/6TlejlVGqeK08wyREBQ5qFFPhM=",
"owner": "nix-community",
"repo": "flake-compat",
"rev": "0f158086a2ecdbb138cd0429410e44994f1b7e4b",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_2": {
"locked": {
"lastModified": 1733328505,
"narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_3": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1696426674, "lastModified": 1696426674,
@ -179,7 +65,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat_4": { "flake-compat_2": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1696426674, "lastModified": 1696426674,
@ -200,32 +86,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1743550720, "lastModified": 1749398372,
"narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "c621e8422220273271f52058f618c94e405bb0f5", "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-parts_2": {
"inputs": {
"nixpkgs-lib": [
"stylix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1733312601,
"narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -239,11 +104,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1701680307, "lastModified": 1731533236,
"narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -257,11 +122,11 @@
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1731533236, "lastModified": 1701680307,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -289,6 +154,24 @@
} }
}, },
"flake-utils_4": { "flake-utils_4": {
"inputs": {
"systems": "systems_4"
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_5": {
"inputs": { "inputs": {
"systems": "systems_6" "systems": "systems_6"
}, },
@ -306,7 +189,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_5": { "flake-utils_6": {
"inputs": { "inputs": {
"systems": "systems_7" "systems": "systems_7"
}, },
@ -324,7 +207,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_6": { "flake-utils_7": {
"inputs": { "inputs": {
"systems": "systems_8" "systems": "systems_8"
}, },
@ -342,45 +225,18 @@
"type": "github" "type": "github"
} }
}, },
"fromYaml": { "flakey-profile": {
"flake": false,
"locked": { "locked": {
"lastModified": 1731966426, "lastModified": 1712898590,
"narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=", "narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=",
"owner": "SenchoPens", "owner": "lf-",
"repo": "fromYaml", "repo": "flakey-profile",
"rev": "106af9e2f715e2d828df706c386a685698f3223b", "rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "SenchoPens", "owner": "lf-",
"repo": "fromYaml", "repo": "flakey-profile",
"type": "github"
}
},
"git-hooks": {
"inputs": {
"flake-compat": [
"stylix",
"flake-compat"
],
"gitignore": "gitignore_2",
"nixpkgs": [
"stylix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1742649964,
"narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
"type": "github"
},
"original": {
"owner": "cachix",
"repo": "git-hooks.nix",
"type": "github" "type": "github"
} }
}, },
@ -401,28 +257,6 @@
} }
}, },
"gitignore_2": { "gitignore_2": {
"inputs": {
"nixpkgs": [
"stylix",
"git-hooks",
"nixpkgs"
]
},
"locked": {
"lastModified": 1709087332,
"narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
"owner": "hercules-ci",
"repo": "gitignore.nix",
"rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "gitignore.nix",
"type": "github"
}
},
"gitignore_3": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"zls", "zls",
@ -443,23 +277,6 @@
"type": "github" "type": "github"
} }
}, },
"gnome-shell": {
"flake": false,
"locked": {
"lastModified": 1744584021,
"narHash": "sha256-0RJ4mJzf+klKF4Fuoc8VN8dpQQtZnKksFmR2jhWE1Ew=",
"owner": "GNOME",
"repo": "gnome-shell",
"rev": "52c517c8f6c199a1d6f5118fae500ef69ea845ae",
"type": "github"
},
"original": {
"owner": "GNOME",
"ref": "48.1",
"repo": "gnome-shell",
"type": "github"
}
},
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -467,11 +284,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1747834438, "lastModified": 1751489990,
"narHash": "sha256-AHJt79W8wADzur2htCx1U8FtEk4XjvrHb9/3iDfNedI=", "narHash": "sha256-ENTd/sd4Vz/VJYn14SVqW1OH2m7WIAvsm9A9SrmDZRY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "6c2eb1e24cd0e76d88bdd633ef4c50d6286586e0", "rev": "89af52d9a893af013f5f4c1d2d56912106827153",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -481,27 +298,6 @@
"type": "github" "type": "github"
} }
}, },
"home-manager_2": {
"inputs": {
"nixpkgs": [
"stylix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1747763032,
"narHash": "sha256-9j3oCbemeH7bTVXJ3pDWxOptbxDx2SdK1jY2AHpjQiw=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "29dda415f5b2178278283856c6f9f7b48a2a4353",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
"type": "github"
}
},
"langref": { "langref": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -514,13 +310,48 @@
"url": "https://raw.githubusercontent.com/ziglang/zig/0fb2015fd3422fc1df364995f9782dfe7255eccd/doc/langref.html.in" "url": "https://raw.githubusercontent.com/ziglang/zig/0fb2015fd3422fc1df364995f9782dfe7255eccd/doc/langref.html.in"
} }
}, },
"lix": {
"flake": false,
"locked": {
"lastModified": 1746827285,
"narHash": "sha256-hsFe4Tsqqg4l+FfQWphDtjC79WzNCZbEFhHI8j2KJzw=",
"rev": "47aad376c87e2e65967f17099277428e4b3f8e5a",
"type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/47aad376c87e2e65967f17099277428e4b3f8e5a.tar.gz?rev=47aad376c87e2e65967f17099277428e4b3f8e5a"
},
"original": {
"type": "tarball",
"url": "https://git.lix.systems/lix-project/lix/archive/2.93.0.tar.gz"
}
},
"lix-module": {
"inputs": {
"flake-utils": "flake-utils",
"flakey-profile": "flakey-profile",
"lix": "lix",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1746838955,
"narHash": "sha256-11R4K3iAx4tLXjUs+hQ5K90JwDABD/XHhsM9nkeS5N8=",
"rev": "cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc",
"type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc.tar.gz?rev=cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc"
},
"original": {
"type": "tarball",
"url": "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz"
}
},
"mnw": { "mnw": {
"locked": { "locked": {
"lastModified": 1747499976, "lastModified": 1748710831,
"narHash": "sha256-YTiSI4WLbk0CleXeBheYmKZV6iqKyBpyoh1e+vcQzu4=", "narHash": "sha256-eZu2yH3Y2eA9DD3naKWy/sTxYS5rPK2hO7vj8tvUCSU=",
"owner": "Gerg-L", "owner": "Gerg-L",
"repo": "mnw", "repo": "mnw",
"rev": "72433a144c4ac16931e9148f78db4a0e4c147441", "rev": "cff958a4e050f8d917a6ff3a5624bc4681c6187d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -531,17 +362,17 @@
}, },
"moonlight": { "moonlight": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils_2",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1747413594, "lastModified": 1750621684,
"narHash": "sha256-cFsVYlIkSNEpGw4qT9Eea6sa1+dZyaCRZNrgQTc8wu4=", "narHash": "sha256-E8iHTYK9iUtIjYgBNj54Xeulj9WaxSGDbzOLLFhCSqA=",
"owner": "moonlight-mod", "owner": "moonlight-mod",
"repo": "moonlight", "repo": "moonlight",
"rev": "fc7c0119e923d50ce8873ea654fa7542f60be27f", "rev": "9398874e59f5e2b8485c489ce6c0f6c9c7d210a0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -557,11 +388,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1747847914, "lastModified": 1751375534,
"narHash": "sha256-Ut9RZVAaKUD4A3RrXP5RhNVZ+LVy5mL4mMmiTDWaQE8=", "narHash": "sha256-9z1W64dDVtVxqgPzUbjIQqRfygg1hdivUOZ6d/H+yFg=",
"owner": "viperML", "owner": "viperML",
"repo": "nh", "repo": "nh",
"rev": "45048d3e9f183f3f09fddf667841b7327c04ad8f", "rev": "d0abb8eebe32f79ce4659e68dd777cf497a5d3d2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -572,22 +403,17 @@
}, },
"nil": { "nil": {
"inputs": { "inputs": {
"flake-utils": [
"nvf",
"flake-utils"
],
"nixpkgs": [ "nixpkgs": [
"nvf", "nvf",
"nixpkgs" "nixpkgs"
], ]
"rust-overlay": "rust-overlay_2"
}, },
"locked": { "locked": {
"lastModified": 1741118843, "lastModified": 1750047244,
"narHash": "sha256-ggXU3RHv6NgWw+vc+HO4/9n0GPufhTIUjVuLci8Za8c=", "narHash": "sha256-vluLARrk4485npdyHOj8XKr0yk6H22pNf+KVRNL+i/Y=",
"owner": "oxalica", "owner": "oxalica",
"repo": "nil", "repo": "nil",
"rev": "577d160da311cc7f5042038456a0713e9863d09e", "rev": "870a4b1b5f12004832206703ac15aa85c42c247b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -603,11 +429,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1747540584, "lastModified": 1751170039,
"narHash": "sha256-cxCQ413JTUuRv9Ygd8DABJ1D6kuB/nTfQqC0Lu9C0ls=", "narHash": "sha256-3EKpUmyGmHYA/RuhZjINTZPU+OFWko0eDwazUOW64nw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "ec179dd13fb7b4c6844f55be91436f7857226dce", "rev": "9c932ae632d6b5150515e5749b198c175d8565db",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -618,7 +444,7 @@
}, },
"nix-options-search": { "nix-options-search": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_3",
"gitignore": "gitignore", "gitignore": "gitignore",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
@ -636,29 +462,6 @@
"type": "github" "type": "github"
} }
}, },
"nixos-cosmic": {
"inputs": {
"flake-compat": "flake-compat",
"nixpkgs": [
"nixpkgs"
],
"nixpkgs-stable": "nixpkgs-stable",
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1747826251,
"narHash": "sha256-Fe4AXmnnAKnh/wIe1ao4Pv/8m6WGA1ujwp6VApgos30=",
"owner": "lilyinstarlight",
"repo": "nixos-cosmic",
"rev": "9a67b4a289cd8994080398d40b57cfde8e8cfb0a",
"type": "github"
},
"original": {
"owner": "lilyinstarlight",
"repo": "nixos-cosmic",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1736012469, "lastModified": 1736012469,
@ -677,11 +480,11 @@
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1743296961, "lastModified": 1748740939,
"narHash": "sha256-b1EdN3cULCqtorQ4QeWgLMrd5ZGOjLSLemfa00heasc=", "narHash": "sha256-rQaysilft1aVMwF14xIdGS3sj1yHlI6oKQNBRTF40cc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "e4822aea2a6d1cdd36653c134cacfd64c97ff4fa", "rev": "656a64127e9d791a334452c6b6606d17539476e2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -690,44 +493,13 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-stable": {
"locked": {
"lastModified": 1747676747,
"narHash": "sha256-LXkWBVqilgx7Pohwqu/ABxDVw+Cmi5/Mj2S2mpUH0Fw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "72841a4a8761d1aed92ef6169a636872c986c76d",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-24.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable_2": {
"locked": {
"lastModified": 1720535198,
"narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "205fd4226592cc83fd4c0885a3e4c9c400efabb5",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-23.11",
"type": "indirect"
}
},
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1747744144, "lastModified": 1751271578,
"narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=", "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f", "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -768,49 +540,23 @@
"type": "github" "type": "github"
} }
}, },
"nur": {
"inputs": {
"flake-parts": [
"stylix",
"flake-parts"
],
"nixpkgs": [
"stylix",
"nixpkgs"
],
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1746056780,
"narHash": "sha256-/emueQGaoT4vu0QjU9LDOG5roxRSfdY0K2KkxuzazcM=",
"owner": "nix-community",
"repo": "NUR",
"rev": "d476cd0972dd6242d76374fcc277e6735715c167",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "NUR",
"type": "github"
}
},
"nvf": { "nvf": {
"inputs": { "inputs": {
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_4",
"mnw": "mnw", "mnw": "mnw",
"nil": "nil", "nil": "nil",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"systems": "systems_4" "systems": "systems_5"
}, },
"locked": { "locked": {
"lastModified": 1747525582, "lastModified": 1751186226,
"narHash": "sha256-oEZ6DV4bPcNZIuwW5Kcd+/zT3PMkXse2kX/3jHoomGk=", "narHash": "sha256-Bt7jtmCW72JUPxOIrV73qBTAUOy4qvJXsls2ERDUcGo=",
"owner": "notashelf", "owner": "notashelf",
"repo": "nvf", "repo": "nvf",
"rev": "d3a0e7029ac57eef1120225973247851c5b967b5", "rev": "5bad5dd94ce5ea3b40b08d9e6802e69d02198d21",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -836,16 +582,15 @@
"apple-fonts": "apple-fonts", "apple-fonts": "apple-fonts",
"darwin": "darwin", "darwin": "darwin",
"home-manager": "home-manager", "home-manager": "home-manager",
"lix-module": "lix-module",
"moonlight": "moonlight", "moonlight": "moonlight",
"nh": "nh", "nh": "nh",
"nix-index-database": "nix-index-database", "nix-index-database": "nix-index-database",
"nix-options-search": "nix-options-search", "nix-options-search": "nix-options-search",
"nixos-cosmic": "nixos-cosmic",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"nixpkgs-stable": "nixpkgs-stable_2",
"nvf": "nvf", "nvf": "nvf",
"rust-overlay": "rust-overlay_3", "rust-overlay": "rust-overlay",
"stylix": "stylix", "zen-browser": "zen-browser",
"zig": "zig", "zig": "zig",
"zls": "zls" "zls": "zls"
} }
@ -853,58 +598,15 @@
"rust-overlay": { "rust-overlay": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixos-cosmic",
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1747795013, "lastModified": 1751423951,
"narHash": "sha256-c7i0xJ+xFhgjO9SWHYu5dF/7lq63RPDvwKAdjc6VCE4=", "narHash": "sha256-AowKhJGplXRkAngSvb+32598DTiI6LOzhAnzgvbCtYM=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "6b1cf12374361859242a562e1933a7930649131a", "rev": "1684ed5b15859b655caf41b467d046e29a994d04",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"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"
]
},
"locked": {
"lastModified": 1747795013,
"narHash": "sha256-c7i0xJ+xFhgjO9SWHYu5dF/7lq63RPDvwKAdjc6VCE4=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "6b1cf12374361859242a562e1933a7930649131a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -997,43 +699,6 @@
"url": "https://devimages-cdn.apple.com/design/resources/download/SF-Pro.dmg" "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Pro.dmg"
} }
}, },
"stylix": {
"inputs": {
"base16": "base16",
"base16-fish": "base16-fish",
"base16-helix": "base16-helix",
"base16-vim": "base16-vim",
"firefox-gnome-theme": "firefox-gnome-theme",
"flake-compat": "flake-compat_2",
"flake-parts": "flake-parts_2",
"git-hooks": "git-hooks",
"gnome-shell": "gnome-shell",
"home-manager": "home-manager_2",
"nixpkgs": [
"nixpkgs"
],
"nur": "nur",
"systems": "systems_5",
"tinted-foot": "tinted-foot",
"tinted-kitty": "tinted-kitty",
"tinted-schemes": "tinted-schemes",
"tinted-tmux": "tinted-tmux",
"tinted-zed": "tinted-zed"
},
"locked": {
"lastModified": 1747847674,
"narHash": "sha256-XYVaUKQrda7WOSonewDtpvm8tENIcwWrErobUYMTMoc=",
"owner": "danth",
"repo": "stylix",
"rev": "4ce349da56e075f7e3456b48731cbbf5ae8b1eb8",
"type": "github"
},
"original": {
"owner": "danth",
"repo": "stylix",
"type": "github"
}
},
"systems": { "systems": {
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1681028828,
@ -1154,121 +819,38 @@
"type": "github" "type": "github"
} }
}, },
"tinted-foot": { "zen-browser": {
"flake": false,
"locked": {
"lastModified": 1726913040,
"narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=",
"owner": "tinted-theming",
"repo": "tinted-foot",
"rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "tinted-foot",
"rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
"type": "github"
}
},
"tinted-kitty": {
"flake": false,
"locked": {
"lastModified": 1735730497,
"narHash": "sha256-4KtB+FiUzIeK/4aHCKce3V9HwRvYaxX+F1edUrfgzb8=",
"owner": "tinted-theming",
"repo": "tinted-kitty",
"rev": "de6f888497f2c6b2279361bfc790f164bfd0f3fa",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "tinted-kitty",
"type": "github"
}
},
"tinted-schemes": {
"flake": false,
"locked": {
"lastModified": 1744974599,
"narHash": "sha256-Fg+rdGs5FAgfkYNCs74lnl8vkQmiZVdBsziyPhVqrlY=",
"owner": "tinted-theming",
"repo": "schemes",
"rev": "28c26a621123ad4ebd5bbfb34ab39421c0144bdd",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "schemes",
"type": "github"
}
},
"tinted-tmux": {
"flake": false,
"locked": {
"lastModified": 1745111349,
"narHash": "sha256-udV+nHdpqgkJI9D0mtvvAzbqubt9jdifS/KhTTbJ45w=",
"owner": "tinted-theming",
"repo": "tinted-tmux",
"rev": "e009f18a01182b63559fb28f1c786eb027c3dee9",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "tinted-tmux",
"type": "github"
}
},
"tinted-zed": {
"flake": false,
"locked": {
"lastModified": 1725758778,
"narHash": "sha256-8P1b6mJWyYcu36WRlSVbuj575QWIFZALZMTg5ID/sM4=",
"owner": "tinted-theming",
"repo": "base16-zed",
"rev": "122c9e5c0e6f27211361a04fae92df97940eccf9",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "base16-zed",
"type": "github"
}
},
"treefmt-nix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"stylix",
"nur",
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1733222881, "lastModified": 1751256876,
"narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", "narHash": "sha256-4A8LmE0Hd9RvQwSEPYdITJebpLt7J99VY76IphzqZKc=",
"owner": "numtide", "owner": "youwen5",
"repo": "treefmt-nix", "repo": "zen-browser-flake",
"rev": "49717b5af6f80172275d47a418c9719a31a78b53", "rev": "615b9244dc7ac777b8f0bc3a9cb7290936e4fcf9",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "numtide", "owner": "youwen5",
"repo": "treefmt-nix", "repo": "zen-browser-flake",
"type": "github" "type": "github"
} }
}, },
"zig": { "zig": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_3", "flake-compat": "flake-compat",
"flake-utils": "flake-utils_4", "flake-utils": "flake-utils_5",
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1747829603, "lastModified": 1751458413,
"narHash": "sha256-H8Vj7GSOyHgAUTDM/EkkdiTyEZg2C1UUlsp/fDSbxNQ=", "narHash": "sha256-eyKdTzRaY4blNs/GVJODh4E+16wpEKmlnQUpGf9e9gc=",
"owner": "mitchellh", "owner": "mitchellh",
"repo": "zig-overlay", "repo": "zig-overlay",
"rev": "53899a028ece2f77939c08c59d547416a59086c0", "rev": "4f33e11d99060c5cb2bdc380a11a9b23858dcfde",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1279,8 +861,8 @@
}, },
"zig-overlay": { "zig-overlay": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_4", "flake-compat": "flake-compat_2",
"flake-utils": "flake-utils_6", "flake-utils": "flake-utils_7",
"nixpkgs": [ "nixpkgs": [
"zls", "zls",
"nixpkgs" "nixpkgs"
@ -1302,8 +884,8 @@
}, },
"zls": { "zls": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_5", "flake-utils": "flake-utils_6",
"gitignore": "gitignore_3", "gitignore": "gitignore_2",
"langref": "langref", "langref": "langref",
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_4",
"zig-overlay": "zig-overlay" "zig-overlay": "zig-overlay"

20
flake.nix
View file

@ -2,7 +2,11 @@
description = "multi device configuration flake"; description = "multi device configuration flake";
inputs = { inputs = {
nixpkgs.url = "nixpkgs/nixos-unstable"; nixpkgs.url = "nixpkgs/nixos-unstable";
nixpkgs-stable.url = "nixpkgs/nixos-23.11";
lix-module = {
url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz";
inputs.nixpkgs.follows = "nixpkgs";
};
home-manager.url = "github:nix-community/home-manager/master"; home-manager.url = "github:nix-community/home-manager/master";
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
@ -22,15 +26,13 @@
zig.url = "github:mitchellh/zig-overlay"; zig.url = "github:mitchellh/zig-overlay";
zls.url = "github:zigtools/zls?rev=a26718049a8657d4da04c331aeced1697bc7652b"; zls.url = "github:zigtools/zls?rev=a26718049a8657d4da04c331aeced1697bc7652b";
stylix.url = "github:danth/stylix";
stylix.inputs.nixpkgs.follows = "nixpkgs";
moonlight.url = "github:moonlight-mod/moonlight"; # Add `/develop` to the flake URL to use nightly. moonlight.url = "github:moonlight-mod/moonlight"; # Add `/develop` to the flake URL to use nightly.
moonlight.inputs.nixpkgs.follows = "nixpkgs"; moonlight.inputs.nixpkgs.follows = "nixpkgs";
nixos-cosmic.url = "github:lilyinstarlight/nixos-cosmic"; zen-browser = {
nixos-cosmic.inputs.nixpkgs.follows = "nixpkgs"; url = "github:youwen5/zen-browser-flake";
inputs.nixpkgs.follows = "nixpkgs";
};
nh.url = "github:viperML/nh"; nh.url = "github:viperML/nh";
nh.inputs.nixpkgs.follows = "nixpkgs"; nh.inputs.nixpkgs.follows = "nixpkgs";
@ -43,7 +45,7 @@
{ {
self, self,
nixpkgs, nixpkgs,
nixos-cosmic, lix-module,
darwin, darwin,
... ...
}@inputs: }@inputs:
@ -92,6 +94,7 @@
inherit inherit
overlays overlays
nixpkgs nixpkgs
lix-module
inputs inputs
mkNeovim mkNeovim
; ;
@ -127,7 +130,6 @@
host = "desktop"; host = "desktop";
system = "x86_64-linux"; system = "x86_64-linux";
extraModules = [ extraModules = [
nixos-cosmic.nixosModules.default
]; ];
}; };
# natalie's laptop # natalie's laptop

67
lib/mkSystem.nix
View file

@ -2,32 +2,24 @@
# particular architecture. # particular architecture.
{ {
nixpkgs, nixpkgs,
lix-module,
overlays, overlays,
inputs, inputs,
mkNeovim, mkNeovim,
}: name: { }:
name:
{
user, # ./users/{name} user, # ./users/{name}
host, # ./users/{name}/{host} host, # ./users/{name}/{host}
system, # arch-os system, # arch-os
extraModules ? [], extraModules ? [ ],
}: let }:
let
darwin = nixpkgs.lib.strings.hasSuffix "-darwin" system; darwin = nixpkgs.lib.strings.hasSuffix "-darwin" system;
getInputModule = a: b: getInputModule = a: b: inputs.${a}.${if darwin then "darwinModules" else "nixosModules"}.${b};
inputs.${
a
}.${
if darwin
then "darwinModules"
else "nixosModules"
}.${
b
};
# NixOS vs nix-darwin functions # NixOS vs nix-darwin functions
systemFunc = systemFunc = if darwin then inputs.darwin.lib.darwinSystem else nixpkgs.lib.nixosSystem;
if darwin
then inputs.darwin.lib.darwinSystem
else nixpkgs.lib.nixosSystem;
userDir = ../users + "/${user}"; userDir = ../users + "/${user}";
userConfig = import (userDir + "/user.nix"); userConfig = import (userDir + "/user.nix");
@ -38,10 +30,7 @@
hostHomePath = hostDir + "/home.nix"; hostHomePath = hostDir + "/home.nix";
userHomePath = userDir + "/home.nix"; userHomePath = userDir + "/home.nix";
pathOrNull = a: pathOrNull = a: if builtins.pathExists a then a else null;
if builtins.pathExists a
then a
else null;
# Arguments passed to all module files # Arguments passed to all module files
args = { args = {
@ -68,18 +57,14 @@
term, # preferred $TERM term, # preferred $TERM
editor, # preferred $EDITOR editor, # preferred $EDITOR
browser ? null, # preferred $BROWSER browser ? null, # preferred $BROWSER
} @ user: }@user:
user user
) )
userConfig; userConfig;
}; };
systemSettings = rec { systemSettings = rec {
inherit darwin; inherit darwin;
homeDir = "/${ homeDir = "/${if darwin then "Users" else "home"}/${userConfig.username}";
if darwin
then "Users"
else "home"
}/${userConfig.username}";
}; };
mainHomeImports = builtins.filter (f: f != null) [ mainHomeImports = builtins.filter (f: f != null) [
@ -92,7 +77,7 @@
} }
]; ];
in in
systemFunc { systemFunc {
inherit system; inherit system;
modules = modules =
@ -100,16 +85,17 @@ in
# Apply our overlays. Overlays are keyed by system type so we have # Apply our overlays. Overlays are keyed by system type so we have
# to go through and apply our system type. We do this first so # to go through and apply our system type. We do this first so
# the overlays are available globally. # the overlays are available globally.
{nixpkgs.overlays = overlays;} { nixpkgs.overlays = overlays; }
# Use lix (alternative nix implementation)
# https://lix.systems/add-to-config/#flake-based-configurations
lix-module.nixosModules.default
# (getInputModule "lix-module" "default")
# Modules shared between nix-darwin and NixOS # Modules shared between nix-darwin and NixOS
../modules/shared ../modules/shared
# Modules for the specific OS # Modules for the specific OS
( (if darwin then ../modules/macos else ../modules/nixos)
if darwin
then ../modules/macos
else ../modules/nixos
)
# The user-wide configuration.nix # The user-wide configuration.nix
(pathOrNull userConfigPath) (pathOrNull userConfigPath)
@ -119,10 +105,7 @@ in
# Set up nix-index and enable comma for easy one-shot command use # Set up nix-index and enable comma for easy one-shot command use
# https://github.com/nix-community/comma # https://github.com/nix-community/comma
(getInputModule "nix-index-database" "nix-index") (getInputModule "nix-index-database" "nix-index")
{programs.nix-index-database.comma.enable = true;} { programs.nix-index-database.comma.enable = true; }
# Themes for all programs
(getInputModule "stylix" "stylix")
# Home manager # Home manager
(getInputModule "home-manager" "home-manager") (getInputModule "home-manager" "home-manager")
@ -132,9 +115,7 @@ in
useUserPackages = true; useUserPackages = true;
backupFileExtension = "hm-backup"; backupFileExtension = "hm-backup";
# Arguments passed to all module files # Arguments passed to all module files
extraSpecialArgs = extraSpecialArgs = args // {
args
// {
inherit mainHomeImports; inherit mainHomeImports;
}; };
# can't find how to make this an array without the param # can't find how to make this an array without the param
@ -144,8 +125,8 @@ in
} }
# Arguments passed to all module files # Arguments passed to all module files
{config._module.args = args;} { config._module.args = args; }
] ]
# Add extra modules specified from config # Add extra modules specified from config
++ extraModules; ++ extraModules;
} }

2
modules/home/default.nix
View file

@ -86,8 +86,8 @@ in
}; };
shellInit = '' shellInit = ''
batman --export-env | source batman --export-env | source
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
''; '';
##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
}; };
}; };
} }

17
modules/home/macos/sketchybar.nix
View file

@ -2,12 +2,18 @@
pkgs, pkgs,
lib, lib,
config, config,
host,
... ...
}: { }:
{
home.file = home.file =
lib.attrsets.mapAttrs (file: value: ( { }
lib.attrsets.overrideExisting value {enable = config.shared.darwin.tiling.enable;} // lib.optionalAttrs host.darwin (
)) { lib.attrsets.mapAttrs
(
file: value: (lib.attrsets.overrideExisting value { enable = config.shared.darwin.tiling.enable; })
)
{
sketchybarrc = { sketchybarrc = {
executable = true; executable = true;
target = ".config/sketchybar/sketchybarrc"; target = ".config/sketchybar/sketchybarrc";
@ -531,5 +537,6 @@
esac esac
''; '';
}; };
}; }
);
} }

6
modules/macos/system.nix
View file

@ -4,9 +4,11 @@
pkgs, pkgs,
lib, lib,
... ...
}: let }:
let
tiling = config.shared.darwin.tiling.enable; tiling = config.shared.darwin.tiling.enable;
in { in
{
# Use touchid or watch to activate sudo # Use touchid or watch to activate sudo
security.pam.services.sudo_local = { security.pam.services.sudo_local = {
enable = true; enable = true;

5
modules/neovim/default.nix
View file

@ -170,7 +170,10 @@
} }
]; ];
}; };
image.enable = true; image = {
enable = true;
math.enabled = false;
};
notifier.timeout = 3000; notifier.timeout = 3000;
picker = { picker = {
enable = true; enable = true;

1
modules/nixos/services.nix
View file

@ -24,6 +24,7 @@
desktopManager.cosmic.enable = true; desktopManager.cosmic.enable = true;
displayManager.cosmic-greeter.enable = true; displayManager.cosmic-greeter.enable = true;
desktopManager.cosmic.xwayland.enable = true;
# Auto mount devices # Auto mount devices
udisks2 = { udisks2 = {

5
modules/shared/nix.nix
View file

@ -1,4 +1,5 @@
{inputs, ...}: { { inputs, ... }:
{
nixpkgs.config = { nixpkgs.config = {
allowUnfree = true; allowUnfree = true;
}; };
@ -24,13 +25,11 @@
"https://cache.nixos.org/?priority=10" "https://cache.nixos.org/?priority=10"
"https://nix-community.cachix.org" "https://nix-community.cachix.org"
"https://cosmic.cachix.org/"
# For haskell # For haskell
"https://cache.iog.io" "https://cache.iog.io"
]; ];
trusted-public-keys = [ trusted-public-keys = [
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
"cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE="
# For haskell # For haskell
"hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=" "hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ="
]; ];

23
modules/shared/user-system-settings.nix
View file

@ -19,27 +19,4 @@
BROWSER = user.browser; BROWSER = user.browser;
}; };
stylix = lib.mkIf (user ? "theme" && user.theme != null) {
enable = false;
base16Scheme = "${pkgs.base16-schemes}/share/themes/${user.theme}.yaml";
fonts = lib.optionalAttrs (user ? "font") {
serif = {
package = pkgs.nerd-fonts.${user.font};
name = "${user.font} Nerd Font";
};
sansSerif = {
package = pkgs.nerd-fonts.${user.font};
name = "${user.font} Nerd Font";
};
monospace = {
package = pkgs.nerd-fonts.${user.font};
name = "${user.font} Nerd Font";
};
emoji = {
package = pkgs.twemoji-color-font;
name = "Twemoji Color";
};
};
};
} }

7
users/natalie/desktop/configuration.nix
View file

@ -84,8 +84,6 @@
hybrid-sleep.enable = false; hybrid-sleep.enable = false;
}; };
packages = [ pkgs.observatory ];
services.monitord.wantedBy = [ "multi-user.target" ]; services.monitord.wantedBy = [ "multi-user.target" ];
}; };
@ -148,7 +146,10 @@
]; ];
}; };
environment = { environment = {
sessionVariables.COSMIC_DATA_CONTROL_ENABLED = 1; sessionVariables = {
COSMIC_DATA_CONTROL_ENABLED = 1;
NIXOS_OZONE_WL = "1";
};
variables.EDITOR = "nvim"; variables.EDITOR = "nvim";
systemPackages = with pkgs; [ systemPackages = with pkgs; [

4
users/natalie/desktop/home.nix
View file

@ -8,6 +8,7 @@
... ...
}: }:
{ {
programs.mangohud.enable = true;
home = { home = {
stateVersion = "23.05"; # Please read the comment before changing. stateVersion = "23.05"; # Please read the comment before changing.
@ -29,6 +30,7 @@
wineWowPackages.stable wineWowPackages.stable
winetricks winetricks
(prismlauncher.override { gamemodeSupport = true; }) (prismlauncher.override { gamemodeSupport = true; })
umu-launcher
#window manager stuff #window manager stuff
wofi wofi
@ -50,8 +52,8 @@
signal-desktop signal-desktop
inputs.zls.packages.x86_64-linux.zls inputs.zls.packages.x86_64-linux.zls
rust-bin.stable.latest.default rust-bin.stable.latest.default
inputs.zen-browser.packages.x86_64-linux.default
]; ];
# programs.mangohud.enable = true;
}; };
# xdg.mimeApps.defaultApplications."inode/directory" = "dolphin.desktop"; # xdg.mimeApps.defaultApplications."inode/directory" = "dolphin.desktop";

3
users/natalie/home.nix
View file

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

7
users/natalie/laptop/configuration.nix
View file

@ -1,4 +1,5 @@
{pkgs, ...}: { { pkgs, ... }:
{
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
pinentry_mac pinentry_mac
]; ];
@ -6,9 +7,11 @@
# Custom configuration modules in "modules" are shared between users, # Custom configuration modules in "modules" are shared between users,
# and can be configured in this "shared" namespace # and can be configured in this "shared" namespace
shared.darwin = { shared.darwin = {
macAppStoreApps = ["wireguard"]; macAppStoreApps = [ "wireguard" ];
}; };
system.defaults.NSGlobalDomain."com.apple.trackpad.scaling" = 1.0;
# Create /etc/zshrc that loads the nix-darwin environment. # Create /etc/zshrc that loads the nix-darwin environment.
programs = { programs = {
gnupg.agent.enable = true; gnupg.agent.enable = true;

5
users/natalie/laptop/home.nix
View file

@ -15,5 +15,10 @@
sessionPath = [ sessionPath = [
"$HOME/.emacs.d/bin" "$HOME/.emacs.d/bin"
]; ];
packages = with pkgs; [
#PDF viewer for VimTeX
skimpdf
];
}; };
} }

22
users/natalie/packages.nix
View file

@ -1,6 +1,7 @@
# Packages installed with home-manager # Packages installed with home-manager
{pkgs, ...}: { pkgs, ... }:
with pkgs; [ with pkgs;
[
#general development #general development
just just
pkg-config pkg-config
@ -23,6 +24,7 @@ with pkgs; [
qemu qemu
podman podman
docker docker
devenv
#productivity #productivity
glance glance
@ -33,9 +35,10 @@ with pkgs; [
#nix tools #nix tools
direnv direnv
nh nh
(lix.override { aws-sdk-cpp = null; })
#terminal stuff #terminal stuff
(btop.override {cudaSupport = true;}) (btop.override { cudaSupport = true; })
tmux tmux
zellij zellij
lazygit lazygit
@ -62,15 +65,9 @@ with pkgs; [
#media #media
spotify spotify
zathura
#language servers #language servers
typst-live typst-live
lua-language-server
nil
nixd
texlab
texlivePackages.chktex
#formatters/linters #formatters/linters
stylua stylua
@ -79,14 +76,10 @@ with pkgs; [
#neovim deps #neovim deps
# TODO: from clo, maybe u can remove all of these? i don't wanna break tho # TODO: from clo, maybe u can remove all of these? i don't wanna break tho
lua51Packages.lua
lua51Packages.luarocks-nix
codespell
tree-sitter tree-sitter
zathura
#python #python
pyright pyright
basedpyright
ruff ruff
python312Packages.python python312Packages.python
python312Packages.pynvim python312Packages.pynvim
@ -107,7 +100,6 @@ with pkgs; [
#math #math
texlive.combined.scheme-full texlive.combined.scheme-full
zathura
#fun things #fun things
cowsay cowsay

4
users/natalie/user.nix
View file

@ -3,11 +3,11 @@ rec {
name = "Natalie"; # name/identifier name = "Natalie"; # name/identifier
email = "nmarks413@gmail.com"; # email (used for certain configurations) email = "nmarks413@gmail.com"; # email (used for certain configurations)
dotfilesDir = "~/.dotfiles"; # absolute path of the local repo dotfilesDir = "~/.dotfiles"; # absolute path of the local repo
theme = "catppuccin-mocha"; # name of theme that stylix will use theme = null; # name of theme that stylix will use
browser = "firefox"; # Default browser; must select one from ./user/app/browser/ browser = "firefox"; # Default browser; must select one from ./user/app/browser/
term = "ghostty"; # Default terminal command; term = "ghostty"; # Default terminal command;
font = "iosevka"; # Selected font font = "iosevka"; # Selected font
editor = "neovim"; # Default editor; editor = "nvim"; # Default editor;
timeZone = "America/Los_Angeles"; timeZone = "America/Los_Angeles";
sexuality = "bisexual"; sexuality = "bisexual";
} }

50
users/natalie/vim.nix
View file

@ -1,8 +1,14 @@
{pkgs, ...}: { { pkgs, ... }:
{
imports = [ imports = [
./vim/default.nix ./vim/default.nix
]; ];
vim = { vim = {
#enable python provider
withPython3 = true;
python3Packages = [ "pynvim" ];
options = { options = {
tabstop = 2; tabstop = 2;
softtabstop = 2; softtabstop = 2;
@ -14,10 +20,52 @@
foldcolumn = "1"; foldcolumn = "1";
foldlevelstart = 99; foldlevelstart = 99;
foldenable = true; foldenable = true;
foldmethod = "expr";
#Default to treesitter folding
foldexpr = "v:lua.vim.treesitter.foldexpr()";
}; };
autocmds = [ autocmds = [
#Autocommand to fall back to treesitter folding if LSP doesnt support it
{
event = [ "LspAttach" ];
callback = pkgs.lib.generators.mkLuaInline ''
function(args)
local client = vim.lsp.get_client_by_id(args.data.client_id)
if client:supports_method('textDocument/foldingRange') then
local win = vim.api.nvim_get_current_win()
vim.wo[win][0].foldexpr = 'v:lua.vim.lsp.foldexpr()'
end
end
'';
}
]; ];
tabline = {
nvimBufferline.enable = true;
};
# nvf versions is VERY outdated
# pluginOverrides = {
# hardtime-nvim = pkgs.fetchFromGitHub {
# owner = "m4xshen";
# repo = "hardtime.nvim";
# rev = "v1.0.1";
# hash = "sha256-5tqiSuGvBJcr8l6anEBojXEaaxFS1P5T1ROr46ylVhk=";
# };
# };
startPlugins = [
"nui-nvim"
];
binds = {
hardtime-nvim = {
enable = false;
setupOpts = {
disable_mouse = false;
restriction_mode = "warn";
};
};
};
theme = { theme = {
name = "catppuccin"; name = "catppuccin";
style = "mocha"; style = "mocha";

16
users/natalie/vim/coq.nix Normal file
View file

@ -0,0 +1,16 @@
{ pkgs, ... }:
{
vim = {
# extraPackages = with pkgs; [
# coq_8_20
# coqPackages_8_20.stdlib
# ];
extraPlugins.Coqtail = {
# enabled = true;
package = pkgs.vimPlugins.Coqtail;
# lazy = true;
# ft = "coq";
};
};
}

8
users/natalie/vim/default.nix
View file

@ -1,8 +1,12 @@
{...}: { { ... }:
{
imports = [ imports = [
./keybinds.nix ./keybinds.nix
./languages.nix ./languages.nix
./latex.nix ./latex.nix
./lean.nix
./coq.nix
./visuals.nix
./mini.nix
]; ];
} }

1
users/natalie/vim/keybinds.nix
View file

@ -19,7 +19,6 @@ in
(mkKeymap "n" "<leader>ff" ":lua require('snacks').picker.files()<CR>" "Find File") (mkKeymap "n" "<leader>ff" ":lua require('snacks').picker.files()<CR>" "Find File")
(mkKeymap "n" "<leader>fg" ":lua require('snacks').picker.grep()<CR>" "Grep Files") (mkKeymap "n" "<leader>fg" ":lua require('snacks').picker.grep()<CR>" "Grep Files")
# Lsp # Lsp
(mkKeymap "n" "K" ":Lspsaga hover_doc<CR>" "Hover docs")
(mkKeymap "n" "lr" ":lua vim.lsp.buf.rename()<CR>" "Rename") (mkKeymap "n" "lr" ":lua vim.lsp.buf.rename()<CR>" "Rename")
# (mkKeymap "n" "<leader>th" ":lua function() vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled()) end<CR>" "Toggle Inlay Hints") # (mkKeymap "n" "<leader>th" ":lua function() vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled()) end<CR>" "Toggle Inlay Hints")
]; ];

126
users/natalie/vim/languages.nix
View file

@ -4,56 +4,57 @@
host, host,
pkgs, pkgs,
... ...
}: let }:
darwin = {
if host.darwin
then "darwin"
else "nixos";
flakePath = "/${
if host.darwin
then "Users"
else "home"
}/${user.username}/.dotfiles";
# BIG HACK DO NOT DO PLS
hostname =
if host.darwin
then "Natalies-MacBook-Air"
else "nixos";
in {
vim = { vim = {
extraPackages = with pkgs; [ extraPackages = with pkgs; [
python312Packages.pylatexenc python312Packages.pylatexenc
nixd
]; ];
lsp = { lsp = {
formatOnSave = true;
lightbulb.enable = false; lightbulb.enable = false;
lspsaga = { # lspsaga = {
enable = true; # enable = true;
setupOpts = { # setupOpts = {
lightbulb = { # lightbulb = {
virtual_text = false; # virtual_text = false;
}; # };
}; # };
}; # };
nvim-docs-view.enable = true;
inlayHints.enable = true; inlayHints.enable = true;
servers.nixd.settings.nixd = { servers = {
nixpkgs.expr = ''import "<nixpkgs>" { }''; nil = {
settings.nil.nix.flake = {
autoArchive = true;
autoEvalInputs = true;
};
};
nixd = {
settings.nixd = {
nixpkgs.expr = ''import "${flake.inputs.nixpkgs}" { }'';
options = options =
{ {
home-manager = { home-manager = {
expr = ''(builtins.getFlake "${flakePath}").${darwin}Configurations.${hostname}.options.home-manager.users.type.getSubOptions [ ]''; 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'';
# (builtins.getFlake "${flakePath}").${darwin}Configurations.${hostname}.options.home-manager.users.type.getSubOptions [ ]'';
}; };
} }
// pkgs.lib.optionalAttrs host.darwin { // pkgs.lib.optionalAttrs host.darwin {
nix-darwin = { nix-darwin = {
expr = ''(builtins.getFlake "${flakePath}").darwinConfigurations.${hostname}.options''; expr = ''(let pkgs = import "${flake.inputs.nixpkgs}" { }; in (pkgs.lib.evalModules { modules = (import "${flake.inputs.darwin}/modules/module-list.nix"); check = false;})).options'';
# (builtins.getFlake "${flakePath}").darwinConfigurations.${hostname}.options'';
}; };
} }
// pkgs.lib.optionalAttrs host.linux { // pkgs.lib.optionalAttrs host.linux {
nixos = { nixos = {
expr = ''(builtins.getFlake "${flakePath}").nixosConfigurations.${hostname}.options''; expr = ''(let pkgs = import "${flake.inputs.nixpkgs}" { }; in (pkgs.lib.evalModules { modules = (import "${flake.inputs.nixpkgs}/nixos/modules/module-list.nix"); check = false;})).options'';
# (builtins.getFlake "${flakePath}").nixosConfigurations.${hostname}.options'';
};
};
}; };
}; };
}; };
@ -63,7 +64,7 @@ in {
goToDefinition = "gd"; goToDefinition = "gd";
listReferences = "gr"; listReferences = "gr";
goToType = "gy"; goToType = "gy";
hover = null; hover = "K";
nextDiagnostic = "<leader>d"; nextDiagnostic = "<leader>d";
openDiagnosticFloat = "<leader>df"; openDiagnosticFloat = "<leader>df";
renameSymbol = "rn"; renameSymbol = "rn";
@ -88,24 +89,42 @@ in {
enable = true; enable = true;
}; };
}; };
nix.format.enable = true;
}; };
formatter.conform-nvim = { formatter.conform-nvim = {
enable = true; enable = true;
setupOpts = { setupOpts = {
formatters_by_ft = { formatters_by_ft = {
fish = ["fish_indent"]; fish = [ "fish_indent" ];
tex = ["latexindent"]; tex = [ "latexindent" ];
}; };
}; };
}; };
diagnostics = {
diagnostics.nvim-lint = { enable = true;
config = {
virtual_text = {
format = pkgs.lib.generators.mkLuaInline ''
function(diagnostic)
return string.format("%s (%s)", diagnostic.message, diagnostic.source)
end
'';
};
};
nvim-lint = {
enable = true; enable = true;
linters_by_ft = { linters_by_ft = {
nix = ["statix"]; nix = [ "statix" ];
tex = ["chktex"]; tex = [ "chktex" ];
haskell = ["hlint"]; haskell = [ "hlint" ];
};
linters = {
chktex = {
ignore_exitcode = true;
};
};
}; };
}; };
treesitter = { treesitter = {
@ -167,5 +186,32 @@ in {
}; };
}; };
}; };
lazy.plugins."blink.pairs" = {
enabled = true;
package = pkgs.vimPlugins.blink-pairs;
setupModule = "blink.pairs";
setupOpts = {
mappings = {
# -- you can call require("blink.pairs.mappings").enable() and require("blink.pairs.mappings").disable() to enable/disable mappings at runtime
enabled = true;
# -- see the defaults: https://github.com/Saghen/blink.pairs/blob/main/lua/blink/pairs/config/mappings.lua#L10
pairs = [ ];
};
highlights = {
enabled = true;
groups = [
"BlinkPairsOrange"
"BlinkPairsPurple"
"BlinkPairsBlue"
];
matchparen = {
enabled = true;
group = "MatchParen";
};
};
debug = false;
};
};
}; };
} }

74
users/natalie/vim/latex.nix
View file

@ -1,22 +1,29 @@
{pkgs, ...}: { { pkgs, host, ... }:
{
vim = { vim = {
lazy.plugins.cmp-vimtex = {
enabled = true;
package = pkgs.vimPlugins.cmp-vimtex;
lazy = false;
};
lazy.plugins.vimtex = { lazy.plugins.vimtex = {
enabled = true; enabled = true;
package = pkgs.vimPlugins.vimtex; package = pkgs.vimPlugins.vimtex;
lazy = true; lazy = false;
ft = "tex";
}; };
globals = { globals = {
tex_flavor = "latex"; tex_flavor = "latex";
maplocalleader = "\\"; maplocalleader = "\\";
vimtex_compiler_method = "latexmk"; vimtex_compiler_method = "latexmk";
vimtex_view_method = "zathura"; vimtex_view_method = if host.darwin then "skim" else "zathura";
vimtex_view_automatic = 1;
vimtex_compiler_latexmk = { vimtex_compiler_latexmk = {
callback = 1; callback = 1;
continuous = 1; continuous = 1;
executable = "latexmk"; executable = "latexmk";
hooks = []; hooks = [ ];
options = [ options = [
"-verbose" "-verbose"
"-file-line-error" "-file-line-error"
@ -37,12 +44,65 @@
]; ];
}; };
autocomplete.blink-cmp = {
sourcePlugins = {
"blink.compat" = {
enable = true;
package = "blink-compat";
module = "blink.compat.source";
};
};
setupOpts = {
sources = {
default = [ "vimtex" ];
providers = {
vimtex = {
name = "vimtex";
module = "blink.compat.source";
score_offset = 100;
};
};
};
};
};
augroups = [
{
name = "VimTeX Events";
}
];
autocmds = [
{
pattern = [ "VimtexEventViewReverse" ];
event = [ "User" ];
desc = "Return to nvim after reverse search";
command = "call b:vimtex.viewer.xdo_focus_vim()";
group = "VimTeX Events";
}
{
pattern = [ "VimtexEventQuit" ];
event = [ "User" ];
desc = "Close pdf after exiting nvim";
command = "VimtexClean";
group = "VimTeX Events";
}
{
pattern = [ "VimtexEventInitPost" ];
event = [ "User" ];
desc = "Start compiling when opening nvim to a tex file";
command = "VimtexCompile";
group = "VimTeX Events";
}
];
lsp = { lsp = {
servers = { servers = {
texlab = { texlab = {
enable = true; enable = true;
cmd = ["${pkgs.texlab}/bin/texlab"]; cmd = [ "${pkgs.texlab}/bin/texlab" ];
filetypes = ["tex"]; filetypes = [ "tex" ];
}; };
}; };
}; };

11
users/natalie/vim/lean.nix Normal file
View file

@ -0,0 +1,11 @@
{ pkgs, ... }:
{
vim = {
lazy.plugins."lean.nvim" = {
enabled = true;
package = pkgs.vimPlugins.lean-nvim;
lazy = true;
ft = "lean";
};
};
}

9
users/natalie/vim/mini.nix Normal file
View file

@ -0,0 +1,9 @@
{ pkgs, ... }:
{
vim = {
mini = {
icons.enable = true;
ai.enable = true;
};
};
}

38
users/natalie/vim/visuals.nix Normal file
View file

@ -0,0 +1,38 @@
{ pkgs, ... }:
{
vim = {
visuals = {
indent-blankline = {
enable = true;
};
};
ui = {
noice = {
enable = true;
setupOpts = {
lsp = {
progress.enabled = false;
signature.enabled = true;
};
presets = {
lsp_doc_border = true;
long_message_to_split = true;
inc_rename = false;
command_palette = false;
bottom_search = true;
};
};
};
borders = {
enable = true;
};
};
# Better help docs
lazy.plugins."helpview.nvim" = {
enabled = true;
package = pkgs.vimPlugins.helpview-nvim;
lazy = false;
};
};
}