From 96880cc7b7045232e2b109ae87afd704efacc2f3 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Thu, 6 Apr 2023 23:03:28 +0200 Subject: [PATCH] profiles/gnome: init from legacy --- legacy/modules/desktop-default.nix | 20 ------------------ profiles/default.nix | 1 + profiles/gnome/default.nix | 34 ++++++++++++++++++++++++++++++ profiles/nautilus/default.nix | 3 +++ 4 files changed, 38 insertions(+), 20 deletions(-) create mode 100644 profiles/gnome/default.nix diff --git a/legacy/modules/desktop-default.nix b/legacy/modules/desktop-default.nix index 2199fd2..3220d78 100644 --- a/legacy/modules/desktop-default.nix +++ b/legacy/modules/desktop-default.nix @@ -1,20 +1,6 @@ { config, lib, pkgs, ... }: { - programs.gnome-disks.enable = true; - services.udisks2.enable = true; - - xdg.mime.enable = true; - - # make gnome settings persistent - programs.dconf.enable = true; - - # gnome services - services.dbus.packages = [ pkgs.dconf ]; - services.udev.packages = [ pkgs.gnome.gnome-settings-daemon ]; - services.gnome.gnome-keyring.enable = true; - environment.systemPackages = with pkgs; [ - glib evince firefox ghostwriter @@ -23,10 +9,6 @@ resynthesizer ]; }) - gnome.adwaita-icon-theme - gnome.dconf-editor - gnome.eog - gnome.file-roller keepassxc libreoffice (mpv.override { @@ -38,13 +20,11 @@ ]; }) newsflash - polkit_gnome rhythmbox tdesktop thunderbird vlc wayvnc - xdg-utils zathura zeal # terminal diff --git a/profiles/default.nix b/profiles/default.nix index 6c9725b..fff8890 100644 --- a/profiles/default.nix +++ b/profiles/default.nix @@ -8,6 +8,7 @@ ./development ./filesystem ./gaming + ./gnome ./latex ./media ./meeting diff --git a/profiles/gnome/default.nix b/profiles/gnome/default.nix new file mode 100644 index 0000000..6bc8d49 --- /dev/null +++ b/profiles/gnome/default.nix @@ -0,0 +1,34 @@ +{ config, lib, pkgs, ... }: +let + cfg = config.my.profiles.gnome; +in +{ + options.my.profiles.gnome = with lib; { + enable = mkEnableOption "gnome profile"; + }; + + config = lib.mkIf cfg.enable { + programs.gnome-disks.enable = true; + services.udisks2.enable = true; + + xdg.mime.enable = true; + + # make gnome settings persistent + programs.dconf.enable = true; + + # gnome services + services.dbus.packages = [ pkgs.dconf ]; + services.udev.packages = [ pkgs.gnome.gnome-settings-daemon ]; + services.gnome.gnome-keyring.enable = true; + + environment.systemPackages = with pkgs; [ + glib + gnome.adwaita-icon-theme + gnome.dconf-editor + gnome.eog + gnome.file-roller + polkit_gnome + xdg-utils + ]; + }; +} diff --git a/profiles/nautilus/default.nix b/profiles/nautilus/default.nix index ca15a7b..5c85613 100644 --- a/profiles/nautilus/default.nix +++ b/profiles/nautilus/default.nix @@ -8,6 +8,9 @@ in }; config = lib.mkIf cfg.enable { + # make sure gnome parts are there for storing settings + my.profiles.gnome.enable = true; + # enable trash & network-mount services.gvfs.enable = true;