diff --git a/flake.lock b/flake.lock index 394efa7..66f46a5 100644 --- a/flake.lock +++ b/flake.lock @@ -57,11 +57,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1679067095, - "narHash": "sha256-G2dJQURL/CCi+8RP6jNJG8VqgtzEMCA+6mNodd3VR6E=", + "lastModified": 1679758258, + "narHash": "sha256-/fsleSIKfnCCzrn4MIAEDTCKeCe+ZxXEPrKykAI5q08=", "owner": "nix-community", "repo": "home-manager", - "rev": "3239e0b40f242f47bf6c0c37b2fd35ab3e76e370", + "rev": "d80bf24dab1c1abb3c36e6e28cd30d27599a9620", "type": "github" }, "original": { @@ -73,11 +73,11 @@ }, "nixlib": { "locked": { - "lastModified": 1677373009, - "narHash": "sha256-kxhz4QUP8tXa/yVSpEzDDZSEp9FvhzRqZzb+SeUaekw=", + "lastModified": 1679187309, + "narHash": "sha256-H8udmkg5wppL11d/05MMzOMryiYvc403axjDNZy1/TQ=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "c9d4f2476046c6a7a2ce3c2118c48455bf0272ea", + "rev": "44214417fe4595438b31bdb9469be92536a61455", "type": "github" }, "original": { @@ -94,11 +94,11 @@ ] }, "locked": { - "lastModified": 1678351966, - "narHash": "sha256-tRFEU0lu3imZb3dtELBY+UbEhWXbb0xlBrsIlpICb+A=", + "lastModified": 1679464055, + "narHash": "sha256-RiZpwkbm1GeKRqrTtGGsEDieJyplMSRG1bQzOZgY378=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "0c043999b16caba6fb571af2d228775729829943", + "rev": "d5cd198c80ee62a801a078ad991c99c0175971cf", "type": "github" }, "original": { @@ -109,11 +109,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1679081381, - "narHash": "sha256-n4+SbrVohxbgbmOTkodfxc3d8W38OfKowD6YNA8j27o=", + "lastModified": 1679705136, + "narHash": "sha256-MDlZUR7wJ3PlPtqwwoGQr3euNOe0vdSSteVVOef7tBY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b573a7f69484a7d213680abb70b4f95bdc28eee5", + "rev": "8f40f2f90b9c9032d1b824442cfbbe0dbabd0dbd", "type": "github" }, "original": { diff --git a/modules/tools/zsh/default.nix b/modules/tools/zsh/default.nix index ca12eeb..cf4d881 100644 --- a/modules/tools/zsh/default.nix +++ b/modules/tools/zsh/default.nix @@ -13,6 +13,10 @@ in { }; config = mkIf cfg.enable { + # Already set in home-manager below, but without this building fails with + # an assertion error that suggests setting this + programs.zsh.enable = true; + aa.home.extraOptions = { programs.zsh = { enable = true; diff --git a/systems/x86_64-linux/carbon/hardware-configuration-zfs.nix b/systems/x86_64-linux/carbon/hardware-configuration-zfs.nix index c23c901..835b98f 100644 --- a/systems/x86_64-linux/carbon/hardware-configuration-zfs.nix +++ b/systems/x86_64-linux/carbon/hardware-configuration-zfs.nix @@ -109,6 +109,4 @@ powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; - # high-resolution display - hardware.video.hidpi.enable = lib.mkDefault true; }