Grimmauld/grimm-nixos-laptop
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

cleanup

Browse source
This commit is contained in:
Grimmauld 2024-11-26 19:18:50 +01:00
parent 7fd47c51c0
commit f28a475cfb
Signed by: Grimmauld
GPG key ID: C2946668769F91FB
3 changed files with 21 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/cloudsync.nix
View file

@ -57,7 +57,7 @@ in
let let
remote_clean = lib.strings.concatStrings (builtins.match "/*(.+)" remote); remote_clean = lib.strings.concatStrings (builtins.match "/*(.+)" remote);
in in
"${cloud_cmd} /${remote_clean} ${local} ${sync_server}" "${cloud_cmd} /${remote_clean} ${local} ${sync_server} 1> /dev/null"
) paths ) paths
); );
in in

35
common/hardware/laptop.nix
View file

@ -32,6 +32,9 @@ in
# hardware.i2c.enable = true; # hardware.i2c.enable = true;
services.libinput.enable = true; services.libinput.enable = true;
hardware.opentabletdriver.enable = true; hardware.opentabletdriver.enable = true;
systemd.user.services.opentabletdriver.after = [ "local-fs.target" ];
services.udisks2.enable = true; services.udisks2.enable = true;
#services.udev.extraRules = '' #services.udev.extraRules = ''
@ -42,25 +45,25 @@ in
# ENV{SYSTEMD_WANTS}+="ddcci@$kernel.service" # ENV{SYSTEMD_WANTS}+="ddcci@$kernel.service"
#''; #'';
systemd.services."ddcci@" = { # systemd.services."ddcci@" = {
scriptArgs = "%i"; # scriptArgs = "%i";
script = '' # script = ''
sleep 20 # sleep 20
echo Trying to attach ddcci to $1 # echo Trying to attach ddcci to $1
i=0 # i=0
id=$(echo $1 | cut -d "-" -f 2) # id=$(echo $1 | cut -d "-" -f 2)
if ${lib.getExe' pkgs.ddcutil "ddcutil"} getvcp 10 -b $id; then # if ${lib.getExe' pkgs.ddcutil "ddcutil"} getvcp 10 -b $id; then
echo ddcci 0x37 > /sys/bus/i2c/devices/$1/new_device # echo ddcci 0x37 > /sys/bus/i2c/devices/$1/new_device
fi # fi
''; # '';
serviceConfig.Type = "oneshot"; # serviceConfig.Type = "oneshot";
}; #};
systemd.enableCgroupAccounting = true; systemd.enableCgroupAccounting = true;
# systemd.enableUnifiedCgroupHierarchy = false; # systemd.enableUnifiedCgroupHierarchy = false;
boot = { boot = {
kernelParams = [ "intel_iommu=on" "nohibernate" ]; kernelParams = [ "intel_iommu=on" "nohibernate" "pcie_aspm=off" ];
loader.efi.canTouchEfiVariables = true; loader.efi.canTouchEfiVariables = true;
initrd.availableKernelModules = [ initrd.availableKernelModules = [
"xhci_pci" "xhci_pci"
@ -74,8 +77,8 @@ in
loader.systemd-boot.enable = true; loader.systemd-boot.enable = true;
# extraModulePackages = [ config.boot.kernelPackages.ddcci-driver ]; # extraModulePackages = [ config.boot.kernelPackages.ddcci-driver ];
kernelModules = [ kernelModules = [
"ddcci_backlight" # "ddcci_backlight"
"i2c-dev" # "i2c-dev"
"ec_sys" "ec_sys"
]; ];
}; };

1
common/tooling/nix.nix
View file

@ -11,6 +11,7 @@
nix-output-monitor nix-output-monitor
nix-search-cli nix-search-cli
niv niv
nvd
vulnix vulnix
nix-init nix-init
]; ];