diff --git a/flake.lock b/flake.lock index 2452c64..a61bf0e 100644 --- a/flake.lock +++ b/flake.lock @@ -1076,11 +1076,11 @@ "nixvim": "nixvim_2" }, "locked": { - "lastModified": 1748338979, - "narHash": "sha256-cu/DVvQZRKVmI9rqEygXPW0xjR0BEqSgzH2Ay9ZYHVw=", + "lastModified": 1745488060, + "narHash": "sha256-uRx4RuG6T3VocL7JJt70ubUZ7GbO0o1hj/oCQww4SDA=", "owner": "ahwxorg", "repo": "nixvim-config", - "rev": "fc0d965d9bbd98047f777cb31e5b0708cd958956", + "rev": "bc425153ed9c4e54df3965e7a5bba54aa1fd73fa", "type": "github" }, "original": { diff --git a/hosts/sakura/default.nix b/hosts/sakura/default.nix index 8b81c17..aca59ab 100644 --- a/hosts/sakura/default.nix +++ b/hosts/sakura/default.nix @@ -14,14 +14,7 @@ inputs.nixos-hardware.nixosModules.framework-13-7040-amd ]; - # install some system-utilities; set hosts to be editable by the user. - environment = { - systemPackages = with pkgs; [ - fwupd - fw-ectool - ]; - etc.hosts.mode = "0700"; - }; + environment.etc.hosts.mode = "0700"; liv = { laptop.enable = true; @@ -31,6 +24,7 @@ gui.enable = true; }; + environment.systemPackages = with pkgs; [ fwupd ]; hardware.framework = { amd-7040.preventWakeOnAC = true; laptop13.audioEnhancement.enable = true; @@ -44,30 +38,11 @@ # powertop.enable = true; cpuFreqGovernor = lib.mkDefault "ondemand"; }; - # change battery led to blue on suspend to indicate device is in suspend mode - systemd.services."suspend-led-set" = { - description = "blue led for sleep"; - wantedBy = [ "suspend.target" ]; - before = [ "systemd-suspend.service" ]; - serviceConfig.type = "simple"; - script = '' - ${pkgs.fw-ectool}/bin/ectool led battery blue - ''; - }; - systemd.services."suspend-led-unset" = { - description = "auto led after sleep"; - wantedBy = [ "suspend.target" ]; - after = [ "systemd-suspend.service" ]; - serviceConfig.type = "simple"; - script = '' - ${pkgs.fw-ectool}/bin/ectool led battery auto - ''; - }; boot = { plymouth.enable = true; kernelParams = [ "mem_sleep_default=deep" - "acpi_osi=\"!Windows 2020\"" # otherwise GPU does weird shit that makes the computer look like the RAM is broken + "acpi_osi=\"!Windows 2020\"" ]; kernelModules = [ "acpi_call" ]; kernelPackages = pkgs.linuxPackages_latest; diff --git a/modules/core/user.nix b/modules/core/user.nix index 30222ca..ee3ecce 100644 --- a/modules/core/user.nix +++ b/modules/core/user.nix @@ -49,7 +49,6 @@ "docker" "input" "gay" - "dialout" ]; shell = pkgs.zsh; };