diff --git a/home/calendars.nix b/home/calendars.nix index bb3b888..01a61ea 100644 --- a/home/calendars.nix +++ b/home/calendars.nix @@ -1,12 +1,6 @@ { config, pkgs, ... }: let - baikalRemote = slug: { - passwordCommand = [ "secret-tool" "lookup" "server" "baikal.ktiu.net" "account" "till" ]; - userName = "till"; - type = "caldav"; - url = "https://baikal.ktiu.net/dav.php/calendars/till/${slug}"; - }; myRemote = slug: { passwordCommand = [ "secret-tool" "lookup" "server" "kalender.ktiu.net" "account" "ktiu" ]; diff --git a/home/gnome/default.nix b/home/gnome/default.nix index 5721704..8336e51 100644 --- a/home/gnome/default.nix +++ b/home/gnome/default.nix @@ -7,6 +7,8 @@ size = 32; }; + services.gnome-keyring.enable = false; + home.packages = with pkgs.gnomeExtensions; [ run-or-raise removable-drive-menu diff --git a/system/gnome.nix b/system/gnome.nix index 8d5f0e9..2e23e72 100644 --- a/system/gnome.nix +++ b/system/gnome.nix @@ -1,24 +1,29 @@ -{ config, pkgs, ... }: +{ lib, config, pkgs, ... }: + { - services.displayManager = { - gdm.enable = true; - }; + services.desktopManager.gnome.enable = true; - services.desktopManager.gnome.enable = true; - services.gnome.gnome-browser-connector.enable = true; + services.displayManager = { + gdm.enable = true; + defaultSession = "gnome"; + }; - environment.gnome.excludePackages = (with pkgs; [ - gnome-tour - geary - yelp - gnome-contacts - gnome-initial-setup - ]); + environment.gnome.excludePackages = (with pkgs; [ + gnome-tour + geary + yelp + gnome-contacts + gnome-initial-setup + ]); + + environment.systemPackages = with pkgs; [ + gnome-sound-recorder + gnome-tweaks + gnome-boxes + ]; + + services.gnome.gnome-browser-connector.enable = true; + services.gnome.gnome-keyring.enable = lib.mkForce false; - environment.systemPackages = with pkgs; [ - gnome-sound-recorder - gnome-tweaks - gnome-boxes - ]; }