Merge branch 'nixos-23.11'

This commit is contained in:
Felix Buehler 2023-11-29 22:38:57 +01:00
commit ad523b3a88
15 changed files with 128 additions and 143 deletions

View file

@ -10,7 +10,7 @@ in
config = lib.mkIf cfg.enable {
hardware.bluetooth = {
enable = true;
package = pkgs.bluezFull;
package = pkgs.bluez;
settings = {
General = {
Enable = "Source,Sink,Media,Socket";

View file

@ -69,24 +69,10 @@ in
#dbhost = "/run/postgresql";
};
extraApps = {
calendar = let version = "4.5.2"; in pkgs.fetchNextcloudApp {
url = "https://github.com/nextcloud-releases/calendar/releases/download/v${version}/calendar-v${version}.tar.gz";
sha256 = "sha256-n7GjgAyw2SLoZTEfakmI3IllWUk6o1MF89Zt3WGhR6A=";
};
contacts = let version = "5.4.2"; in pkgs.fetchNextcloudApp {
url = "https://github.com/nextcloud-releases/contacts/releases/download/v${version}/contacts-v${version}.tar.gz";
sha256 = "sha256-IkKHJ3MY/UPZqa4H86WGOEOypffMIHyJ9WvMqkq/4t8=";
};
tasks = let version = "0.15.0"; in pkgs.fetchNextcloudApp {
url = "https://github.com/nextcloud/tasks/releases/download/v${version}/tasks.tar.gz";
sha256 = "sha256-zMMqtEWiXmhB1C2IeWk8hgP7eacaXLkT7Tgi4NK6PCg=";
};
deck = let version = "1.11.0"; in pkgs.fetchNextcloudApp {
url = "https://github.com/nextcloud/deck/releases/download/v${version}/deck.tar.gz";
sha256 = "sha256-stb9057pP8WXIhztNl7H8ymLqSZzSulgKgB2cbib2pQ=";
};
extraApps = with pkgs.nextcloud27Packages.apps; {
inherit calendar contacts tasks deck;
};
extraAppsEnable = true;
};
#postgresql = {

View file

@ -21,7 +21,7 @@ in
monospace = [ "Ubuntu Mono" ];
};
fonts = with pkgs; [
packages = with pkgs; [
cantarell-fonts # gnome default
fira
fira-code # coding

View file

@ -19,7 +19,7 @@ in
virtualisation.libvirtd.enable = true;
environment.systemPackages = with pkgs; [
virtmanager
virt-manager
];
}