refactor(devices): rearrange some files to prepare for nas

common/modules/cachix.nix

@@ -8,7 +8,7 @@
       name = "rebuild-no-cache";
       runtimeInputs = [config.nh.package];
       text = ''
-         nh os switch -- --option binary-caches "https://cache.nixos.org" "$@"
+        nh os switch -- --option binary-caches "https://cache.nixos.org" "$@"
       '';
     })
   ];

common/pkgs/rars-flatlaf/default.nix

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

devices/README.md

@@ -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 |
 | `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 |
 | `wim`      | My 2-1 Lenovo Laptop that I use for uni |
 

devices/nas/default.nix

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

devices/oksys/default.nix

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

devices/servivi/default.nix

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

flake.nix

@@ -42,10 +42,6 @@
         ./devices/servivi
         secrets.nixosModules.servivi
       ];
-      oksys = mkNixOS [
-        ./devices/oksys
-        secrets.nixosModules.oksys
-      ];
 
       # Cluster
       thingone = mkNixOS [

modules/greetd/ags.nix

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

modules/greetd/default.nix

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