refactor(devices): rearrange some files to prepare for nas
All checks were successful
Discord / discord commits (push) Has been skipped

This commit is contained in:
matt1432 2024-02-17 20:45:06 -05:00
parent 83afadfe78
commit a572a13f04
23 changed files with 24 additions and 14 deletions

View file

@ -28,7 +28,8 @@ stdenvNoCC.mkDerivation rec {
runtimeInputs = [hyprland]; runtimeInputs = [hyprland];
text = "(sleep 1; hyprctl dispatch togglefloating) & ${name}"; text = "(sleep 1; hyprctl dispatch togglefloating) & ${name}";
}; };
in makeDesktopItem { in
makeDesktopItem {
name = "RARS"; name = "RARS";
desktopName = "RARS"; desktopName = "RARS";
exec = "${execScript}/bin/execScript"; exec = "${execScript}/bin/execScript";

View file

@ -8,8 +8,9 @@ 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` | WIP | | `cluster` | Two Lenovo mini pcs that make use of [NixOS-pcsd](https://github.com/matt1432/nixos-pcsd) to form a cluster |
| `oksys` | A very old Acer laptop that went from sailing the seas for years to becoming my web server and VPN host | | `nas` | 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. |
| `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 |

8
devices/nas/default.nix Normal file
View file

@ -0,0 +1,8 @@
# WIP
{...}: {
imports = [
./modules/arion
./modules/borgbackup.nix
./modules/nfs.nix
];
}

View file

@ -1,3 +1,5 @@
# Not currently operational
{config, ...}: let {config, ...}: let
inherit (config.vars) mainUser hostName; inherit (config.vars) mainUser hostName;
in { in {

View file

@ -8,11 +8,11 @@ in {
../../modules/sshd.nix ../../modules/sshd.nix
../../modules/tailscale.nix ../../modules/tailscale.nix
./modules/arion
./modules/binary-cache.nix ./modules/binary-cache.nix
./modules/borgbackup.nix
./modules/minecraft.nix ./modules/minecraft.nix
./modules/nfs.nix
# WIP
../nas
]; ];
vars = { vars = {

BIN
flake.nix

Binary file not shown.

View file

@ -6,7 +6,6 @@
}: let }: let
inherit (config.vars) mainUser; inherit (config.vars) mainUser;
hyprland = config.home-manager.users.${mainUser}.wayland.windowManager.hyprland.finalPackage; hyprland = config.home-manager.users.${mainUser}.wayland.windowManager.hyprland.finalPackage;
in { in {
# Add home folder for home-manager to work # Add home folder for home-manager to work
users.users.greeter = { users.users.greeter = {

View file

@ -10,7 +10,6 @@
# Nix stuff # Nix stuff
isTouchscreen = config.hardware.sensor.iio.enable; isTouchscreen = config.hardware.sensor.iio.enable;
hyprland = config.home-manager.users.${mainUser}.wayland.windowManager.hyprland.finalPackage; hyprland = config.home-manager.users.${mainUser}.wayland.windowManager.hyprland.finalPackage;
in { in {
imports = [./ags.nix]; imports = [./ags.nix];