retire toaster, refactor a bit

6 files changed, 36 insertions, 2 deletions

diff --git a/modules/basic-tools/default.nix b/modules/basic-tools/default.nix
index 19b319c..4fd52ea 100644
--- a/modules/basic-tools/default.nix
+++ b/modules/basic-tools/default.nix
@@ -97,6 +97,15 @@
     '';
   };
 
+  programs.nix-ld.enable = true;
+  environment.variables = {
+      NIX_LD_LIBRARY_PATH = lib.makeLibraryPath [
+        pkgs.stdenv.cc.cc
+      ];
+      NIX_LD = lib.fileContents "${pkgs.stdenv.cc}/nix-support/dynamic-linker";
+  };
+
+
   programs.iftop.enable = true;
   programs.mosh.enable = true;
 
diff --git a/modules/chromium.nix b/modules/chromium.nix
index f7803ab..4a0f453 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-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-native-gpu-memory-buffers --enable-features=VaapiVideoDecoder,VaapiVideoEncoder,CanvasOopRasterization,WebUIDarkMode";
 
   programs.chromium = {
     enable = true;
diff --git a/modules/desktop-software.nix b/modules/desktop-software.nix
index 659dd0e..669270b 100644
--- a/modules/desktop-software.nix
+++ b/modules/desktop-software.nix
@@ -14,5 +14,6 @@
     tor-browser-bundle-bin
     wl-clipboard
     yt-dlp
+    libreoffice
   ];
 }
diff --git a/modules/gnome.nix b/modules/gnome.nix
index 787d489..6af207e 100644
--- a/modules/gnome.nix
+++ b/modules/gnome.nix
@@ -12,6 +12,7 @@
     gnome.gnome-tweaks
     nextcloud-client
     qbittorrent
+    spotify
   ];
 
   environment.gnome.excludePackages = with pkgs; [
@@ -71,6 +72,7 @@
   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 f894dcb..834b38c 100644
--- a/modules/sway.nix
+++ b/modules/sway.nix
@@ -22,7 +22,7 @@
     foot
     qt5.qtwayland
     bashmount
-    (xfce.thunar.override { thunarPlugins = with xfce; [ thunar-volman thunar-archive-plugin ]; })
+    gnome.nautilus
     audacity
   ];
 
diff --git a/modules/vscode.nix b/modules/vscode.nix
new file mode 100644
index 0000000..0bc26d7
--- /dev/null
+++ b/modules/vscode.nix
@@ -0,0 +1,22 @@
+{ 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=";
+      }
+    ];
+  })
+];
+}