commit e9bf9109ff2d0d90551245303b22da9cafad0ff1
parent b4ad7ab91a8bdf2604f89fe3b2e49ad4a81a7272
Author: Milutin Popovic <milutin@popovic.xyz>
Date: Sun, 8 Mar 2026 22:04:14 +0000
renaming
Diffstat:
7 files changed, 40 insertions(+), 43 deletions(-)
diff --git a/flake.nix b/flake.nix
@@ -65,8 +65,8 @@
nixos-hardware.nixosModules.framework-13-7040-amd
home-manager.nixosModules.home-manager
sops-nix.nixosModules.sops
- ./system/host/host-frame.nix
- ./system/hardware/hardware-frame.nix
+ ./system/host/frame.nix
+ ./system/hardware/frame.nix
{
home-manager = {
useGlobalPkgs = true;
@@ -93,8 +93,8 @@
};
modules = [
home-manager.nixosModules.home-manager
- ./system/host/host-frame.nix
- ./system/hardware/hardware-vm.nix
+ ./system/host/frame.nix
+ ./system/hardware/vm.nix
{
home-manager = {
useGlobalPkgs = true;
@@ -121,8 +121,8 @@
};
modules = [
home-manager.nixosModules.home-manager
- ./system/host/host-server.nix
- ./system/hardware/hardware-vm.nix
+ ./system/host/server.nix
+ ./system/hardware/vm.nix
{
home-manager = {
useGlobalPkgs = true;
diff --git a/system/disk/disk-vm.nix b/system/disk/vm.nix
diff --git a/system/hardware/frame.nix b/system/hardware/frame.nix
@@ -0,0 +1,34 @@
+{ config, lib, modulesPath, ... }:
+
+{
+ imports =
+ [
+ (modulesPath + "/installer/scan/not-detected.nix")
+ ];
+
+ boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usbhid" "usb_storage" ];
+ boot.initrd.kernelModules = [ "dm-snapshot" ];
+ boot.kernelModules = [ "kvm-amd" ];
+ boot.extraModulePackages = [ ];
+
+ fileSystems."/" =
+ {
+ device = "/dev/disk/by-uuid/69e780cc-9ee1-4987-99eb-6c452ae66855";
+ fsType = "ext4";
+ };
+
+ fileSystems."/boot" =
+ {
+ device = "/dev/disk/by-uuid/7000-6EA2";
+ fsType = "vfat";
+ options = [ "fmask=0022" "dmask=0022" ];
+ };
+
+ swapDevices =
+ [
+ { device = "/dev/disk/by-uuid/fb532c05-67d1-4983-a518-e2616369b6ae"; }
+ ];
+
+ nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+ hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}
diff --git a/system/hardware/hardware-frame.nix b/system/hardware/hardware-frame.nix
@@ -1,37 +0,0 @@
-# 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" "thunderbolt" "usbhid" "usb_storage" ];
- boot.initrd.kernelModules = [ "dm-snapshot" ];
- boot.kernelModules = [ "kvm-amd" ];
- boot.extraModulePackages = [ ];
-
- fileSystems."/" =
- {
- device = "/dev/disk/by-uuid/69e780cc-9ee1-4987-99eb-6c452ae66855";
- fsType = "ext4";
- };
-
- fileSystems."/boot" =
- {
- device = "/dev/disk/by-uuid/7000-6EA2";
- fsType = "vfat";
- options = [ "fmask=0022" "dmask=0022" ];
- };
-
- swapDevices =
- [
- { device = "/dev/disk/by-uuid/fb532c05-67d1-4983-a518-e2616369b6ae"; }
- ];
-
- nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
- hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-}
diff --git a/system/hardware/hardware-vm.nix b/system/hardware/vm.nix
diff --git a/system/host/host-frame.nix b/system/host/frame.nix
diff --git a/system/host/host-server.nix b/system/host/server.nix