From a48eb45a486627961760e2f3bc6ce0a9a65ca0c9 Mon Sep 17 00:00:00 2001
From: Nydragon <contact@ccnlc.eu>
Date: Wed, 2 Oct 2024 19:05:14 +0200
Subject: [PATCH] feat: add nysh as systemd unit and remove swaync

---
 home/hyprland/default.nix       |  3 --
 home/sway/default.nix           |  6 ----
 hosts/brontes/configuration.nix |  1 -
 hosts/brontes/home.nix          |  1 -
 hosts/marr/configuration.nix    | 22 +++++++++------
 hosts/marr/home.nix             |  3 +-
 modules/home-manager.nix        |  4 +--
 options/default.nix             |  2 ++
 options/nysh.nix                | 50 +++++++++++++++++++++++++++++++++
 9 files changed, 70 insertions(+), 22 deletions(-)
 create mode 100644 options/nysh.nix

diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix
index ed0a69b..c180e2a 100644
--- a/home/hyprland/default.nix
+++ b/home/hyprland/default.nix
@@ -20,12 +20,9 @@ lib.mkIf osConfig.programs.hyprland.enable {
       ];
 
       exec-once = [
-        "${pkgs.swaynotificationcenter}/bin/swaync"
         "${pkgs.nextcloud-client}/bin/nextcloud --background"
         "${pkgs.kdeconnect}/bin/kdeconnect-indicator"
         "${pkgs.protonmail-bridge-gui}/bin/protonmail-bridge-gui --no-window"
-        "${pkgs.waybar}/bin/waybar"
-        "${pkgs.nysh}/bin/nysh"
 
         # keepassxc ignores themeing and doesnt show up in system tray otherwise
         # Dirty solution but hey
diff --git a/home/sway/default.nix b/home/sway/default.nix
index a6fb4cb..7028fa4 100644
--- a/home/sway/default.nix
+++ b/home/sway/default.nix
@@ -115,19 +115,13 @@ lib.mkIf osConfig.programs.sway.enable {
         #: }}}
         #: Startup {{{
         startup = [
-          { command = "${pkgs.swaynotificationcenter}/bin/swaync"; }
           { command = "${pkgs.nextcloud-client}/bin/nextcloud --background"; }
           { command = "${pkgs.kdeconnect}/bin/kdeconnect-indicator"; }
           { command = "${pkgs.protonmail-bridge-gui}/bin/protonmail-bridge-gui --no-window"; }
-          { command = "${pkgs.nysh}/bin/nysh"; }
           {
             command = "${pkgs.scripts.set-background}/bin/set-background -f ${wallpaper}";
             always = true;
           }
-          {
-            command = "${pkgs.swaynotificationcenter}/bin/swaync-client --reload-config --reload-css";
-            always = true;
-          }
         ];
         #: }}}
         assigns = {
diff --git a/hosts/brontes/configuration.nix b/hosts/brontes/configuration.nix
index d907040..f359f30 100644
--- a/hosts/brontes/configuration.nix
+++ b/hosts/brontes/configuration.nix
@@ -103,7 +103,6 @@
     htop
     eza
     bat
-    swaynotificationcenter
     nfs-utils
   ];
 
diff --git a/hosts/brontes/home.nix b/hosts/brontes/home.nix
index fd3d088..470c52c 100644
--- a/hosts/brontes/home.nix
+++ b/hosts/brontes/home.nix
@@ -31,7 +31,6 @@
     services = {
       blueman-applet.enable = true;
       swayidle.enable = true;
-      swaync.enable = true;
       syncthing.enable = true;
     };
 
diff --git a/hosts/marr/configuration.nix b/hosts/marr/configuration.nix
index 88d3872..bc66bb2 100644
--- a/hosts/marr/configuration.nix
+++ b/hosts/marr/configuration.nix
@@ -14,15 +14,21 @@
     ./home.nix
   ];
 
-  modules.system = {
-    networking = {
-      bluetooth.enable = true;
-      wifi.enable = true;
+  modules = {
+    system = {
+      networking = {
+        bluetooth.enable = true;
+        wifi.enable = true;
+      };
+      type = {
+        graphical.enable = true;
+        workstation.enable = true;
+        gaming.enable = true;
+      };
     };
-    type = {
-      graphical.enable = true;
-      workstation.enable = true;
-      gaming.enable = true;
+
+    services = {
+      nysh.enable = true;
     };
   };
 
diff --git a/hosts/marr/home.nix b/hosts/marr/home.nix
index 56edcd0..c98dbfb 100644
--- a/hosts/marr/home.nix
+++ b/hosts/marr/home.nix
@@ -39,7 +39,6 @@
     };
 
     services = {
-      swaync.enable = true;
       blueman-applet.enable = true;
       swayidle.enable = true;
       syncthing.enable = true;
@@ -95,6 +94,8 @@
         scripts.genswitch
         scripts.gentest
         scripts.editsym
+        scripts.deployswitch
+        scripts.deploytest
       ];
     };
   };
diff --git a/modules/home-manager.nix b/modules/home-manager.nix
index 23075ba..05dac4f 100644
--- a/modules/home-manager.nix
+++ b/modules/home-manager.nix
@@ -1,7 +1,7 @@
 {
   self,
   inputs,
-  lib,
+  inputs',
   ...
 }:
 {
@@ -10,7 +10,7 @@
     useGlobalPkgs = true;
     useUserPackages = true;
     extraSpecialArgs = {
-      inherit self inputs;
+      inherit self inputs inputs';
     };
     verbose = true;
   };
diff --git a/options/default.nix b/options/default.nix
index 797d1be..a98a4ae 100644
--- a/options/default.nix
+++ b/options/default.nix
@@ -1,6 +1,8 @@
 {
   imports = [
     ./media.nix
+    ./nysh.nix
+
     ./system
     ./container
     ./server
diff --git a/options/nysh.nix b/options/nysh.nix
new file mode 100644
index 0000000..dc043e2
--- /dev/null
+++ b/options/nysh.nix
@@ -0,0 +1,50 @@
+{
+  lib,
+  inputs',
+  config,
+  ...
+}:
+let
+  inherit (lib) mkEnableOption mkOption;
+  inherit (lib.types) package;
+  cfg = config.modules.services.nysh;
+in
+{
+  options.modules.services.nysh = {
+    enable = mkEnableOption "nysh";
+    package = mkOption {
+      type = package;
+      default = inputs'.nysh.packages.nysh;
+    };
+  };
+
+  config = {
+    systemd.user.services.nysh = {
+      wantedBy = [ "graphical-session.target" ];
+
+      unitConfig = {
+        After = [ "graphical-session-pre.target" ];
+        PartOf = [ "graphical-session.target" ];
+      };
+      serviceConfig = {
+        Type = "simple";
+        ExecStart = "/bin/sh -lc ${cfg.package}/bin/nysh";
+        Restart = "on-failure";
+      };
+    };
+
+    #   systemd.user.services.nysh = {
+    #Install.WantedBy = [ "graphical-session.target" ];
+
+    #Unit = {
+    #After = [ "graphical-session-pre.target" ];
+    #PartOf = [ "graphical-session.target" ];
+    #};
+    #Service = {
+    #Type = "simple";
+    #ExecStart = "/bin/sh -lc ${cfg.package}/bin/nysh";
+    #Restart = "on-failure";
+    #};
+    #};
+  };
+}