This commit is contained in:
2025-07-21 14:13:30 +09:00
parent 5c502f633c
commit 19ed535315
4 changed files with 42 additions and 33 deletions

View File

@@ -4,48 +4,49 @@
{ config, lib, pkgs, modulesPath, ... }: { config, lib, pkgs, modulesPath, ... }:
{ {
imports = imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
[ (modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "uas" "sd_mod" ]; boot.initrd.availableKernelModules =
[ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "uas" "sd_mod" ];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelParams = [ "intel_iommu=on" ]; boot.kernelParams = [ "intel_iommu=on" ];
boot.kernelModules = [ "kvm-intel" "vfio_pci" ]; boot.kernelModules = [ "kvm-intel" "vfio_pci" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
boot.extraModprobeConfig = ''
options vfio-pci ids=10de:1c81,10de:0fb9
'';
fileSystems."/" = # 1050 passthrough
{ device = "/dev/disk/by-uuid/4e08142c-1b09-4265-a497-822e4a83d4c8"; # boot.extraModprobeConfig = ''
fsType = "btrfs"; # options vfio-pci ids=10de:1c81,10de:0fb9
options = [ "subvol=root" ]; # '';
};
fileSystems."/home" = fileSystems."/" = {
{ device = "/dev/disk/by-uuid/4e08142c-1b09-4265-a497-822e4a83d4c8"; device = "/dev/disk/by-uuid/4e08142c-1b09-4265-a497-822e4a83d4c8";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=home" ]; options = [ "subvol=root" ];
}; };
fileSystems."/nix" = fileSystems."/home" = {
{ device = "/dev/disk/by-uuid/4e08142c-1b09-4265-a497-822e4a83d4c8"; device = "/dev/disk/by-uuid/4e08142c-1b09-4265-a497-822e4a83d4c8";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=nix" ]; options = [ "subvol=home" ];
}; };
fileSystems."/boot" = fileSystems."/nix" = {
{ device = "/dev/disk/by-uuid/E808-5876"; device = "/dev/disk/by-uuid/4e08142c-1b09-4265-a497-822e4a83d4c8";
fsType = "vfat"; fsType = "btrfs";
options = [ "fmask=0022" "dmask=0022" ]; options = [ "subvol=nix" ];
}; };
fileSystems."/mnt/hdd1" = fileSystems."/boot" = {
{ device = "/dev/disk/by-uuid/EC40940C4093DC20"; device = "/dev/disk/by-uuid/E808-5876";
fsType = "ntfs-3g"; fsType = "vfat";
options = [ "rw" "uid=1000" "umask=0022" ]; options = [ "fmask=0022" "dmask=0022" ];
}; };
fileSystems."/mnt/hdd1" = {
device = "/dev/disk/by-uuid/EC40940C4093DC20";
fsType = "ntfs-3g";
options = [ "rw" "uid=1000" "umask=0022" ];
};
swapDevices = [ ]; swapDevices = [ ];
@@ -58,5 +59,6 @@
# networking.interfaces.eth0.useDHCP = lib.mkDefault true; # networking.interfaces.eth0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.intel.updateMicrocode =
lib.mkDefault config.hardware.enableRedistributableFirmware;
} }

View File

@@ -12,6 +12,7 @@
set -gx PKG_CONFIG_PATH ${pkgs.openssl.dev}/lib/pkgconfig; set -gx PKG_CONFIG_PATH ${pkgs.openssl.dev}/lib/pkgconfig;
alias vi="nvim" alias vi="nvim"
alias rb="sudo nixos-rebuild switch --flake ~/nixos-config#" alias rb="sudo nixos-rebuild switch --flake ~/nixos-config#"
alias dry-rb="sudo nixos-rebuild switch --dry-run --flake ~/nixos-config#"
''; '';
plugins = [ plugins = [
# Enable a plugin (here grc for colorized command output) from nixpkgs # Enable a plugin (here grc for colorized command output) from nixpkgs

View File

@@ -37,6 +37,10 @@ with pkgs; [
cutter cutter
ghc ghc
nasm nasm
elixir
erlang
hex
rebar3
haskellPackages.stack haskellPackages.stack
haskellPackages.hpack haskellPackages.hpack
haskellPackages.cabal-install haskellPackages.cabal-install

View File

@@ -19,6 +19,8 @@ with pkgs; [
vesktop vesktop
discordo discordo
distrobox distrobox
freecad
kicad
youtube-music youtube-music
thunderbird thunderbird
yt-dlp yt-dlp