diff options
| author | Vincent Ambo <tazjin@tvl.su> | 2024-08-31T22·03+0300 |
|---|---|---|
| committer | clbot <clbot@tvl.fyi> | 2024-09-05T20·56+0000 |
| commit | 609b68031b0c0873bdba580c5d743b5557ca79c3 (patch) | |
| tree | 11405f3a70972a5f5b27837455197ec7afb86e6f /users/tazjin/nixos | |
| parent | 200d49a0e1ee19b66f22347888b15ed63da60bcb (diff) | |
chore(3p/sources): bump channels & overlays (2024-09-01) r/8653
Included changes: * users/aspen: explicitly use open-source nvidia driver This now has to be specified explicitly, otherwise evaluation fails with an error. * users/aspen: nixfmt -> nixfmt-classic * users/aspen: fixes for renamed packages & options * users/tazjin: fixes for renamed packages & options * 3p/overlays: remove cbtemulator patch (merged upstream) * tvix/shell: remove unnecessary patches (merged upstream) * 3p/rust-crates: mark libgit2_sys as broken * users/Profpatsch: mark git-db as broken * 3p/overlays: pick `mypaint` from stable channel * tvix: fix comments that clippy doesn't like anymore * tvix/glue: disable a misfiring clippy lint (applying its suggestion breaks code below) Change-Id: I6d3fc027694bbe7425a2d25dc53d65467a44f3b0 Reviewed-on: https://cl.tvl.fyi/c/depot/+/12403 Tested-by: BuildkiteCI Reviewed-by: aspen <root@gws.fyi> Reviewed-by: Profpatsch <mail@profpatsch.de> Autosubmit: tazjin <tazjin@tvl.su>
Diffstat (limited to 'users/tazjin/nixos')
| -rw-r--r-- | users/tazjin/nixos/arbat/default.nix | 2 | ||||
| -rw-r--r-- | users/tazjin/nixos/modules/desktop.nix | 8 | ||||
| -rw-r--r-- | users/tazjin/nixos/zamalek/default.nix | 4 |
3 files changed, 5 insertions, 9 deletions
diff --git a/users/tazjin/nixos/arbat/default.nix b/users/tazjin/nixos/arbat/default.nix index 3bf039e94bae..c87aa445c29c 100644 --- a/users/tazjin/nixos/arbat/default.nix +++ b/users/tazjin/nixos/arbat/default.nix @@ -66,8 +66,6 @@ in mouse.naturalScrolling = false; mouse.disableWhileTyping = true; }; - # services.xserver.libinput.touchpad.clickMethod = "clickfinger"; - # services.xserver.libinput.touchpad.tapping = false; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; system.stateVersion = "24.11"; diff --git a/users/tazjin/nixos/modules/desktop.nix b/users/tazjin/nixos/modules/desktop.nix index f59b868ad363..6f7c8906334b 100644 --- a/users/tazjin/nixos/modules/desktop.nix +++ b/users/tazjin/nixos/modules/desktop.nix @@ -14,11 +14,7 @@ libinput.enable = true; xserver = { - enable = true; - xkb.layout = "us"; - xkb.options = "caps:super"; - - displayManager.sessionPackages = [ pkgs.niri ]; + enable = true; # wayland doesn't work otherwise ...?! displayManager.gdm = { enable = true; wayland = true; @@ -26,6 +22,8 @@ }; }; + services.displayManager.sessionPackages = [ pkgs.niri ]; + programs.xwayland.enable = true; environment.systemPackages = with pkgs; [ diff --git a/users/tazjin/nixos/zamalek/default.nix b/users/tazjin/nixos/zamalek/default.nix index e6159444d246..ebaf2d2cfa6d 100644 --- a/users/tazjin/nixos/zamalek/default.nix +++ b/users/tazjin/nixos/zamalek/default.nix @@ -74,8 +74,8 @@ in graphics.enable = true; }; - services.xserver.libinput.touchpad.clickMethod = "clickfinger"; - services.xserver.libinput.touchpad.tapping = false; + services.libinput.touchpad.clickMethod = "clickfinger"; + services.libinput.touchpad.tapping = false; services.avahi.enable = true; services.tailscale.enable = true; |