diff --git a/common/cloudsync.nix b/common/cloudsync.nix index e5ec0bb..e4cd2eb 100644 --- a/common/cloudsync.nix +++ b/common/cloudsync.nix @@ -57,7 +57,7 @@ in let remote_clean = lib.strings.concatStrings (builtins.match "/*(.+)" remote); in - "${cloud_cmd} /${remote_clean} ${local} ${sync_server}" + "${cloud_cmd} /${remote_clean} ${local} ${sync_server} 1> /dev/null" ) paths ); in diff --git a/common/hardware/laptop.nix b/common/hardware/laptop.nix index 5715f73..d5ac3a0 100644 --- a/common/hardware/laptop.nix +++ b/common/hardware/laptop.nix @@ -32,6 +32,9 @@ in # hardware.i2c.enable = true; services.libinput.enable = true; hardware.opentabletdriver.enable = true; + + systemd.user.services.opentabletdriver.after = [ "local-fs.target" ]; + services.udisks2.enable = true; #services.udev.extraRules = '' @@ -42,25 +45,25 @@ in # ENV{SYSTEMD_WANTS}+="ddcci@$kernel.service" #''; - systemd.services."ddcci@" = { - scriptArgs = "%i"; - script = '' - sleep 20 - echo Trying to attach ddcci to $1 - i=0 - id=$(echo $1 | cut -d "-" -f 2) - if ${lib.getExe' pkgs.ddcutil "ddcutil"} getvcp 10 -b $id; then - echo ddcci 0x37 > /sys/bus/i2c/devices/$1/new_device - fi - ''; - serviceConfig.Type = "oneshot"; - }; + # systemd.services."ddcci@" = { + # scriptArgs = "%i"; + # script = '' + # sleep 20 + # echo Trying to attach ddcci to $1 + # i=0 + # id=$(echo $1 | cut -d "-" -f 2) + # if ${lib.getExe' pkgs.ddcutil "ddcutil"} getvcp 10 -b $id; then + # echo ddcci 0x37 > /sys/bus/i2c/devices/$1/new_device + # fi + # ''; + # serviceConfig.Type = "oneshot"; + #}; systemd.enableCgroupAccounting = true; # systemd.enableUnifiedCgroupHierarchy = false; boot = { - kernelParams = [ "intel_iommu=on" "nohibernate" ]; + kernelParams = [ "intel_iommu=on" "nohibernate" "pcie_aspm=off" ]; loader.efi.canTouchEfiVariables = true; initrd.availableKernelModules = [ "xhci_pci" @@ -74,8 +77,8 @@ in loader.systemd-boot.enable = true; # extraModulePackages = [ config.boot.kernelPackages.ddcci-driver ]; kernelModules = [ - "ddcci_backlight" - "i2c-dev" +# "ddcci_backlight" +# "i2c-dev" "ec_sys" ]; }; diff --git a/common/tooling/nix.nix b/common/tooling/nix.nix index 23e8437..fd30249 100644 --- a/common/tooling/nix.nix +++ b/common/tooling/nix.nix @@ -11,6 +11,7 @@ nix-output-monitor nix-search-cli niv + nvd vulnix nix-init ];