diff options
| author | Tim Keller <tjk@tjkeller.xyz> | 2025-12-15 21:42:24 -0600 |
|---|---|---|
| committer | Tim Keller <tjk@tjkeller.xyz> | 2025-12-15 21:43:05 -0600 |
| commit | 40ab982415e27d060ad3a7939e0a749caa9973c0 (patch) | |
| tree | 7d5ca413f028ba3317ebc520236f9fb75ba82eac /archetypes | |
| parent | c88223b386dfa4533934632f9de3ab1810c6c078 (diff) | |
| parent | 65f939b195d7af3fd3be0dee86eec53f712f44f3 (diff) | |
| download | nixos-40ab982415e27d060ad3a7939e0a749caa9973c0.tar.xz nixos-40ab982415e27d060ad3a7939e0a749caa9973c0.zip | |
Merge upstream changes
Diffstat (limited to 'archetypes')
| -rw-r--r-- | archetypes/collections/desktop/xserver.nix | 17 | ||||
| -rw-r--r-- | archetypes/collections/neovim.nix | 2 |
2 files changed, 10 insertions, 9 deletions
diff --git a/archetypes/collections/desktop/xserver.nix b/archetypes/collections/desktop/xserver.nix index 8e01a84..050c9d4 100644 --- a/archetypes/collections/desktop/xserver.nix +++ b/archetypes/collections/desktop/xserver.nix @@ -7,9 +7,14 @@ in { }; config = lib.mkIf cfg.enable { - services.xserver.enable = true; - services.xserver.displayManager.startx.enable = true; - services.libinput.enable = true; # Enable touchpad support + services = { + xserver = { + enable = true; + displayManager.startx.enable = true; + enableTearFree = true; + }; + libinput.enable = true; # Enable touchpad support + }; # Install basic X utilities environment.systemPackages = with pkgs; lib.optionals cfg.utilities.enable [ @@ -25,11 +30,5 @@ in { xorg.xset xwallpaper ]; - - # Enable TearFree option by default - # Not all video drivers support this option - services.xserver.deviceSection = '' - Option "TearFree" "true" - ''; }; } diff --git a/archetypes/collections/neovim.nix b/archetypes/collections/neovim.nix index 5107dbd..0c7edbc 100644 --- a/archetypes/collections/neovim.nix +++ b/archetypes/collections/neovim.nix @@ -19,5 +19,7 @@ in { svelte-language-server tailwindcss-language-server vscode-langservers-extracted + # Misc deps + gcc # Treesitter requires a C compiler ]; } |