squash me
This commit is contained in:
parent
fe34badada
commit
21ced62c07
4 changed files with 28 additions and 19 deletions
|
|
@ -57,8 +57,9 @@
|
|||
systemd-boot.enable = true;
|
||||
efi.canTouchEfiVariables = true;
|
||||
};
|
||||
initrd.luks.devices."luks-276bd2e3-9d6d-4df6-9155-3684907b48f0".device =
|
||||
"/dev/disk/by-uuid/276bd2e3-9d6d-4df6-9155-3684907b48f0";
|
||||
|
||||
initrd.luks.devices."luks-ab8d2b18-14de-44ff-a7b5-91d5f5d0e937".device =
|
||||
"/dev/disk/by-uuid/ab8d2b18-14de-44ff-a7b5-91d5f5d0e937";
|
||||
};
|
||||
|
||||
# sops
|
||||
|
|
@ -122,11 +123,11 @@
|
|||
};
|
||||
|
||||
environment = {
|
||||
# loginShellInit = ''
|
||||
# # if [ -z $DISPLAY ] && [ "$(tty)" = "/dev/tty1" ]; then
|
||||
# # exec Hyprland
|
||||
# # fi
|
||||
# ''; # Will automatically open Hyprland when logged into tty1
|
||||
loginShellInit = ''
|
||||
# if [ -z $DISPLAY ] && [ "$(tty)" = "/dev/tty1" ]; then
|
||||
# exec Hyprland
|
||||
# fi
|
||||
''; # Will automatically open Hyprland when logged into tty1
|
||||
variables = {
|
||||
TERMINAL = "alacritty";
|
||||
EDITOR = "nvim";
|
||||
|
|
|
|||
|
|
@ -7,7 +7,8 @@
|
|||
pkgs,
|
||||
modulesPath,
|
||||
...
|
||||
}: {
|
||||
}:
|
||||
{
|
||||
imports = [
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
../../common/nixos/nfs.nix
|
||||
|
|
@ -20,23 +21,30 @@
|
|||
"usb_storage"
|
||||
"sd_mod"
|
||||
];
|
||||
boot.initrd.kernelModules = [];
|
||||
boot.kernelModules = ["kvm-amd"];
|
||||
boot.extraModulePackages = [];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-amd" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/c4c90d75-9f16-45a2-94f8-dd0ba0fecc43";
|
||||
device = "/dev/disk/by-uuid/95565731-9a95-4fcc-857d-1f066f4e4acf";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
boot.initrd.luks.devices."luks-35f61924-e22a-458a-841c-9cc8dc3e35e4".device = "/dev/disk/by-uuid/35f61924-e22a-458a-841c-9cc8dc3e35e4";
|
||||
boot.initrd.luks.devices."luks-c140b0df-2cce-4710-a2fa-94dd3016a7e6".device =
|
||||
"/dev/disk/by-uuid/c140b0df-2cce-4710-a2fa-94dd3016a7e6";
|
||||
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/2ECE-9C7E";
|
||||
device = "/dev/disk/by-uuid/34C4-ECCE";
|
||||
fsType = "vfat";
|
||||
options = [
|
||||
"fmask=0077"
|
||||
"dmask=0077"
|
||||
];
|
||||
};
|
||||
|
||||
swapDevices = [{device = "/dev/disk/by-uuid/04f457e4-1bd2-417f-bcb7-f8b770e71c21";}];
|
||||
swapDevices = [
|
||||
{ device = "/dev/disk/by-uuid/2fea88dc-b9a8-40d6-a87d-f7383548e60d"; }
|
||||
];
|
||||
|
||||
# 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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue