This commit is contained in:
parent
1469810d2b
commit
a33de2c711
|
@ -364,10 +364,10 @@
|
|||
home-manager-defaults
|
||||
|
||||
hardware.nixosModules.common-pc-ssd
|
||||
|
||||
common
|
||||
gaming
|
||||
graphical-workstation
|
||||
plasma6
|
||||
|
||||
./nixos/htpc.nix
|
||||
|
||||
|
|
|
@ -152,8 +152,8 @@
|
|||
];
|
||||
}
|
||||
{command = "mako";}
|
||||
{command = "firefox";}
|
||||
{command = "wezterm";}
|
||||
# {command = "firefox";}
|
||||
# {command = "wezterm";}
|
||||
];
|
||||
|
||||
modes = {
|
||||
|
|
|
@ -403,6 +403,19 @@
|
|||
ACTION=="add", SUBSYSTEM=="backlight", RUN+="${pkgs.coreutils}/bin/chgrp video /sys/class/backlight/%k/brightness"
|
||||
ACTION=="add", SUBSYSTEM=="backlight", RUN+="${pkgs.coreutils}/bin/chmod g+w /sys/class/backlight/%k/brightness"
|
||||
'';
|
||||
|
||||
services.upower.enable = true;
|
||||
|
||||
# NOTE: I previously let plasma settings handle this
|
||||
services.logind = {
|
||||
lidSwitch = "suspend-then-hibernate";
|
||||
extraConfig = ''
|
||||
HandleLidSwitchDocked=ignore
|
||||
HandlePowerKey=suspend-then-hibernate
|
||||
IdleActionSec=11m
|
||||
IdleAction=suspend-then-hibernate
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
emacs = {pkgs, ...}: {
|
||||
|
@ -568,7 +581,6 @@
|
|||
...
|
||||
}: {
|
||||
imports = with nixosModules; [
|
||||
plasma6
|
||||
sway
|
||||
# hyprland
|
||||
enable-flatpaks-and-appimages
|
||||
|
@ -931,6 +943,10 @@
|
|||
TODO: powersave?
|
||||
TODO: can I pre-configure my usual wifi networks with SSIDs and PSKs loaded from secrets?
|
||||
*/
|
||||
hardware.wirelessRegulatoryDatabase = true;
|
||||
boot.extraModprobeConfig = ''
|
||||
options cfg80211 ieee80211_regdom="US"
|
||||
'';
|
||||
};
|
||||
|
||||
steam = {pkgs, ...}: {
|
||||
|
|
|
@ -246,8 +246,6 @@ in
|
|||
networking.hostName = "foxtrot";
|
||||
}
|
||||
{
|
||||
# laptop power management
|
||||
services.upower.enable = true;
|
||||
swapDevices = [
|
||||
# TODO: move this to disko?
|
||||
# NOTE(oninstall):
|
||||
|
@ -263,17 +261,6 @@ in
|
|||
systemd.sleep.extraConfig = "HibernateDelaySec=121m";
|
||||
services.fwupd.enable = true;
|
||||
services.fwupd.extraRemotes = ["lvfs-testing"];
|
||||
|
||||
# NOTE: I previously let plasma settings handle this
|
||||
services.logind = {
|
||||
lidSwitch = "suspend-then-hibernate";
|
||||
extraConfig = ''
|
||||
HandleLidSwitchDocked=ignore
|
||||
HandlePowerKey=suspend-then-hibernate
|
||||
IdleActionSec=11m
|
||||
IdleAction=suspend-then-hibernate
|
||||
'';
|
||||
};
|
||||
}
|
||||
];
|
||||
|
||||
|
@ -356,7 +343,6 @@ in
|
|||
];
|
||||
|
||||
networking.networkmanager.wifi.powersave = false;
|
||||
hardware.wirelessRegulatoryDatabase = true;
|
||||
|
||||
hardware.framework.amd-7040.preventWakeOnAC = true;
|
||||
|
||||
|
@ -400,9 +386,6 @@ in
|
|||
];
|
||||
initrd.availableKernelModules = ["xhci_pci" "nvme" "thunderbolt"];
|
||||
kernelModules = ["kvm-amd"];
|
||||
extraModprobeConfig = ''
|
||||
options cfg80211 ieee80211_regdom="US"
|
||||
'';
|
||||
};
|
||||
hardware.bluetooth = {
|
||||
enable = true;
|
||||
|
|
|
@ -5,9 +5,6 @@
|
|||
}: {
|
||||
networking.hostName = "thablet";
|
||||
|
||||
home-manager.users.daniel = {
|
||||
};
|
||||
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
|
||||
services.fprintd = {
|
||||
|
@ -48,7 +45,11 @@
|
|||
|
||||
hardware.bluetooth = {
|
||||
enable = true;
|
||||
powerOnBoot = true;
|
||||
powerOnBoot = false;
|
||||
};
|
||||
|
||||
services.power-profiles-daemon = {
|
||||
enable = true;
|
||||
};
|
||||
|
||||
networking = {
|
||||
|
@ -61,5 +62,19 @@
|
|||
};
|
||||
};
|
||||
|
||||
home-manager.users.daniel = {
|
||||
wayland.windowManager.sway = {
|
||||
config = {
|
||||
output = {
|
||||
"AU Optronics 0x2236 Unknown" = {
|
||||
mode = "2560x1440@60Hz";
|
||||
position = "0,0";
|
||||
scale = toString 1.25;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
system.stateVersion = "24.05";
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue