From 3fa467e483c4de49a5b22e7d4120e0d323055023 Mon Sep 17 00:00:00 2001
From: Erwin Boskma <erwin@datarift.nl>
Date: Mon, 29 Nov 2021 08:05:46 +0100
Subject: [PATCH] Switched back to firefox-bin, added some tools

---
 home-manager/modules/firefox/default.nix |  2 +-
 home-manager/modules/sway/default.nix    | 22 +++++++++++-----------
 modules/base/default.nix                 |  5 +++++
 modules/desktop/default.nix              |  4 ++++
 4 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/home-manager/modules/firefox/default.nix b/home-manager/modules/firefox/default.nix
index eaa1de8..a390b46 100644
--- a/home-manager/modules/firefox/default.nix
+++ b/home-manager/modules/firefox/default.nix
@@ -41,7 +41,7 @@ in
   config = mkIf (cfg.enable) {
     programs.firefox = {
       enable = true;
-      package = pkgs.firefox-wayland;
+      package = pkgs.firefox-bin;
 
       profiles = {
         private = {
diff --git a/home-manager/modules/sway/default.nix b/home-manager/modules/sway/default.nix
index b380abc..87b2eaa 100644
--- a/home-manager/modules/sway/default.nix
+++ b/home-manager/modules/sway/default.nix
@@ -190,17 +190,17 @@ in
         include /etc/sway/config.d/*
       '';
 
-      extraSessionCommands =
-        ''
-          export _JAVA_AWT_WM_NONREPARENTING=1
-          export MOZ_ENABLE_WAYLAND=1
-          export MOZ_DBUS_REMOTE=1
-          export QT_QPA_PLATFORM=wayland
-          export QT_WAYLAND_DISABLE_WINDOWDECORATION="1"
-          export QT_QPA_PLATFORMTHEME=qt5ct
-          export SDL_VIDEODRIVER=wayland
-          export SSH_AUTH_SOCK="''${XDG_RUNTIME_DIR}/gnupg/S.gpg-agent.ssh"
-        '';
+      # extraSessionCommands =
+      #   ''
+      #     export _JAVA_AWT_WM_NONREPARENTING=1
+      #     export MOZ_ENABLE_WAYLAND=1
+      #     export MOZ_DBUS_REMOTE=1
+      #     export QT_QPA_PLATFORM=wayland
+      #     export QT_WAYLAND_DISABLE_WINDOWDECORATION="1"
+      #     export QT_QPA_PLATFORMTHEME=qt5ct
+      #     export SDL_VIDEODRIVER=wayland
+      #     export SSH_AUTH_SOCK="''${XDG_RUNTIME_DIR}/gnupg/S.gpg-agent.ssh"
+      #   '';
 
       wrapperFeatures = {
         base = true;
diff --git a/modules/base/default.nix b/modules/base/default.nix
index e8c0e33..f5ea5d5 100644
--- a/modules/base/default.nix
+++ b/modules/base/default.nix
@@ -36,5 +36,10 @@ in
     };
 
     programs.fish.enable = true;
+
+    environment.systemPackages = with pkgs; [
+      dogdns
+      file
+    ];
   };
 }
diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
index 1c3b5c4..58fd624 100644
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@@ -68,6 +68,7 @@ in
 
       home.packages = with pkgs; [
         bitwarden
+        bottom
         fd
         git
         gnome.nautilus
@@ -80,6 +81,8 @@ in
         ripgrep
         signal-desktop
         steam
+        steamcmd
+        steam-tui
         tdesktop
         unzip
         wl-clipboard
@@ -181,6 +184,7 @@ in
       QT_QPA_PLATFORMTHEME = "qt5ct";
       SDL_VIDEODRIVER = "wayland";
       SSH_AUTH_SOCK = ''''${XDG_RUNTIME_DIR}/gnupg/S.gpg-agent.ssh'';
+      AMD_VULKAN_ICD = "RADV";
     };
 
   };