From e51332065381d99091413c899b8a5f2610af14b6 Mon Sep 17 00:00:00 2001
From: Grisha Shipunov <blame@oxapentane.com>
Date: Tue, 18 Feb 2025 09:54:25 +0100
Subject: [PATCH] software changes

---
 modules/desktop-software.nix |  3 ---
 modules/sway.nix             | 14 ++++++++------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/modules/desktop-software.nix b/modules/desktop-software.nix
index 0ee2847..67b98f1 100644
--- a/modules/desktop-software.nix
+++ b/modules/desktop-software.nix
@@ -5,8 +5,6 @@
     dino
     ffmpeg-full
     firefox-wayland
-    vivaldi
-    vivaldi-ffmpeg-codecs
     gimp
     inkscape
     signal-desktop
@@ -16,7 +14,6 @@
     yt-dlp
     element-desktop
     discord
-    spotify
     mpv
   ];
   programs.steam.enable = true;
diff --git a/modules/sway.nix b/modules/sway.nix
index 1ce6f63..f4e3c43 100644
--- a/modules/sway.nix
+++ b/modules/sway.nix
@@ -1,5 +1,8 @@
 # General Desktop-related config
-{ pkgs, ... }:
+{ pkgs, inputs, ... }:
+let
+  unstablepkgs = inputs.nixpkgs-unstable.legacyPackages.${pkgs.system};
+in
 {
   imports = [
     ./desktop-software.nix
@@ -19,11 +22,10 @@
     termusic
     gsettings-desktop-schemas
     xdg-utils
-    foot
     qt5.qtwayland
     bashmount
-    nautilus
     audacity
+    spotify-player
   ];
 
   # Enable sound.
@@ -61,16 +63,15 @@
     '';
     extraPackages = with pkgs; [
       adwaita-icon-theme
-      alacritty
       bluetui
       foot
       gammastep
       graphicsmagick
       grim
-      i3status-rust
+      unstablepkgs.i3status-rust
       impala
       kanshi
-      mako
+      swaynotificationcenter
       pamixer
       rofi-wayland
       slurp
@@ -78,6 +79,7 @@
       swaylock
       wl-clipboard
       wl-mirror
+      xfce.thunar
     ];
   };
   environment.sessionVariables = {