romanl/nixos
1
0
Fork 0
mirror of https://github.com/JaxTheWolf/nixos.git synced 2026-04-01 02:00:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Slight modifications

Browse Source
This commit is contained in:
Roman Lubij
2026-02-17 23:32:48 +01:00
parent abd6b338af
commit af428b2fb2
4 changed files with 54 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
common/hardware-configuration.nix
View File

@@ -1 +1,14 @@
{ ... }: { } {
pkgs,
...
}:
{
boot = {
kernelPackages = pkgs.linuxKernel.packages.linux_xanmod_latest;
kernelModules = [
"hid-logitech-dj"
"hid-logitech-hidpp"
];
};
}

3
desktop/hardware-configuration.nix
View File

@@ -28,12 +28,9 @@
]; ];
}; };
kernelPackages = pkgs.linuxKernel.packages.linux_xanmod_latest;
kernelModules = [ kernelModules = [
"kvm-amd" "kvm-amd"
"nct6683" "nct6683"
"hid-logitech-dj"
"hid-logitech-hidpp"
]; ];
extraModulePackages = with config.boot.kernelPackages; [ extraModulePackages = with config.boot.kernelPackages; [

47
laptop/hardware-configuration.nix
View File

@@ -14,19 +14,24 @@
(modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = [ boot = {
"xhci_pci" initrd = {
"ahci" availableKernelModules = [
"nvme" "xhci_pci"
"uas" "ahci"
"sd_mod" "nvme"
]; "uas"
boot.initrd.kernelModules = [ ]; "sd_mod"
boot.kernelModules = [ "kvm-intel" ]; ];
boot.extraModulePackages = [ ]; kernelModules = [ ];
};
kernelModules = [ "kvm-intel" ];
extraModulePackages = [ ];
};
fileSystems."/" = { fileSystems."/" = {
device = "/dev/disk/by-uuid/02dad628-066d-4fba-ada7-bfdfbc2e4ca3"; device = "/dev/disk/by-uuid/7b31f189-b34a-4cf0-95c5-bbcd6830159e";
fsType = "btrfs"; fsType = "btrfs";
options = [ options = [
"subvol=@nix" "subvol=@nix"
@@ -39,7 +44,7 @@
}; };
fileSystems."/home" = { fileSystems."/home" = {
device = "/dev/disk/by-uuid/02dad628-066d-4fba-ada7-bfdfbc2e4ca3"; device = "/dev/disk/by-uuid/7b31f189-b34a-4cf0-95c5-bbcd6830159e";
fsType = "btrfs"; fsType = "btrfs";
options = [ options = [
"subvol=@home" "subvol=@home"
@@ -52,7 +57,7 @@
}; };
fileSystems."/nix" = { fileSystems."/nix" = {
device = "/dev/disk/by-uuid/02dad628-066d-4fba-ada7-bfdfbc2e4ca3"; device = "/dev/disk/by-uuid/7b31f189-b34a-4cf0-95c5-bbcd6830159e";
fsType = "btrfs"; fsType = "btrfs";
options = [ options = [
"subvol=@nix_nix" "subvol=@nix_nix"
@@ -65,7 +70,7 @@
}; };
fileSystems."/var" = { fileSystems."/var" = {
device = "/dev/disk/by-uuid/02dad628-066d-4fba-ada7-bfdfbc2e4ca3"; device = "/dev/disk/by-uuid/7b31f189-b34a-4cf0-95c5-bbcd6830159e";
fsType = "btrfs"; fsType = "btrfs";
options = [ options = [
"subvol=@nix_var" "subvol=@nix_var"
@@ -78,7 +83,7 @@
}; };
fileSystems."/boot" = { fileSystems."/boot" = {
device = "/dev/disk/by-uuid/C871-B294"; device = "/dev/disk/by-uuid/477C-4D52";
fsType = "vfat"; fsType = "vfat";
options = [ options = [
"fmask=0022" "fmask=0022"
@@ -86,8 +91,16 @@
]; ];
}; };
swapDevices = [ ]; swapDevices = [
{
device = "/dev/disk/by-uuid/bea07563-dc23-415b-b12f-ba53138bd492";
priority = 0;
options = [
"defaults"
];
}
];
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
} }

14
laptop/modules/attic.nix
View File

@@ -1,4 +1,7 @@
{ ... }: { {
...
}:
{
nix.settings = { nix.settings = {
substituters = [ substituters = [
"https://attic.awroo.fun/my-config" "https://attic.awroo.fun/my-config"
@@ -6,10 +9,13 @@
]; ];
trusted-public-keys = [ trusted-public-keys = [
"my-config:zMLOKdd9wxVtJDK2jgI2fW6Uehtdc4WLyU0bOjNpyxM=" "my-config:51aC90S8+3+gS/UzwdnL7a7lu1NnY896SZp5njMwFDk="
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
]; ];
trusted-users = [ "root" "@wheel" ]; trusted-users = [
"root"
"@wheel"
];
}; };
} }