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

18
flake.lock generated
View file

@ -785,11 +785,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
},
"locked": {
"lastModified": 1747849848,
"narHash": "sha256-xudin/slzGV56pD/1Kmy9DaiFUJHu9+ZZHqGXPIcnbo=",
"lastModified": 1747854332,
"narHash": "sha256-Y2PTi+lKJ+2ttaHzC7frOSWvhgz/uqGmpvbJ9vNCrtQ=",
"owner": "sodiboo",
"repo": "niri-flake",
"rev": "bbb4d213c9f7f57f6886d6f39485657aefbf4ae8",
"rev": "a7ca3444190a6cac3d92168a111349b59003bd6c",
"type": "github"
},
"original": {
@ -930,11 +930,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1747723695,
"narHash": "sha256-lSXzv33yv1O9r9Ai1MtYFDX3OKhWsZMn/5FFb4Rni/k=",
"lastModified": 1747860404,
"narHash": "sha256-9IMwxC4g1AyhOHTx8iTimoKnyzl9Rk2OJZiDtFoF3pA=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "6ac6ec6fcb410e15a60ef5ec94b8a2b35b5dd282",
"rev": "2b9118883d29290a1b16ae3a12aedc478dae2546",
"type": "github"
},
"original": {
@ -1659,11 +1659,11 @@
]
},
"locked": {
"lastModified": 1747852083,
"narHash": "sha256-AitWK0alpojxNu3pFiLDbT5DVQWZXV3i8BlWkfQPET0=",
"lastModified": 1747862287,
"narHash": "sha256-ys4f+C9kfLMV6uRHqKscok3OCEPduNE2wPko5hMr3to=",
"owner": "0xc000022070",
"repo": "zen-browser-flake",
"rev": "8a9ca8f89923eeda6c1a9ce164a1c0eb6f712420",
"rev": "6cf000b8a04cba6592cc96f2127ce7666f14c243",
"type": "github"
},
"original": {

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

View file

@ -222,6 +222,11 @@
swayosd = {
enable = true;
};
udiskie = {
enable = true;
automount = true;
tray = "always";
};
};
xdg.configFile."wpaperd/config.toml".source = ../../homes/emenel/dotfiles/dot_config/wpaperd/config.toml;