diff --git a/modules/desktop/gnome.nix b/modules/desktop/gnome.nix index f440fa2..96ff7de 100644 --- a/modules/desktop/gnome.nix +++ b/modules/desktop/gnome.nix @@ -5,19 +5,17 @@ ... }: let cfg = config.my.gnome; - - #applyGnomeUserSettings = { - # home.packages = with pkgs; [ - # gnome.gpaste - # amberol - # ]; - -# dconf.settings = { - # "org/gnome/desktop/peripherals/keyboard" = { - # numlock-state = true; - # }; - # }; - #}; + applyGnomeUserSettings = { + home.packages = with pkgs; [ + gnome.gpaste + amberol + ]; + dconf.settings = { + "org/gnome/desktop/peripherals/keyboard" = { + numlock-state = true; + }; + }; + }; in { options.my.gnome = { enable = lib.mkEnableOption "gnome desktop"; @@ -39,7 +37,9 @@ in { }; }; - environment.systemPackages = [pkgs.gnomeExtensions.gsconnect]; + environment.systemPackages = with pkgs; [ + gnomeExtensions.gsconnect + ]; # remove some gnome default apps environment.gnome.excludePackages = with pkgs.gnome; [ @@ -56,8 +56,8 @@ in { ]; home-manager.users = { - # vinzenz = lib.mkIf config.my.home.vinzenz.enable applyGnomeUserSettings; - # ronja = lib.mkIf config.my.home.ronja.enable applyGnomeUserSettings; + vinzenz = lib.mkIf config.my.home.vinzenz.enable applyGnomeUserSettings; + ronja = lib.mkIf config.my.home.ronja.enable applyGnomeUserSettings; }; }; } diff --git a/modules/desktop/kde.nix b/modules/desktop/kde.nix index 24af742..aa62262 100644 --- a/modules/desktop/kde.nix +++ b/modules/desktop/kde.nix @@ -6,17 +6,16 @@ }: let cfg = config.my.kde; - # applyKdeUserSettings = { - # #home = { - # # packages = with pkgs; [ - # # ]; - # #}; - - # services.kdeconnect = { - # enable = true; - # indicator = true; - # }; - # }; + applyKdeUserSettings = { + home = { + packages = with pkgs; [ + ]; + }; + services.kdeconnect = { + enable = true; + indicator = true; + }; + }; in { options.my.kde = { enable = lib.mkEnableOption "KDE desktop"; @@ -37,17 +36,19 @@ in { }; }; - environment.systemPackages = with pkgs; [ - libsForQt5.kate - libsForQt5.kalk - ]; + environment = { + systemPackages = with pkgs; [ + libsForQt5.kate + libsForQt5.kalk + ]; - environment.plasma5.excludePackages = with pkgs.libsForQt5; [ - elisa - gwenview - okular - khelpcenter - ]; + plasma5.excludePackages = with pkgs.libsForQt5; [ + elisa + gwenview + okular + khelpcenter + ]; + }; programs = { dconf.enable = true; @@ -55,8 +56,8 @@ in { }; home-manager.users = { - #vinzenz = lib.mkIf config.my.home.vinzenz.enable applyKdeUserSettings; - #ronja = lib.mkIf config.my.home.ronja.enable applyKdeUserSettings; + vinzenz = lib.mkIf config.my.home.vinzenz.enable applyKdeUserSettings; + ronja = lib.mkIf config.my.home.ronja.enable applyKdeUserSettings; }; }; } diff --git a/modules/home/vinzenz.nix b/modules/home/vinzenz.nix index 2538077..799eb62 100644 --- a/modules/home/vinzenz.nix +++ b/modules/home/vinzenz.nix @@ -80,13 +80,6 @@ in { ''; }; - services = { - kdeconnect = { - enable = true; - indicator = true; - }; - }; - programs = { home-manager.enable = true;