From caaa7c7c6baaa522dfa90b08df58c20602f645d1 Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Mon, 6 May 2024 21:32:14 +0200 Subject: [PATCH] fix deprecation warnings --- hosts/catbook-j/configuration.nix | 2 +- hosts/catbook-j/modules/input.nix | 2 +- hosts/potatobook-g/configuration.nix | 7 ++++--- modules/desktop/creative.nix | 7 ++++++- modules/desktop/default.nix | 3 +-- modules/desktop/themeing.nix | 2 +- modules/desktop/x.nix | 3 ++- modules/input/default.nix | 13 +++++++------ 8 files changed, 23 insertions(+), 16 deletions(-) diff --git a/hosts/catbook-j/configuration.nix b/hosts/catbook-j/configuration.nix index 81a0966..a380743 100644 --- a/hosts/catbook-j/configuration.nix +++ b/hosts/catbook-j/configuration.nix @@ -78,7 +78,7 @@ }; boot.kernelPackages = pkgs.linuxPackages_zen; - services.xserver.displayManager.autoLogin = { + services.displayManager.autoLogin = { enable = true; user = "jade"; }; diff --git a/hosts/catbook-j/modules/input.nix b/hosts/catbook-j/modules/input.nix index 7043eec..f6d8fee 100644 --- a/hosts/catbook-j/modules/input.nix +++ b/hosts/catbook-j/modules/input.nix @@ -23,5 +23,5 @@ sensitivity = 256; }; - services.xserver.libinput.touchpad.tapping = false; + services.libinput.touchpad.tapping = false; } diff --git a/hosts/potatobook-g/configuration.nix b/hosts/potatobook-g/configuration.nix index c45c889..530f8db 100644 --- a/hosts/potatobook-g/configuration.nix +++ b/hosts/potatobook-g/configuration.nix @@ -65,9 +65,10 @@ boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; - services.xserver.libinput.touchpad.disableWhileTyping = true; - services.xserver.libinput.touchpad.tapping = false; - + services.libinput.touchpad = { + disableWhileTyping = true; + tapping = false; + }; networking.networkmanager.enable = true; networking.hostName = "potatobook-g"; diff --git a/modules/desktop/creative.nix b/modules/desktop/creative.nix index 2eebca9..0828381 100644 --- a/modules/desktop/creative.nix +++ b/modules/desktop/creative.nix @@ -1,4 +1,8 @@ -{pkgs, ...}: { +{ + pkgs, + pkgs-stable, + ... +}: { home-manager.users.jade = {pkgs, ...}: { home.packages = with pkgs; [ audacity @@ -18,6 +22,7 @@ openscad-unstable openscad-lsp + pkgs-stable.font-manager fontforge-gtk onlyoffice-bin_latest diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix index bb04410..7f91df6 100644 --- a/modules/desktop/default.nix +++ b/modules/desktop/default.nix @@ -67,7 +67,7 @@ in services.illum.enable = true; services.avahi = { enable = true; - nssmdns = true; + nssmdns4 = true; openFirewall = true; }; services.smartd = { @@ -124,7 +124,6 @@ in jellyfin-media-player # from environment.systemPackages cleanup - font-manager xdotool xorg.xwininfo gparted diff --git a/modules/desktop/themeing.nix b/modules/desktop/themeing.nix index b310287..c5eb7d8 100644 --- a/modules/desktop/themeing.nix +++ b/modules/desktop/themeing.nix @@ -37,7 +37,7 @@ }; qt = { enable = true; - platformTheme = "gtk"; + platformTheme.name = "gtk"; }; }; }; diff --git a/modules/desktop/x.nix b/modules/desktop/x.nix index dab34ec..50f9666 100644 --- a/modules/desktop/x.nix +++ b/modules/desktop/x.nix @@ -7,7 +7,6 @@ }; displayManager = { - defaultSession = "none+xmonad"; gdm.enable = true; }; @@ -15,4 +14,6 @@ enable = true; }; }; + + services.displayManager.defaultSession = "none+xmonad"; } diff --git a/modules/input/default.nix b/modules/input/default.nix index 88302da..62b0ec9 100644 --- a/modules/input/default.nix +++ b/modules/input/default.nix @@ -2,14 +2,15 @@ imports = [ ./evremap.nix ]; - services.xserver = { - xkb = { - layout = "us"; - variant = "altgr-intl"; - }; - + services = { libinput = { enable = true; }; + xserver = { + xkb = { + layout = "us"; + variant = "altgr-intl"; + }; + }; }; }