reinstall to thinkpad

This commit is contained in:
Emmet
2025-03-08 13:06:32 -06:00
parent 7ef53cbab3
commit 3620c1ad51
7 changed files with 16 additions and 46 deletions

8
flake.lock generated
View File

@@ -1141,11 +1141,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1740839257, "lastModified": 1741460499,
"narHash": "sha256-rHEB0JnNyXJ1lvxUZZiRYV5elNil5hXO1792Fl807zc=", "narHash": "sha256-+162iWgwCKkkvrse9CBatsj4O0IyHj2SquBldXB3qsk=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "53406ca30dca3007caf57fdc940506e64f605f17", "rev": "a3a90b3f485e677a096199c04c6e1cf48fdc8464",
"revCount": 20, "revCount": 24,
"type": "git", "type": "git",
"url": "file://path:/etc/nixos.secrets" "url": "file://path:/etc/nixos.secrets"
}, },

View File

@@ -17,7 +17,7 @@
flatpak.enable = false; flatpak.enable = false;
virtualization = { virtualization = {
docker.enable = true; docker.enable = true;
virtualMachines.enable = true; virtualMachines.enable = false;
}; };
# wm # wm

View File

@@ -17,57 +17,25 @@
enable32Bit = lib.mkDefault true; enable32Bit = lib.mkDefault true;
}; };
# my stupid usb hub crashes systemct suspend half of the time now boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
# https://wiki.archlinux.org/title/Power_management/Suspend_and_hibernate#Sleep_hooks
systemd.services.root-suspend = {
enable = true;
description = "Root systemd suspend prehook";
unitConfig = {
Description = "Root systemd suspend prehook";
Before = "sleep.target";
};
serviceConfig = {
Type = "simple";
ExecStart = "${pkgs.uhubctl}/bin/uhubctl -a off";
};
wantedBy = [ "sleep.target" ];
};
systemd.services.root-resume = {
enable = true;
description = "Root systemd suspend posthook";
unitConfig = {
Description = "Root systemd suspend posthook";
After = "suspend.target";
};
serviceConfig = {
Type = "simple";
ExecStart = "${pkgs.uhubctl}/bin/uhubctl -a on";
};
wantedBy = [ "suspend.target" ];
};
boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "rtsx_pci_sdmmc" "hid_generic" ];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" =
{ device = "/dev/disk/by-uuid/3618968f-1717-4c8e-b0d8-2556d18d2c4b"; { device = "/dev/disk/by-uuid/9982bd44-cfaa-4959-8e30-3341f728c29a";
fsType = "ext4"; fsType = "ext4";
}; };
boot.initrd.luks.devices."luks-06fa6e93-9bde-4703-830e-7ee1a7292a19".device = "/dev/disk/by-uuid/06fa6e93-9bde-4703-830e-7ee1a7292a19"; boot.initrd.luks.devices."luks-3165c377-6b98-498c-bd86-20a8fc530e9d".device = "/dev/disk/by-uuid/3165c377-6b98-498c-bd86-20a8fc530e9d";
fileSystems."/boot" = fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/E1BC-04BB"; { device = "/dev/disk/by-uuid/4DA8-3F95";
fsType = "vfat"; fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ]; options = [ "fmask=0077" "dmask=0077" ];
}; };
swapDevices = swapDevices = [ ];
[ { device = "/dev/disk/by-uuid/d52b7852-f35f-4325-9adc-24aa5d3da2a3";
}
];
services.pipewire.enable = lib.mkForce false; services.pipewire.enable = lib.mkForce false;
hardware.pulseaudio.enable = true; hardware.pulseaudio.enable = true;

View File

@@ -37,12 +37,14 @@
bluetooth.enable = true; bluetooth.enable = true;
}; };
home.sessionVariables = lib.mkIf config.userSettings.hyprland.enable {
AQ_DRM_DEVICES = lib.mkForce "/dev/dri/card0";
};
wayland.windowManager.hyprland = lib.mkIf config.userSettings.hyprland.enable { wayland.windowManager.hyprland = lib.mkIf config.userSettings.hyprland.enable {
settings = { settings = {
monitor = [ monitor = [
"eDP-1,1920x1080@300,900x1080,1" "eDP-1,1920x1080@60,0x0,1"
"HDMI-A-1,1920x1080,1920x0,1"
"DP-1,1920x1080,0x0,1"
]; ];
}; };

View File

@@ -71,7 +71,7 @@
nixos-rebuild build --flake .#snowfire; nixos-rebuild build --flake .#snowfire;
attic push emmet ./result; attic push emmet ./result;
rm ./result; rm ./result;
nixos-rebuild build --flake .#polarias; nixos-rebuild build --flake .#duskfall;
attic push emmet ./result; attic push emmet ./result;
rm ./result; rm ./result;
nixos-rebuild build --flake .#zenith; nixos-rebuild build --flake .#zenith;