From aa8f57b9c236493961e190126dc9c985d9515f24 Mon Sep 17 00:00:00 2001 From: Lander Van den Bulcke Date: Thu, 30 Jan 2025 11:17:56 +0100 Subject: [PATCH] chore: fix deprecation warnings Signed-off-by: Lander Van den Bulcke --- home/lander/features/cli/bat.nix | 3 ++- home/lander/features/cli/btop.nix | 3 ++- home/lander/features/cli/zsh.nix | 3 ++- home/lander/features/workstation/alacritty.nix | 11 +++++++---- hosts/common/optional/virt.nix | 11 +++++------ hosts/wodan/default.nix | 2 +- 6 files changed, 19 insertions(+), 14 deletions(-) diff --git a/home/lander/features/cli/bat.nix b/home/lander/features/cli/bat.nix index ca511c6..e40ad2e 100644 --- a/home/lander/features/cli/bat.nix +++ b/home/lander/features/cli/bat.nix @@ -3,6 +3,7 @@ { programs.bat = { enable = true; - catppuccin.enable = true; }; + + catppuccin.bat.enable = true; } diff --git a/home/lander/features/cli/btop.nix b/home/lander/features/cli/btop.nix index 45ad639..40270fc 100644 --- a/home/lander/features/cli/btop.nix +++ b/home/lander/features/cli/btop.nix @@ -3,6 +3,7 @@ { programs.btop = { enable = true; - catppuccin.enable = true; }; + + catppuccin.btop.enable = true; } diff --git a/home/lander/features/cli/zsh.nix b/home/lander/features/cli/zsh.nix index b5696f4..1a7dee4 100644 --- a/home/lander/features/cli/zsh.nix +++ b/home/lander/features/cli/zsh.nix @@ -9,7 +9,6 @@ autosuggestion.enable = true; syntaxHighlighting = { enable = true; - catppuccin.enable = true; }; history = { @@ -110,4 +109,6 @@ }; }; }; + + catppuccin.zsh-syntax-highlighting.enable = true; } diff --git a/home/lander/features/workstation/alacritty.nix b/home/lander/features/workstation/alacritty.nix index 3dbb13b..9ba3851 100644 --- a/home/lander/features/workstation/alacritty.nix +++ b/home/lander/features/workstation/alacritty.nix @@ -1,9 +1,10 @@ -{pkgs, ...}: let - theme = import ../../../../lib/theme {inherit pkgs;}; -in { +{ pkgs, ... }: +let + theme = import ../../../../lib/theme { inherit pkgs; }; +in +{ programs.alacritty = { enable = true; - catppuccin.enable = true; settings = { env = { TERM = "alacritty"; @@ -25,4 +26,6 @@ in { }; }; }; + + catppuccin.alacritty.enable = true; } diff --git a/hosts/common/optional/virt.nix b/hosts/common/optional/virt.nix index 22b200b..9a1a2f8 100644 --- a/hosts/common/optional/virt.nix +++ b/hosts/common/optional/virt.nix @@ -1,21 +1,20 @@ -{config, pkgs, ... }: +{ config, pkgs, ... }: { programs.dconf.enable = true; - + users.users.lander.extraGroups = [ "libvirtd" ]; - + environment.systemPackages = with pkgs; [ virt-manager virt-viewer - spice + spice spice-gtk spice-protocol win-virtio win-spice - gnome.adwaita-icon-theme ]; - + virtualisation = { libvirtd = { enable = true; diff --git a/hosts/wodan/default.nix b/hosts/wodan/default.nix index 3b8d5f3..fbe29ec 100644 --- a/hosts/wodan/default.nix +++ b/hosts/wodan/default.nix @@ -51,7 +51,7 @@ nixpkgs.config.allowUnfree = true; environment.systemPackages = with pkgs; [ - (firefox.override { extraNativeMessagingHosts = [ passff-host ]; }) + (firefox.override { nativeMessagingHosts = [ passff-host ]; }) vim wget git