This commit is contained in:
Matt Nish-Lapidus 2025-05-21 23:12:56 -04:00
parent 849d8ad8d0
commit 8619f42156
6 changed files with 130 additions and 41 deletions

View file

@ -4,8 +4,13 @@
imports = with nix-config.nixosModules; [
./hardware-configuration.nix
./fs-default.nix
# ./disko-config.nix
./razer-speaker-fix.nix
users-emenel
nixld
niri
@ -276,6 +281,8 @@
};
services.fstrim.enable = true;
services.udisks2.enable = true;
# programs.devmon.enable = true;
services.hardware.openrgb = {
enable = true;
@ -523,23 +530,23 @@
services.accounts-daemon.enable = true;
services.gnome.gnome-online-accounts.enable = true;
programs.virt-manager.enable = true;
systemd.tmpfiles.rules = [ "L+ /var/lib/qemu/firmware - - - - ${pkgs.qemu}/share/qemu/firmware" ];
virtualisation = {
libvirtd = {
enable = true;
qemu = {
package = pkgs.qemu_kvm;
swtpm.enable = true;
ovmf.enable = true;
ovmf.packages = [ pkgs.OVMFFull.fd ];
};
};
spiceUSBRedirection.enable = true;
};
# programs.virt-manager.enable = true;
# systemd.tmpfiles.rules = [ "L+ /var/lib/qemu/firmware - - - - ${pkgs.qemu}/share/qemu/firmware" ];
# virtualisation = {
# libvirtd = {
# enable = true;
# qemu = {
# package = pkgs.qemu_kvm;
# swtpm.enable = true;
# ovmf.enable = true;
# ovmf.packages = [ pkgs.OVMFFull.fd ];
# };
# };
# spiceUSBRedirection.enable = true;
# };
services.qemuGuest.enable = true;
services.spice-vdagentd.enable = true;
# services.qemuGuest.enable = true;
# services.spice-vdagentd.enable = true;
programs.appimage = {
enable = true;

View file

@ -0,0 +1,73 @@
{
disko.devices = {
disk = {
main = {
type = "disk";
device = "/dev/nvme0n1";
content = {
type = "gpt";
partitions = {
ESP = {
size = "512M";
type = "EF00";
content = {
type = "filesystem";
format = "vfat";
mountpoint = "/boot";
mountOptions = [ "umask=0077" ];
};
};
luks = {
size = "100%";
content = {
type = "luks";
name = "crypted"
settings = {
allowDiscards = true;
};
content = {
type = "btrfs";
extraArgs = [ "-f" ];
subvolumes = {
"/root" = {
mountpoint = "/";
mountOptions = [
"compress=zstd"
"noatime"
];
};
"/home" = {
mountpoint = "/home";
mountOptions = [
"compress=zstd"
# "noatime"
];
};
"/log" = {
mountpoint = "/var/log";
mountOptions = [
"compress=zstd"
"noatime"
];
};
"/nix" = {
mountpoint = "/nix";
mountOptions = [
"compress=zstd"
"noatime"
];
};
"/swap" = {
mountpoint = "/.swapvol";
swap.swapfile.size = "32G";
};
};
};
};
};
};
};
};
};
};
}

View file

@ -0,0 +1,20 @@
{ config, lib, pkgs, ... }:
{
fileSystems."/" =
{
device = "/dev/disk/by-uuid/f5d53811-b478-4d20-91e0-4504c33848b4";
fsType = "ext4";
};
fileSystems."/boot" =
{
device = "/dev/disk/by-uuid/E3CE-0A6E";
fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ];
};
swapDevices =
[ { device = "/dev/disk/by-uuid/f8a9a852-3ccb-4d00-8e2d-db0d68e688b2"; } ];
}

View file

@ -10,22 +10,6 @@
boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];
fileSystems."/" =
{
device = "/dev/disk/by-uuid/f5d53811-b478-4d20-91e0-4504c33848b4";
fsType = "ext4";
};
fileSystems."/boot" =
{
device = "/dev/disk/by-uuid/E3CE-0A6E";
fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ];
};
swapDevices =
[ { device = "/dev/disk/by-uuid/f8a9a852-3ccb-4d00-8e2d-db0d68e688b2"; } ];
# 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