update

configuration.nix

@@ -75,9 +75,6 @@
   # Enable touchpad support (enabled default in most desktopManager).
   # services.libinput.enable = true;
 
-  # enable flatpak
-  services.flatpak.enable = true;
-
     # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [

devices/desk.nix

@@ -11,7 +11,7 @@
 
   boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sr_mod" ];
   boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-amd" ];
+  boot.kernelModules = [ "kvm-amd" "sg" ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
@@ -48,7 +48,7 @@
   # (the default) this is the recommended approach. When using systemd-networkd it's
   # 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.useDHCP = lib.mkDefault true;
   # networking.interfaces.enp4s0.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";

devices/nas.nix

@@ -0,0 +1,61 @@
+# 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, pkgs, modulesPath, ... }:
+
+{
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [  ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "NIX_CONV_POOL/root";
+      fsType = "zfs";
+    };
+
+  fileSystems."/nix" =
+    { device = "NIX_CONV_POOL/nix";
+      fsType = "zfs";
+    };
+
+  fileSystems."/var" =
+    { device = "NIX_CONV_POOL/var";
+      fsType = "zfs";
+    };
+
+  fileSystems."/home" =
+    { device = "NIX_CONV_POOL/home";
+      fsType = "zfs";
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/334B-15CD";
+      fsType = "vfat";
+      options = [ "fmask=0022" "dmask=0022" ];
+    };
+
+  #swapDevices =
+  #  [ { device = "/dev/disk/by-uuid/b3e53298-fdcf-41c5-b80b-6f1ef1dceeae"; }
+  #  ];
+
+  networking.hostName = "nix-nas"; # Define your hostname.
+  networking.hostId = "00000003";
+  # Pick only one of the below networking options.
+  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
+  networking.networkmanager.enable = true;  # Easiest to use and most distros use this by default.
+
+  # 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
+  # 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.enp4s0f3u1u4u1.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux";
+}

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1739470101,
+        "lastModified": 1759573136,
-        "narHash": "sha256-NxNe32VB4XI/xIXrsKmIfrcgtEx5r/5s52pL3CpEcA4=",
+        "narHash": "sha256-ILSPD0Dm8p0w0fCVzOx98ZH8yFDrR75GmwmH3fS2VnE=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "5031c6d2978109336637977c165f82aa49fa16a7",
+        "rev": "5f06ceafc6c9b773a776b9195c3f47bbe1defa43",
         "type": "github"
       },
       "original": {
@@ -22,11 +22,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1739214665,
+        "lastModified": 1759381078,
-        "narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=",
+        "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=",
         "owner": "NixOs",
         "repo": "nixpkgs",
-        "rev": "64e75cd44acf21c7933d61d7721e812eac1b5a0a",
+        "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee",
         "type": "github"
       },
       "original": {

flake.nix

@@ -20,16 +20,17 @@
         system = "x86_64-linux";
 	    specialArgs = inputs;
 	    modules = [
-          ./hardware/desk.nix
+          ./devices/desk.nix
+	      ./hardware/nvidia.nix
 
 	      ./configuration.nix 
-	      ./nvidia.nix
 	      ./plasma.nix
           ./network-shares.nix
 
           ./backup-target.nix
 
 	      ./users/shatteredmint.nix
+          ./qemu-bridges.nix
 	];
       };
 
@@ -38,7 +39,7 @@
         specialArgs = inputs;
 
         modules = [
-          ./hardware/conv.nix
+          ./devices/conv.nix
 
           ./configuration.nix
 
@@ -47,6 +48,18 @@
           ./network-shares.nix
         ];
       };
+      nix-nas = lib.nixosSystem {
+        system = "aarch64-linux";
+        specialArgs = inputs;
+
+        modules = [
+          ./devices/nas.nix
+          
+          ./configuration.nix
+
+          ./users/shatteredmint.nix
+        ];
+      };
     };
   };
 }

plasma.nix

@@ -12,7 +12,8 @@
     pkgs.kdePackages.elisa
   ];
 
-
+  # enable flatpak
+  services.flatpak.enable = true;
 
   # Enable sound.
   services.pipewire = {

qemu-bridges.nix

@@ -0,0 +1,18 @@
+{ config, libs, pkgs, ... }:
+{
+    networking.bridges.virtbr0.interfaces = [
+        "enp4s0"
+    ];
+
+    boot.kernel.sysctl."net.ipv4.ip_forward" = 1;
+
+    networking.interfaces.virtbr0 = {
+        useDHCP = true;
+    };
+
+    virtualisation.libvirtd = { 
+        enable = true;
+        allowedBridges = [ "virtbr0" ];
+        
+    };
+}

users/shatteredmint.nix

@@ -6,7 +6,7 @@
 
   users.users.shatteredmint = {
     isNormalUser = true;
-    extraGroups = [ "wheel" "nixos-admins" ];
+    extraGroups = [ "wheel" "nixos-admins" "cdrom" ];
     shell = pkgs.zsh;
     openssh.authorizedKeys.keys = [
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKT9u43WNMlu3gnu5z9Twt1vkdNdpf6REfEK/OT4qxjK shatteredmint"
@@ -33,7 +33,7 @@
         ignoreAllDups = true;
       };
 
-      initExtra = ''
+      initContent = ''
         bindkey '^?' backward-delete-char
         bindkey '\e[3~' delete-char
         autoload -Uz vcs_info
@@ -51,6 +51,7 @@
       userName = "ShatteredMINT";
       extraConfig = {
         init.defaultBranch = "main";
+        pull.rebase = true;
       };
     };
 
@@ -67,12 +68,13 @@
       lazygit
       veracrypt
       keepassxc
-      yakuake
+      kdePackages.yakuake
       cargo
       zig
       clang
       nil
       wl-clipboard
+      makemkv
     ];
 
     home.sessionPath = [