From d1c93706339fc549af6d692fe4114e9a82253da2 Mon Sep 17 00:00:00 2001
From: yaroslav <yaroslav@Ratchet.local>
Date: Thu, 24 Jul 2025 15:56:23 +0300
Subject: [PATCH] moved aphelion to zfs

---
 flake.nix                            |  3 +-
 hosts/Aphelion/hardware-Aphelion.nix | 82 +++++-----------------------
 2 files changed, 16 insertions(+), 69 deletions(-)

diff --git a/flake.nix b/flake.nix
index 7ab5e98..643ed27 100644
--- a/flake.nix
+++ b/flake.nix
@@ -66,11 +66,10 @@
           ./hosts/generic/unfree_allow.nix
           ./hosts/generic/plymouth.nix
           ./hosts/Aphelion/hardware-Aphelion.nix
-          ./hosts/Aphelion/nvidia.nix
           ./hosts/Aphelion/sunshine.nix
           ./hosts/Aphelion/nfs.nix
           ./misc/disable_suspend.nix
-          ./desktop/gnome.nix
+          ./desktop/kde.nix
           ./home/yaroslav/steam.nix
           ./hosts/generic/teamspeak.nix
           home-manager.nixosModules.home-manager
diff --git a/hosts/Aphelion/hardware-Aphelion.nix b/hosts/Aphelion/hardware-Aphelion.nix
index 86d947f..2234562 100644
--- a/hosts/Aphelion/hardware-Aphelion.nix
+++ b/hosts/Aphelion/hardware-Aphelion.nix
@@ -8,51 +8,32 @@
     [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" ];
+  boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "nvme" "usb_storage" "usbhid" "sd_mod" ];
   boot.initrd.kernelModules = [ "dm-snapshot" ];
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
-  boot.kernelPackages = pkgs.linuxPackages_zen;
-  boot.extraModprobeConfig = "options kvm_amd nested=1";
 
   fileSystems."/" =
-    { #device = "/dev/disk/by-uuid/3126fadd-b793-4110-bcb7-577b7978cba2";
-      #fsType = "btrfs";
-      #options = [ "subvol=@nixos" ];
-      device = "none";
+    { device = "none";
       fsType = "tmpfs";
-      options = [ "defaults" "size=8G" "mode=755" ];
     };
 
-  fileSystems."/nix" =
-    { device = "/dev/disk/by-uuid/3126fadd-b793-4110-bcb7-577b7978cba2";
-      fsType = "btrfs";
-      options = [ "subvol=@nix" ];
-    };
-
-  fileSystems."/nix/persist/home" =
-    {
-      device = "/dev/disk/by-uuid/3126fadd-b793-4110-bcb7-577b7978cba2";
-      fsType = "btrfs";
-      options = [ "compress=zstd" "subvol=@home-persist" ];
-      neededForBoot = true;
-    };
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/595C-784B";
+    { device = "/dev/disk/by-uuid/278A-0FB0";
       fsType = "vfat";
       options = [ "fmask=0022" "dmask=0022" ];
     };
 
-#  fileSystems."/home/yaroslav" =
-#    { device = "none";
-#      fsType = "tmpfs";
-#      options = [ "defaults" "size=1G" "uid=1000" "gid=100" ];
-#    };
-  fileSystems."/vol/Trash" = {
-      device = "/dev/mapper/yarikpc-trash";
-      fsType = "ext4";
-      options = [ "defaults" ];
+  fileSystems."/nix" =
+    { device = "aphelion-zroot/nix";
+      fsType = "zfs";
     };
+
+  fileSystems."/nix/persist/home" =
+    { device = "aphelion-zroot/home";
+      fsType = "zfs";
+    };
+
   swapDevices = [ ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
@@ -60,44 +41,11 @@
   # still possible to use this option, but it's recommended to use it in conjunction
   # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
   networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.docker0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp9s0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.lxdbr0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.veth9787cb37.useDHCP = lib.mkDefault true;
-  # networking.interfaces.virbr0.useDHCP = lib.mkDefault true;
-  boot.initrd.systemd.tmpfiles.settings = {
-    "100-mountpoint-Trash" = { 
-      "/vol/Trash" = {
-        d = {
-          user = "root";
-          mode = "0770";
-          group = "users";
-        };
-      };
-    };
-    "10-sharepoint-nfs" = {
-      "/share/nixos-1" = {
-        d = {
-          user = "nobody";
-          group = "nogroup";
-          mode = "0770";
-        };
-      };
-    };
-  };
-
-  networking.firewall.allowedTCPPorts = [ 4444 ];
-  networking.firewall.allowedUDPPorts = [ 69 1100 ];
-  programs.amnezia-vpn.enable = true;
-
-  services.tftpd.enable = true;
-  services.tftpd.path = "/srv/pxe/tftp";
-
-  services.hardware.openrgb.enable = true;
+  # networking.interfaces.enp12s0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlp11s0.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-  networking.hostName = "Aphelion";
   system.stateVersion = "25.11";
-
+  networking.hostName = "Aphelion";
 }