Merge branch 'master' of ssh://git.myrmexia.xyz:2200/srv/git/.flake

2 files changed, 43 insertions, 16 deletions

diff --git a/machines/khad/configuration.nix b/machines/khad/configuration.nix
index 5da9614..c36c941 100644
--- a/machines/khad/configuration.nix
+++ b/machines/khad/configuration.nix
@@ -75,9 +75,9 @@
   services.xserver.enable = true;
 
 
-  # # Enable the Plasma 5 Desktop Environment.
+  # # Enable the Plasma 6 Desktop Environment.
   services.displayManager.sddm.enable = true;
-  # services.xserver.desktopManager.plasma5.enable = true;
+  services.desktopManager.plasma6.enable = true;
   
 
   # Configure keymap in X11
diff --git a/machines/khad/hardware-configuration.nix b/machines/khad/hardware-configuration.nix
index 62f1bd4..4cd618c 100644
--- a/machines/khad/hardware-configuration.nix
+++ b/machines/khad/hardware-configuration.nix
@@ -1,37 +1,64 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, modulesPath, ... }:
+{ config, lib, pkgs, modulesPath, ... }:
 
 {
   imports =
     [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/17bf776d-ed6d-4a80-831c-ddd65dec14fb";
+  fileSystems."/boot" = {
+    label = "EFI";
+    fsType = "vfat";
+  };
+
+  fileSystems."/" = {
+      label = "nixos";
       fsType = "btrfs";
-      options = [ "subvol=@" ];
+      options = [ "subvol=@root" "compress-force=zstd:3" "noatime" ];
     };
 
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/83FA-1F6E";
-      fsType = "vfat";
+  fileSystems."/home" = {
+      label = "nixos";
+      fsType = "btrfs";
+      options = [ "subvol=@home" "compress-force=zstd:3" "noatime" ];
     };
 
-  fileSystems."/home" =
-    { device = "/dev/disk/by-uuid/c6f221f0-f4c0-413e-821b-7363aa5c5f4c";
+  fileSystems."/nix" = {
+      label = "nixos";
       fsType = "btrfs";
+      options = [ "subvol=@nix" "compress-force=zstd:3" "noatime" ];
     };
 
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/9b961057-79f7-4024-b1ec-16f9e8af7405"; }
-    ];
+  fileSystems."/persist" = {
+      label = "nixos";
+      fsType = "btrfs";
+      options = [ "subvol=@persist" "compress-force=zstd:3" "noatime" ];
+    };
+
+  fileSystems."/swap" = {
+      label = "nixos";
+      fsType = "btrfs";
+      options = [ "subvol=@swap" "compress-force=zstd:3" "noatime" ];
+    };
+
+  fileSystems."/var/log" = {
+      label = "nixos";
+      fsType = "btrfs";
+      options = [ "subvol=@log" "compress-force=zstd:3" "noatime" ];
+    };
+  
+
+  swapDevices = [{
+    device = "/swap/swapfile";
+    # size = 35 * 1024; # 35GB
+}];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's
@@ -39,7 +66,7 @@
   # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
   networking.useDHCP = lib.mkDefault true;
   # networking.interfaces.eno1.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp0s20u4.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlp5s0.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;