From 84137f30beadaa3bdd5bfe02b5ab2b1be78ad3ec Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Sun, 18 Jul 2021 20:19:06 -0600
Subject: [PATCH] [NixOS] Add notify-osd service

---
 nixos/essential.nix            | 1 +
 nixos/flake.nix                | 3 +++
 nixos/home-manager             | 2 +-
 nixos/home-manager.nix         | 6 ++++--
 nixos/machines/ryzen-shine.nix | 5 +++++
 nixos/users.nix                | 4 ----
 6 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/nixos/essential.nix b/nixos/essential.nix
index 10c3c223..39bb10e8 100644
--- a/nixos/essential.nix
+++ b/nixos/essential.nix
@@ -41,6 +41,7 @@ in
     # Haskell Desktop
     haskellPackages.imalison-xmonad
     haskellPackages.imalison-taffybar
+    haskellPackages.gtk-sni-tray
     haskellPackages.status-notifier-item
     haskellPackages.dbus-hslogger
 
diff --git a/nixos/flake.nix b/nixos/flake.nix
index 297d15a6..117cbd64 100644
--- a/nixos/flake.nix
+++ b/nixos/flake.nix
@@ -42,6 +42,9 @@
     imports = [
       home-manager.nixosModule
     ];
+    home-manager.useGlobalPkgs = true;
+    home-manager.useUserPackages = true;
+    home-manager.users.imalison = import ./home-manager.nix;
   });
   piHardware = ({ ... }: {
     imports = [
diff --git a/nixos/home-manager b/nixos/home-manager
index 88c5bb85..1b533ee0 160000
--- a/nixos/home-manager
+++ b/nixos/home-manager
@@ -1 +1 @@
-Subproject commit 88c5bb85a32d66f1ac50835cf36de7a567549d18
+Subproject commit 1b533ee0c5407df22334d66ab400f8f6c33b2d89
diff --git a/nixos/home-manager.nix b/nixos/home-manager.nix
index 0e424325..fe6ae070 100644
--- a/nixos/home-manager.nix
+++ b/nixos/home-manager.nix
@@ -2,7 +2,6 @@
   xsession = {
     enable = true;
     preferStatusNotifierItems = true;
-    windowManager.command = "${pkgs.haskellPackages.imalison-xmonad}/bin/imalison-xmonad";
     profileExtra = ''
       export ROFI_SYSTEMD_TERM="alacritty -e"
       . "$HOME/.lib/login.sh"
@@ -41,7 +40,10 @@
     package = pkgs.haskellPackages.imalison-taffybar;
   };
 
-  # notifyosd
+  services.notify-osd = {
+    enable = true;
+    package = pkgs.notify-osd-customizable;
+  };
   # skippyxd
 
   services.kdeconnect = {
diff --git a/nixos/machines/ryzen-shine.nix b/nixos/machines/ryzen-shine.nix
index e8c3160f..54b71ccc 100644
--- a/nixos/machines/ryzen-shine.nix
+++ b/nixos/machines/ryzen-shine.nix
@@ -2,6 +2,7 @@
 
 {
   imports = [
+    ../users.nix
     ../full.nix
     ../dfinity.nix
   ];
@@ -25,6 +26,10 @@
     videoDrivers = [ "nvidia" ];
   };
 
+  hardware.nvidia.modesetting.enable = true;
+
+  hardware.opengl.driSupport32Bit = true;
+
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
 
diff --git a/nixos/users.nix b/nixos/users.nix
index ae4c34be..f1c8d5d5 100644
--- a/nixos/users.nix
+++ b/nixos/users.nix
@@ -38,9 +38,5 @@
     };
   };
 
-  home-manager.useGlobalPkgs = true;
-  home-manager.useUserPackages = true;
-  home-manager.users.imalison = import ./home-manager.nix;
-
   nix.trustedUsers = ["imalison" "kat"];
 }