refactor: rename nas to nos
All checks were successful
Discord / discord commits (push) Has been skipped
All checks were successful
Discord / discord commits (push) Has been skipped
This commit is contained in:
parent
b837ee2943
commit
f277c78ac1
74 changed files with 7 additions and 6 deletions
|
|
@ -19,6 +19,7 @@
|
||||||
home-manager.nixosModules.home-manager
|
home-manager.nixosModules.home-manager
|
||||||
|
|
||||||
../modules/arion
|
../modules/arion
|
||||||
|
../modules/borgbackup.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
nixpkgs = {
|
nixpkgs = {
|
||||||
|
|
|
||||||
|
|
@ -8,8 +8,8 @@ This directory encompasses every device's main configuration file.
|
||||||
| ---------- | ------------------------------------------------------------------------------------------------------- |
|
| ---------- | ------------------------------------------------------------------------------------------------------- |
|
||||||
| `android` | My [Nix-On-Droid](https://github.com/nix-community/nix-on-droid) configuration for my OnePlus 9 Pro |
|
| `android` | My [Nix-On-Droid](https://github.com/nix-community/nix-on-droid) configuration for my OnePlus 9 Pro |
|
||||||
| `binto` | My desktop PC with a multi-monitor setup and an NVIDIA (cringe) 3070 |
|
| `binto` | My desktop PC with a multi-monitor setup and an NVIDIA (cringe) 3070 |
|
||||||
| `cluster` | Two Lenovo mini pcs that make use of [NixOS-pcsd](https://github.com/matt1432/nixos-pcsd) to form a cluster |
|
| `cluster` | Two Lenovo mini PCs that make use of [NixOS-pcsd](https://github.com/matt1432/nixos-pcsd) to form a cluster |
|
||||||
| `nas` | My current custom built server running Proxmox. Conversion to NixOS wip |
|
| `nos` | My current custom built server running Proxmox. Conversion to NixOS wip |
|
||||||
| `oksys` | A very old Acer laptop that went from sailing the seas for years to becoming my web server and VPN host. It is now retired indefinitely. |
|
| `oksys` | A very old Acer laptop that went from sailing the seas for years to becoming my web server and VPN host. It is now retired indefinitely. |
|
||||||
| `servivi` | A gaming PC in a previous life, it is now used to slowly convert my Proxmox server to NixOS |
|
| `servivi` | A gaming PC in a previous life, it is now used to slowly convert my Proxmox server to NixOS |
|
||||||
| `wim` | My 2-1 Lenovo Laptop that I use for uni |
|
| `wim` | My 2-1 Lenovo Laptop that I use for uni |
|
||||||
|
|
|
||||||
|
|
@ -2,9 +2,7 @@
|
||||||
{...}: {
|
{...}: {
|
||||||
imports = [
|
imports = [
|
||||||
./modules/arion
|
./modules/arion
|
||||||
./modules/borgbackup.nix
|
|
||||||
./modules/mergerfs.nix
|
./modules/mergerfs.nix
|
||||||
./modules/nfs.nix
|
|
||||||
./modules/qbittorrent
|
./modules/qbittorrent
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
@ -10,9 +10,10 @@ in {
|
||||||
|
|
||||||
./modules/binary-cache.nix
|
./modules/binary-cache.nix
|
||||||
./modules/minecraft.nix
|
./modules/minecraft.nix
|
||||||
|
./modules/nfs.nix
|
||||||
|
|
||||||
# WIP
|
# WIP
|
||||||
../nas
|
../nos
|
||||||
];
|
];
|
||||||
|
|
||||||
vars = {
|
vars = {
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,3 @@
|
||||||
# TODO: move this to NAS?
|
|
||||||
{lib, ...}: let
|
{lib, ...}: let
|
||||||
inherit (lib) concatMapStringsSep concatStringsSep;
|
inherit (lib) concatMapStringsSep concatStringsSep;
|
||||||
in {
|
in {
|
||||||
|
|
@ -20,6 +20,7 @@ in {
|
||||||
};
|
};
|
||||||
|
|
||||||
config = {
|
config = {
|
||||||
|
# TODO: change this to nos
|
||||||
programs.ssh.knownHosts = {
|
programs.ssh.knownHosts = {
|
||||||
pve.publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG/4mrp8E4Ittwg8feRmPtDHSDR2+Pq4uZHeF5MweVcW";
|
pve.publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG/4mrp8E4Ittwg8feRmPtDHSDR2+Pq4uZHeF5MweVcW";
|
||||||
};
|
};
|
||||||
|
|
@ -28,6 +29,7 @@ in {
|
||||||
defaults = {
|
defaults = {
|
||||||
environment = mkDefault {BORG_RSH = "ssh -i ${secrets.borg-ssh.path}";};
|
environment = mkDefault {BORG_RSH = "ssh -i ${secrets.borg-ssh.path}";};
|
||||||
|
|
||||||
|
# TODO: change this to nos
|
||||||
repo = mkDefault "ssh://matt@pve/data/backups/borg";
|
repo = mkDefault "ssh://matt@pve/data/backups/borg";
|
||||||
encryption = mkDefault {
|
encryption = mkDefault {
|
||||||
mode = "repokey";
|
mode = "repokey";
|
||||||
Loading…
Reference in a new issue