noah/dotfiles
1
0
Fork 0
mirror of https://github.com/nmasur/dotfiles synced 2025-04-04 23:51:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

reorg flake lines and remove unnecessary stanzas

Browse Source
This commit is contained in:
Noah Masur 2025-03-17 11:38:50 -04:00
parent 852ecf0b91
commit 38906a802d
No known key found for this signature in database
1 changed files with 31 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

132
flake.nix
View File

@ -58,49 +58,12 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
# # Tree-Sitter Grammars
# tree-sitter-bash = {
# url = "github:tree-sitter/tree-sitter-bash/master";
# flake = false;
# };
# tree-sitter-python = {
# url = "github:tree-sitter/tree-sitter-python/master";
# flake = false;
# };
# tree-sitter-lua = {
# url = "github:MunifTanjim/tree-sitter-lua/main";
# flake = false;
# };
# tree-sitter-ini = {
# url = "github:justinmk/tree-sitter-ini";
# flake = false;
# };
# tree-sitter-puppet = {
# url = "github:amaanq/tree-sitter-puppet";
# flake = false;
# };
# tree-sitter-rasi = {
# url = "github:Fymyte/tree-sitter-rasi";
# flake = false;
# };
# tree-sitter-vimdoc = {
# url = "github:neovim/tree-sitter-vimdoc";
# flake = false;
# };
# MPV Scripts # MPV Scripts
zenyd-mpv-scripts = { zenyd-mpv-scripts = {
url = "github:zenyd/mpv-scripts"; url = "github:zenyd/mpv-scripts";
flake = false; flake = false;
}; };
# # Git alternative
# # Fixes: https://github.com/martinvonz/jj/issues/4784
# jujutsu = {
# url = "github:martinvonz/jj";
# inputs.nixpkgs.follows = "nixpkgs";
# };
# Nextcloud Apps # Nextcloud Apps
nextcloud-news = { nextcloud-news = {
# https://github.com/nextcloud/news/releases # https://github.com/nextcloud/news/releases
@ -130,50 +93,40 @@
{ nixpkgs, ... }@inputs: { nixpkgs, ... }@inputs:
let let
lib = import ./lib inputs; hostnames =
# Global configuration for my systems
globals =
let let
baseName = "masu.rs"; baseName = "masu.rs";
in in
rec { {
user = "noah"; audiobooks = "read.${baseName}";
fullName = "Noah Masur"; books = "books.${baseName}";
gitName = fullName; budget = "money.${baseName}";
gitEmail = "7386960+nmasur@users.noreply.github.com"; content = "cloud.${baseName}";
dotfilesRepo = "https://github.com/nmasur/dotfiles"; download = "download.${baseName}";
hostnames = { files = "files.${baseName}";
audiobooks = "read.${baseName}"; git = "git.${baseName}";
books = "books.${baseName}"; imap = "imap.purelymail.com";
budget = "money.${baseName}"; influxdb = "influxdb.${baseName}";
content = "cloud.${baseName}"; irc = "irc.${baseName}";
download = "download.${baseName}"; mail = "noahmasur.com";
files = "files.${baseName}"; metrics = "metrics.${baseName}";
git = "git.${baseName}"; minecraft = "minecraft.${baseName}";
imap = "imap.purelymail.com"; n8n = "n8n.${baseName}";
influxdb = "influxdb.${baseName}"; notifications = "ntfy.${baseName}";
irc = "irc.${baseName}"; paperless = "paper.${baseName}";
mail = "noahmasur.com"; photos = "photos.${baseName}";
metrics = "metrics.${baseName}"; prometheus = "prom.${baseName}";
minecraft = "minecraft.${baseName}"; secrets = "vault.${baseName}";
n8n = "n8n.${baseName}"; smtp = "smtp.purelymail.com";
notifications = "ntfy.${baseName}"; status = "status.${baseName}";
paperless = "paper.${baseName}"; stream = "stream.${baseName}";
photos = "photos.${baseName}"; transmission = "transmission.${baseName}";
prometheus = "prom.${baseName}";
secrets = "vault.${baseName}";
smtp = "smtp.purelymail.com";
status = "status.${baseName}";
stream = "stream.${baseName}";
transmission = "transmission.${baseName}";
};
}; };
in in
rec { rec {
inherit lib; lib = import ./lib inputs;
nixosConfigurations = builtins.mapAttrs ( nixosConfigurations = builtins.mapAttrs (
system: hosts: system: hosts:
@ -181,28 +134,18 @@
name: module: name: module:
lib.buildNixos { lib.buildNixos {
inherit system module; inherit system module;
specialArgs = { inherit (globals) hostnames; }; specialArgs = { inherit hostnames; };
} }
) hosts ) hosts
) lib.linuxHosts; ) lib.linuxHosts;
# darwinConfigurations = {
# aarch64-darwin = {
# lookingglass = lib.buildDarwin {
# system = "aarch64-darwin";
# module = { };
# specialArgs = { };
# };
# };
# };
darwinConfigurations = builtins.mapAttrs ( darwinConfigurations = builtins.mapAttrs (
system: hosts: system: hosts:
builtins.mapAttrs ( builtins.mapAttrs (
name: module: name: module:
lib.buildDarwin { lib.buildDarwin {
inherit system module; inherit system module;
specialArgs = { inherit (globals) hostnames; }; specialArgs = { inherit hostnames; };
} }
) hosts ) hosts
) lib.darwinHosts; ) lib.darwinHosts;
@ -220,7 +163,7 @@
name: module: name: module:
lib.buildHome { lib.buildHome {
inherit system module; inherit system module;
specialArgs = { inherit (globals) hostnames; }; specialArgs = { inherit hostnames; };
} }
) hosts ) hosts
) homeModules; ) homeModules;
@ -230,31 +173,18 @@
root = import ./hosts/x86_64-linux/swan/root.nix; root = import ./hosts/x86_64-linux/swan/root.nix;
}; };
# generators = {
# arrow.aws.x86_64-linux = lib.generateImage {
# system = "x86_64-linux";
# format = "amazon";
# specialArgs = { inherit (globals) hostnames; };
# };
# arrow.iso.x86_64-linux = lib.generateImage {
# system = "x86_64-linux";
# format = "iso";
# specialArgs = { inherit (globals) hostnames; };
# };
# };
generators = builtins.mapAttrs ( generators = builtins.mapAttrs (
system: hosts: system: hosts:
builtins.mapAttrs (name: module: { builtins.mapAttrs (name: module: {
aws = lib.generateImage { aws = lib.generateImage {
inherit system module; inherit system module;
format = "amazon"; format = "amazon";
specialArgs = { inherit (globals) hostnames; }; specialArgs = { inherit hostnames; };
}; };
iso = lib.generateImage { iso = lib.generateImage {
inherit system module; inherit system module;
format = "iso"; format = "iso";
specialArgs = { inherit (globals) hostnames; }; specialArgs = { inherit hostnames; };
}; };
}) hosts }) hosts
) lib.linuxHosts; ) lib.linuxHosts;