fix: systemd unfreeze, remove intel
This commit is contained in:
parent
7de1374c57
commit
3e43aed875
6 changed files with 23 additions and 5 deletions
|
@ -81,7 +81,6 @@
|
||||||
services.xserver = {
|
services.xserver = {
|
||||||
enable = true;
|
enable = true;
|
||||||
videoDrivers = [
|
videoDrivers = [
|
||||||
"intel"
|
|
||||||
"nvidia"
|
"nvidia"
|
||||||
];
|
];
|
||||||
xkb.layout = "us";
|
xkb.layout = "us";
|
||||||
|
@ -154,6 +153,7 @@
|
||||||
../../modules/home-config.nix
|
../../modules/home-config.nix
|
||||||
../../modules/local-dev.nix
|
../../modules/local-dev.nix
|
||||||
../../modules/nixos.nix
|
../../modules/nixos.nix
|
||||||
|
../../modules/systemd-unfreeze.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
# This value determines the NixOS release from which the default
|
# This value determines the NixOS release from which the default
|
||||||
|
|
|
@ -76,5 +76,4 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -79,6 +79,7 @@
|
||||||
../../modules/laptop.nix
|
../../modules/laptop.nix
|
||||||
../../modules/local-dev.nix
|
../../modules/local-dev.nix
|
||||||
../../modules/nixos.nix
|
../../modules/nixos.nix
|
||||||
|
../../modules/systemd-unfreeze.nix
|
||||||
];
|
];
|
||||||
services.eris-server = {
|
services.eris-server = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
displayManager.sddm.wayland.enable = true;
|
displayManager.sddm.wayland.enable = true;
|
||||||
displayManager.sddm.enable = true;
|
displayManager.sddm.enable = true;
|
||||||
displayManager.sddm.enableHidpi = true;
|
displayManager.sddm.enableHidpi = true;
|
||||||
displayManager.sddm.theme = "rose-pine";
|
#displayManager.sddm.theme = "rose-pine";
|
||||||
dbus.enable = true;
|
dbus.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -90,7 +90,7 @@
|
||||||
# List packages installed in system profile. To search, run:
|
# List packages installed in system profile. To search, run:
|
||||||
# $ nix search wget
|
# $ nix search wget
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
(callPackage ./sddm-rose-pine.nix { })
|
#(callPackage ./sddm-rose-pine.nix { })
|
||||||
(vscode-with-extensions.override {
|
(vscode-with-extensions.override {
|
||||||
vscode = vscodium;
|
vscode = vscodium;
|
||||||
vscodeExtensions =
|
vscodeExtensions =
|
||||||
|
|
|
@ -4,7 +4,10 @@
|
||||||
enable = true;
|
enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
nix.settings.experimental-features = [ "nix-command" ];
|
nix.settings.experimental-features = [
|
||||||
|
"nix-command"
|
||||||
|
"flakes"
|
||||||
|
];
|
||||||
|
|
||||||
# Automatic Garbage Collection
|
# Automatic Garbage Collection
|
||||||
nix.gc = {
|
nix.gc = {
|
||||||
|
|
15
modules/systemd-unfreeze.nix
Normal file
15
modules/systemd-unfreeze.nix
Normal file
|
@ -0,0 +1,15 @@
|
||||||
|
# Workaround for disabling semi-broken systemd user slice freezing (whatever
|
||||||
|
# that is). This can cause machines to become unusable after resume.
|
||||||
|
|
||||||
|
let
|
||||||
|
override.environment.SYSTEMD_SLEEP_FREEZE_USER_SESSIONS = "false";
|
||||||
|
in
|
||||||
|
{
|
||||||
|
systemd.services = {
|
||||||
|
systemd-suspend = override;
|
||||||
|
systemd-hibernate = override;
|
||||||
|
systemd-hybrid-sleep = override;
|
||||||
|
systemd-suspend-then-hibernate = override;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue