diff --git a/common/default.nix b/common/default.nix index 739c0b5..4753b1c 100644 --- a/common/default.nix +++ b/common/default.nix @@ -158,13 +158,6 @@ in wayland.enable = true; }; services.desktopManager.plasma6.enable = true; - # TODO: move out into a plasma.nix module - programs.kde-pim = { - enable = true; - kmail = true; - kontact = true; - merkuro = true; - }; # enable wayland for Chromium and Electron environment.sessionVariables.NIXOS_OZONE_WL = "1"; diff --git a/common/packages.nix b/common/packages.nix index 2dce963..b5a352a 100644 --- a/common/packages.nix +++ b/common/packages.nix @@ -48,6 +48,8 @@ networkmanager-openconnect networkmanager-vpnc networkmanager-openvpn + # TODO: is this still necessary? + kdePackages.akonadi-mime # for KOrganizer # for some Flatpak packkages accountsservice ]; diff --git a/flake.lock b/flake.lock index b2aa4fa..72b16f7 100644 --- a/flake.lock +++ b/flake.lock @@ -210,11 +210,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1722421184, - "narHash": "sha256-/DJBI6trCeVnasdjUo9pbnodCLZcFqnVZiLUfqLH4jA=", + "lastModified": 1722185531, + "narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9f918d616c5321ad374ae6cb5ea89c9e04bf3e58", + "rev": "52ec9ac3b12395ad677e8b62106f0b98c1f8569d", "type": "github" }, "original": { @@ -258,11 +258,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1722519197, - "narHash": "sha256-VEdJmVU2eLFtLqCjTYJd1J7+Go8idAcZoT11IewFiRg=", + "lastModified": 1722221733, + "narHash": "sha256-sga9SrrPb+pQJxG1ttJfMPheZvDOxApFfwXCFO0H9xw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "05405724efa137a0b899cce5ab4dde463b4fd30b", + "rev": "12bf09802d77264e441f48e25459c10c93eada2e", "type": "github" }, "original": { @@ -274,11 +274,11 @@ }, "nur": { "locked": { - "lastModified": 1722709906, - "narHash": "sha256-I27FkJ3qSsxc5aZSwpYHMqJwLpvQt6eV4MrwGfVjCvM=", + "lastModified": 1722450628, + "narHash": "sha256-El3ogv9x+0NMglw/cavXyWZAgoLzC0PRPyORuQOMbgU=", "owner": "nix-community", "repo": "NUR", - "rev": "ac1226f223779364c73f1a450654383768dab1b7", + "rev": "6f645601159190be1c1ecddf14e738d2de45f6b6", "type": "github" }, "original": { diff --git a/home/modules/packages.nix b/home/modules/packages.nix index 9ce8eef..5752988 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -198,6 +198,13 @@ let okular gwenview yakuake + kmail + kontact + korganizer + akonadi-mime # for KOrganizer + kmail-account-wizard + akonadi-import-wizard + kaddressbook kdeconnect dolphin spectacle