bill
/
deployed-nixos-server-and-apps
1
1
Fork 0
Code

Compare commits

base: bill:f8cbde73b14404681db5bb82939b6624c266eb98
Branches Tags
bill:main
...
compare: bill:92abe8b6cd85422d2533367cf6a7b24bb89d3d08
Branches Tags
bill:main

2 Commits
f8cbde73b1 ... 92abe8b6cd

Author SHA1 Message Date
Bill Ewanick 92abe8b6cd Try adding flake-parts site 2025-07-20 17:12:03 -04:00
Bill Ewanick b7226bd567 Remove Hydra 2025-07-20 17:11:50 -04:00
2 changed files with 468 additions and 7 deletions
Show Stats Expand all files Collapse all files

464
flake.lock
View File

@ -16,6 +16,56 @@
"type": "github" "type": "github"
} }
}, },
"commonmark-simple_2": {
"flake": false,
"locked": {
"lastModified": 1742576519,
"narHash": "sha256-/Vauu9JiLcJOElH/brswcF1XbEXq8yA2q/8rcXzj+kE=",
"owner": "srid",
"repo": "commonmark-simple",
"rev": "1d69703c7f625905a84cfb79983ca2a5817743bc",
"type": "github"
},
"original": {
"owner": "srid",
"repo": "commonmark-simple",
"type": "github"
}
},
"commonmark-wikilink": {
"flake": false,
"locked": {
"lastModified": 1738248145,
"narHash": "sha256-UN2Nh+uf+DzM336Ojzr6YZV4RJy8BPx9Q5GZpax3wt0=",
"owner": "srid",
"repo": "commonmark-wikilink",
"rev": "1d7aa327fb33b41f3c4899d5b29aa122780c900f",
"type": "github"
},
"original": {
"owner": "srid",
"repo": "commonmark-wikilink",
"type": "github"
}
},
"devshell": {
"inputs": {
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1741473158,
"narHash": "sha256-kWNaq6wQUbUMlPgw8Y+9/9wP0F8SHkjy24/mN3UAppg=",
"owner": "numtide",
"repo": "devshell",
"rev": "7c9e793ebe66bcba8292989a68c0419b737a22a0",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "devshell",
"type": "github"
}
},
"ema": { "ema": {
"inputs": { "inputs": {
"flake-parts": [ "flake-parts": [
@ -54,6 +104,22 @@
"type": "github" "type": "github"
} }
}, },
"ema_2": {
"flake": false,
"locked": {
"lastModified": 1745123527,
"narHash": "sha256-FD6GJaiiKkH65N7iDjHtOtaEcWMf1P/t98kktILSkcg=",
"owner": "srid",
"repo": "ema",
"rev": "8590cc91e1f3dc3e10409d914c40a484645a2680",
"type": "github"
},
"original": {
"owner": "srid",
"repo": "ema",
"type": "github"
}
},
"emanote": { "emanote": {
"inputs": { "inputs": {
"commonmark-simple": "commonmark-simple", "commonmark-simple": "commonmark-simple",
@ -82,6 +148,68 @@
"type": "github" "type": "github"
} }
}, },
"emanote-template": {
"flake": false,
"locked": {
"lastModified": 1745726040,
"narHash": "sha256-cLL9ylGe1OoN/KSX7+FRW3j8rm5iPTCleOJGSdOfdE0=",
"owner": "srid",
"repo": "emanote-template",
"rev": "1475b182fc136fc5da3a3b3e2b9be90795af19bb",
"type": "github"
},
"original": {
"owner": "srid",
"repo": "emanote-template",
"type": "github"
}
},
"emanote_2": {
"inputs": {
"commonmark-simple": "commonmark-simple_2",
"commonmark-wikilink": "commonmark-wikilink",
"ema": "ema_2",
"emanote-template": "emanote-template",
"flake-parts": "flake-parts_2",
"flake-root": "flake-root_2",
"haskell-flake": "haskell-flake_2",
"heist-extra": "heist-extra_2",
"lvar": "lvar",
"nixos-unified": "nixos-unified",
"nixpkgs": "nixpkgs_4",
"treefmt-nix": "treefmt-nix_2",
"unionmount": "unionmount_2"
},
"locked": {
"lastModified": 1753040695,
"narHash": "sha256-dpOcuQ1eIF6mmjA4b3eGreoYIpffevdhqxs/ykq/IxI=",
"owner": "srid",
"repo": "emanote",
"rev": "fa5d7125fe32c3b25ee271f3b4013753880519f0",
"type": "github"
},
"original": {
"owner": "srid",
"repo": "emanote",
"type": "github"
}
},
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-parts": { "flake-parts": {
"inputs": { "inputs": {
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
@ -100,6 +228,46 @@
"type": "github" "type": "github"
} }
}, },
"flake-parts_2": {
"inputs": {
"nixpkgs-lib": [
"osds-site",
"emanote",
"nixpkgs"
]
},
"locked": {
"lastModified": 1751413152,
"narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "77826244401ea9de6e3bac47c2db46005e1f30b5",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-parts_3": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib_2"
},
"locked": {
"lastModified": 1751413152,
"narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "77826244401ea9de6e3bac47c2db46005e1f30b5",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-root": { "flake-root": {
"locked": { "locked": {
"lastModified": 1692742795, "lastModified": 1692742795,
@ -115,6 +283,63 @@
"type": "github" "type": "github"
} }
}, },
"flake-root_2": {
"locked": {
"lastModified": 1723604017,
"narHash": "sha256-rBtQ8gg+Dn4Sx/s+pvjdq3CB2wQNzx9XGFq/JVGCB6k=",
"owner": "srid",
"repo": "flake-root",
"rev": "b759a56851e10cb13f6b8e5698af7b59c44be26e",
"type": "github"
},
"original": {
"owner": "srid",
"repo": "flake-root",
"type": "github"
}
},
"git-hooks-nix": {
"inputs": {
"flake-compat": "flake-compat",
"gitignore": "gitignore",
"nixpkgs": "nixpkgs_5"
},
"locked": {
"lastModified": 1750779888,
"narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d",
"type": "github"
},
"original": {
"owner": "cachix",
"repo": "git-hooks.nix",
"type": "github"
}
},
"gitignore": {
"inputs": {
"nixpkgs": [
"osds-site",
"git-hooks-nix",
"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"
}
},
"haskell-flake": { "haskell-flake": {
"locked": { "locked": {
"lastModified": 1705067885, "lastModified": 1705067885,
@ -130,6 +355,21 @@
"type": "github" "type": "github"
} }
}, },
"haskell-flake_2": {
"locked": {
"lastModified": 1752499668,
"narHash": "sha256-Yif99ho8GNgXP0l9vxPHCKi7X16Cf7rwVd+HW1cMVeQ=",
"owner": "srid",
"repo": "haskell-flake",
"rev": "39065472d2587af93a502423276bfb98c2c6fb09",
"type": "github"
},
"original": {
"owner": "srid",
"repo": "haskell-flake",
"type": "github"
}
},
"heist-extra": { "heist-extra": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -146,6 +386,53 @@
"type": "github" "type": "github"
} }
}, },
"heist-extra_2": {
"flake": false,
"locked": {
"lastModified": 1737313814,
"narHash": "sha256-WCXhs/xhCR4CKBEadQjqqgUb47bLzDY7P7oL5cSgDHc=",
"owner": "srid",
"repo": "heist-extra",
"rev": "6f73e000a34b7c054b516b9504b5a7ed08ce6a2d",
"type": "github"
},
"original": {
"owner": "srid",
"repo": "heist-extra",
"type": "github"
}
},
"lvar": {
"flake": false,
"locked": {
"lastModified": 1745122737,
"narHash": "sha256-ZnYXkkPmnNvt4tA45JgSC7dpttmqhUo4AHfEjB1r1gE=",
"owner": "srid",
"repo": "lvar",
"rev": "047a24c4dcd7f85f9c18058f6be991cea531870e",
"type": "github"
},
"original": {
"owner": "srid",
"repo": "lvar",
"type": "github"
}
},
"nixos-unified": {
"locked": {
"lastModified": 1751174231,
"narHash": "sha256-OLPo3ZI/gKH0C6P6l2W9RYm1ow/Jl4qBrasQ3rjAA0E=",
"owner": "srid",
"repo": "nixos-unified",
"rev": "05eb3d59d3b48460ea01c419702d4fc0c3210805",
"type": "github"
},
"original": {
"owner": "srid",
"repo": "nixos-unified",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1704842529, "lastModified": 1704842529,
@ -180,6 +467,21 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-lib_2": {
"locked": {
"lastModified": 1751159883,
"narHash": "sha256-urW/Ylk9FIfvXfliA1ywh75yszAbiTEVgpPeinFyVZo=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "14a40a1d7fb9afa4739275ac642ed7301a9ba1ab",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixpkgs.lib",
"type": "github"
}
},
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1705183652, "lastModified": 1705183652,
@ -196,6 +498,109 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_3": {
"locked": {
"lastModified": 1722073938,
"narHash": "sha256-OpX0StkL8vpXyWOGUD6G+MA26wAXK6SpT94kLJXo6B4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "e36e9f57337d0ff0cf77aceb58af4c805472bfae",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1752900028,
"narHash": "sha256-dPALCtmik9Wr14MGqVXm+OQcv7vhPBXcWNIOThGnB/Q=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "6b4955211758ba47fac850c040a27f23b9b4008f",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_5": {
"locked": {
"lastModified": 1730768919,
"narHash": "sha256-8AKquNnnSaJRXZxc5YmF/WfmxiHX6MMZZasRP6RRQkE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a04d33c0c3f1a59a2c1cb0c6e34cd24500e5a1dc",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_6": {
"locked": {
"lastModified": 1752950548,
"narHash": "sha256-NS6BLD0lxOrnCiEOcvQCDVPXafX1/ek1dfJHX1nUIzc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c87b95e25065c028d31a94f06a62927d18763fdf",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_7": {
"locked": {
"lastModified": 1747958103,
"narHash": "sha256-qmmFCrfBwSHoWw7cVK4Aj+fns+c54EBP8cGqp/yK410=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "fe51d34885f7b5e3e7b59572796e1bcb427eccb1",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"osds-site": {
"inputs": {
"devshell": "devshell",
"emanote": "emanote_2",
"flake-parts": "flake-parts_3",
"git-hooks-nix": "git-hooks-nix",
"nixpkgs": "nixpkgs_6",
"treefmt-nix": "treefmt-nix_3"
},
"locked": {
"lastModified": 1753043365,
"narHash": "sha256-asHvMrxozzTIG/enqK4mV4QEOaqpkJ+Uyh5mohGnkNU=",
"ref": "refs/heads/main",
"rev": "0828b30631731c9cc62143970af2cac9ae60e5ae",
"revCount": 2,
"type": "git",
"url": "https://git.ewanick.com/bill/osds-site"
},
"original": {
"type": "git",
"url": "https://git.ewanick.com/bill/osds-site"
}
},
"root": { "root": {
"inputs": { "inputs": {
"emanote": "emanote", "emanote": "emanote",
@ -203,7 +608,8 @@
"emanote", "emanote",
"flake-parts" "flake-parts"
], ],
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2",
"osds-site": "osds-site"
} }
}, },
"systems": { "systems": {
@ -242,6 +648,46 @@
"type": "github" "type": "github"
} }
}, },
"treefmt-nix_2": {
"inputs": {
"nixpkgs": [
"osds-site",
"emanote",
"nixpkgs"
]
},
"locked": {
"lastModified": 1752909129,
"narHash": "sha256-Eh8FkMvGRaY71BU/oyZTTzt9RsBIq2E6j0r3eLZ/2kY=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "0043b95d80b5bf6d61e84d237e2007727f4dd38d",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
},
"treefmt-nix_3": {
"inputs": {
"nixpkgs": "nixpkgs_7"
},
"locked": {
"lastModified": 1753006367,
"narHash": "sha256-tzbhc4XttkyEhswByk5R38l+ztN9UDbnj0cTcP6Hp9A=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "421b56313c65a0815a52b424777f55acf0b56ddf",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
},
"unionmount": { "unionmount": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -257,6 +703,22 @@
"repo": "unionmount", "repo": "unionmount",
"type": "github" "type": "github"
} }
},
"unionmount_2": {
"flake": false,
"locked": {
"lastModified": 1742156722,
"narHash": "sha256-5oRYBxnxo/YK2nUdrRdDCatkPWDwSGw4zG67mOATxcU=",
"owner": "srid",
"repo": "unionmount",
"rev": "0349ae3e16e803101cbdd9c056e6b052f8817cba",
"type": "github"
},
"original": {
"owner": "srid",
"repo": "unionmount",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

11
flake.nix
View File

@ -13,6 +13,8 @@
emanote.inputs.emanote-template.follows = ""; emanote.inputs.emanote-template.follows = "";
flake-parts.follows = "emanote/flake-parts"; flake-parts.follows = "emanote/flake-parts";
# nixpkgs.follows = "emanote/nixpkgs"; # nixpkgs.follows = "emanote/nixpkgs";
osds-site.url = "git+https://git.ewanick.com/bill/osds-site";
}; };
outputs = outputs =
@ -20,6 +22,7 @@
self, self,
nixpkgs, nixpkgs,
emanote, emanote,
osds-site,
... ...
}: }:
{ {
@ -29,13 +32,9 @@
./server-config/configuration.nix ./server-config/configuration.nix
./nixos-apps ./nixos-apps
];
};
hydraJobs = { osds-site
inherit (self) ];
nixosConfigurations
;
}; };
}; };
} }