toaster: use gnome

2 files changed, 12 insertions, 19 deletions

diff --git a/modules/emacs.nix b/modules/emacs.nix
index 0df6c08..a033a54 100644
--- a/modules/emacs.nix
+++ b/modules/emacs.nix
@@ -9,20 +9,11 @@
     inputs.emacs-overlay.overlay
   ];
 
-  programs.zsh.shellInit = ''
-    eval "$(direnv hook zsh)"
-  '';
-  programs.bash.shellInit = ''
-    eval "$(direnv hook bash)"
-  '';
-
-
   services.emacs = {
     install = true;
     enable = false;
-    package = with pkgs; ((emacsPackagesFor emacsPgtkNativeComp).emacsWithPackages (epkgs: with epkgs; [
+    package = with pkgs; ((emacsPackagesFor emacsPgtk).emacsWithPackages (epkgs: with epkgs; [
       vterm
-      pdf-tools
     ]));
     defaultEditor = false;
   };
diff --git a/modules/gnome.nix b/modules/gnome.nix
index 5254353..8f7f592 100644
--- a/modules/gnome.nix
+++ b/modules/gnome.nix
@@ -1,20 +1,22 @@
 { config, pkgs, ... }: {
 
   environment.systemPackages = with pkgs; [
+    amberol
     celluloid
+    dino
+    firefox-wayland
+    fluffychat
+    gnome-console
     gnome.gnome-boxes
+    gnome.gnome-terminal
     gnome.gnome-tweaks
     nextcloud-client
-    amberol
-    firefox-wayland
-    element-desktop
-    wl-clipboard
     pulseaudioFull
-    screen-message
     qbittorrent
-    dino
-    gnome.gnome-terminal
-    #gnome-console
+    screen-message
+    signal-desktop
+    tdesktop
+    wl-clipboard
   ];
 
   environment.gnome.excludePackages = with pkgs; [
@@ -40,7 +42,7 @@
     };
   };
 
-  qt5 = {
+  qt = {
     enable = true;
     platformTheme = "gnome";
     style = "adwaita-dark";