From 5a8230e68eea9d6eded2db2c7e1618f41530d221 Mon Sep 17 00:00:00 2001
From: Grisha Shipunov
Date: Tue, 31 Dec 2024 14:00:49 +0000
Subject: Revert "retire toaster, refactor a bit"

This reverts commit 5b47cc39c1d94d52a791e681fa3152754b9818cd.
---
 modules/chromium.nix         |  2 +-
 modules/desktop-software.nix |  1 -
 modules/gnome.nix            |  2 --
 modules/sway.nix             |  2 +-
 modules/vscode.nix           | 22 ----------------------
 5 files changed, 2 insertions(+), 27 deletions(-)
 delete mode 100644 modules/vscode.nix

(limited to 'modules')

diff --git a/modules/chromium.nix b/modules/chromium.nix
index 4a0f453..f7803ab 100644
--- a/modules/chromium.nix
+++ b/modules/chromium.nix
@@ -5,7 +5,7 @@
     chromium
   ];
 
-  nixpkgs.config.chromium.commandLineArgs = "--enable-features=UseOzonePlatform --ozone-platform=wayland  --force-dark-mode --ignore-gpu-blocklist --enable-gpu-rasterization --enable-zero-copy --enable-native-gpu-memory-buffers --enable-features=VaapiVideoDecoder,VaapiVideoEncoder,CanvasOopRasterization,WebUIDarkMode";
+  nixpkgs.config.chromium.commandLineArgs = "--enable-features=UseOzonePlatform --ozone-platform=wayland  --force-dark-mode --ignore-gpu-blocklist --enable-gpu-rasterization --enable-zero-copy --enable-features=VaapiVideoDecoder,VaapiVideoEncoder,CanvasOopRasterization,WebUIDarkMode";
 
   programs.chromium = {
     enable = true;
diff --git a/modules/desktop-software.nix b/modules/desktop-software.nix
index 669270b..659dd0e 100644
--- a/modules/desktop-software.nix
+++ b/modules/desktop-software.nix
@@ -14,6 +14,5 @@
     tor-browser-bundle-bin
     wl-clipboard
     yt-dlp
-    libreoffice
   ];
 }
diff --git a/modules/gnome.nix b/modules/gnome.nix
index 6af207e..787d489 100644
--- a/modules/gnome.nix
+++ b/modules/gnome.nix
@@ -12,7 +12,6 @@
     gnome.gnome-tweaks
     nextcloud-client
     qbittorrent
-    spotify
   ];
 
   environment.gnome.excludePackages = with pkgs; [
@@ -72,7 +71,6 @@
   programs.bash.vteIntegration = true;
 
   fonts.fonts = with pkgs; [
-    (nerdfonts.override { fonts = [ "FiraCode" "DroidSansMono" ]; })
     monoid
     font-awesome
     dejavu_fonts
diff --git a/modules/sway.nix b/modules/sway.nix
index 834b38c..f894dcb 100644
--- a/modules/sway.nix
+++ b/modules/sway.nix
@@ -22,7 +22,7 @@
     foot
     qt5.qtwayland
     bashmount
-    gnome.nautilus
+    (xfce.thunar.override { thunarPlugins = with xfce; [ thunar-volman thunar-archive-plugin ]; })
     audacity
   ];
 
diff --git a/modules/vscode.nix b/modules/vscode.nix
deleted file mode 100644
index 0bc26d7..0000000
--- a/modules/vscode.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ pkgs, ... }: {
-environment.systemPackages = with pkgs; [
-  (vscode-with-extensions.override {
-    vscodeExtensions = with vscode-extensions; [
-      bbenoist.nix
-      ms-python.python
-      ms-vscode-remote.remote-ssh
-      rust-lang.rust-analyzer
-      vscodevim.vim
-      james-yu.latex-workshop
-      ms-toolsai.jupyter
-    ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
-      {
-        name = "remote-ssh-edit";
-        publisher = "ms-vscode-remote";
-        version = "0.86.0";
-        sha256 = "sha256-JsbaoIekUo2nKCu+fNbGlh5d1Tt/QJGUuXUGP04TsDI=";
-      }
-    ];
-  })
-];
-}
-- 
cgit v1.3.1