feat: switch to niri+noctalia

modules/home/common/anki-tray.nix

@@ -6,16 +6,18 @@
     systemd.user.services.anki-applet = {
       Unit = {
         Description = "Anki applet";
-        Requires = [ "tray.target" ];
+        Requires = [ "graphical-session.target" ];
         After = [
           "graphical-session.target"
           "tray.target"
         ];
-        PartOf = [ "graphical-session.target" ];
+        PartOf = [
+          "tray.target"
+        ];
       };
 
       Install = {
-        WantedBy = [ "graphical-session.target" ];
+        WantedBy = [ "tray.target" ];
       };
 
       Service = {

modules/home/common/autotiling.nix

@@ -7,7 +7,7 @@ in
   config = lib.mkIf config.swarselmodules.${moduleName} {
     services.${moduleName} = {
       enable = true;
-      systemdTarget = config.wayland.systemd.target;
+      systemdTarget = "sway-session.target";
     };
   };
 

modules/home/common/custom-packages.nix

@@ -11,6 +11,7 @@
       bak
       timer
       e
+      niri-resize
       swarselcheck
       swarselcheck-niri
       waybarupdate

modules/home/common/element-tray.nix

@@ -6,16 +6,18 @@
     systemd.user.services.element-applet = {
       Unit = {
         Description = "Element applet";
-        Requires = [ "tray.target" ];
+        Requires = [ "graphical-session.target" ];
         After = [
           "graphical-session.target"
           "tray.target"
         ];
-        PartOf = [ "graphical-session.target" ];
+        PartOf = [
+          "tray.target"
+        ];
       };
 
       Install = {
-        WantedBy = [ "graphical-session.target" ];
+        WantedBy = [ "tray.target" ];
       };
 
       Service = {

modules/home/common/firezone-tray.nix

@@ -6,18 +6,18 @@
     systemd.user.services.firezone-applet = {
       Unit = {
         Description = "Firezone applet";
-        Requires = [
-          "tray.target"
-        ];
+        Requires = [ "graphical-session.target" ];
         After = [
           "graphical-session.target"
           "tray.target"
         ];
-        PartOf = [ "graphical-session.target" ];
+        PartOf = [
+          "tray.target"
+        ];
       };
 
       Install = {
-        WantedBy = [ "graphical-session.target" ];
+        WantedBy = [ "tray.target" ];
       };
 
       Service = {

modules/home/common/gammastep.nix

@@ -5,6 +5,7 @@ in
 {
   options.swarselmodules.gammastep = lib.mkEnableOption "gammastep settings";
   config = lib.mkIf config.swarselmodules.gammastep {
+    systemd.user.services.gammastep = confLib.overrideTarget "sway-session.target";
     services.gammastep = lib.mkIf (config.swarselsystems.isNixos && !config.swarselsystems.isPublic) {
       enable = true;
       provider = "manual";

modules/home/common/kanshi.nix

@@ -1,4 +1,4 @@
-{ self, lib, pkgs, config, ... }:
+{ self, lib, pkgs, config, confLib, ... }:
 {
   options.swarselmodules.kanshi = lib.mkEnableOption "kanshi settings";
   config = lib.mkIf config.swarselmodules.kanshi {
@@ -14,6 +14,8 @@
         };
       };
     };
+
+    systemd.user.services.kanshi = confLib.overrideTarget "sway-session.target";
     services.kanshi = {
       enable = true;
       settings = [

modules/home/common/obsidian-tray.nix

@@ -6,16 +6,18 @@
     systemd.user.services.obsidian-applet = {
       Unit = {
         Description = "Obsidian applet";
-        Requires = [ "tray.target" ];
+        Requires = [ "graphical-session.target" ];
         After = [
           "graphical-session.target"
           "tray.target"
         ];
-        PartOf = [ "graphical-session.target" ];
+        PartOf = [
+          "tray.target"
+        ];
       };
 
       Install = {
-        WantedBy = [ "graphical-session.target" ];
+        WantedBy = [ "tray.target" ];
       };
 
       Service = {

modules/home/common/sway.nix

@@ -242,6 +242,7 @@ in
         startup = config.swarselsystems.startup ++ [
           { command = "kitty -T kittyterm -o confirm_os_window_close=0 zellij attach --create kittyterm"; }
           { command = "sleep 60; kitty -T spotifytui -o confirm_os_window_close=0 spotify_player"; }
+          { command = "mako"; }
         ];
         seat = {
           "*" = {

modules/home/common/swayidle.nix

@@ -10,23 +10,25 @@ in
         brightnessctl = "${lib.getExe pkgs.brightnessctl}";
         swaylock = "${lib.getExe pkgs.swaylock-effects}";
         suspend = "${pkgs.systemd}/bin/systemctl suspend";
+        noctalia = "/etc/profiles/per-user/${config.swarselsystems.mainUser}/bin/noctalia-shell ipc call";
       in
       {
         enable = true;
-        systemdTarget = config.wayland.systemd.target;
+        # systemdTarget = "sway-session.target";
         extraArgs = [ "-w" ];
         timeouts = [
           { timeout = 60; command = "${brightnessctl} -s; ${brightnessctl} set 80%-"; resumeCommand = "${brightnessctl} -r"; }
           # { timeout = 300; command =  "${lib.getExe pkgs.swaylock-effects} -f --screenshots --clock --effect-blur 7x5 --effect-vignette 0.5:0.5 --fade-in 0.2"; }
-          { timeout = 300; command = "${swaylock} -f"; }
+          # { timeout = 300; command = "${swaylock} -f"; }
+          { timeout = 300; command = "${noctalia} lockScreen lock || ${swaylock} -f"; }
           # { timeout = 600; command = ''${pkgs.sway}/bin/swaymsg "output * dpms off"; resumeCommand = "${pkgs.sway}/bin/swaymsg output * dpms on'';  }
-          { timeout = 600; command = "${suspend}"; }
+          { timeout = 600; command = "${noctalia} sessionMenu lockAndSuspend || ${suspend}"; }
         ];
         events = {
           # { event = "before-sleep"; command = "${lib.getExe pkgs.swaylock-effects} -f --screenshots --clock --effect-blur 7x5 --effect-vignette 0.5:0.5 --fade-in 0.2"; }
           # { event = "after-resume"; command = "${swaylock} -f "; }
-          before-sleep = "${swaylock} -f ";
-          lock = "${swaylock} -f ";
+          # before-sleep = "${swaylock} -f ";
+          # lock = "${swaylock} -f ";
         };
       };
   };

modules/home/common/swayosd.nix

@@ -1,7 +1,8 @@
-{ lib, pkgs, config, ... }:
+{ lib, pkgs, config, confLib, ... }:
 {
   options.swarselmodules.swayosd = lib.mkEnableOption "swayosd settings";
   config = lib.mkIf config.swarselmodules.swayosd {
+    systemd.user.services.swayosd = confLib.overrideTarget "sway-session.target";
     services.swayosd = {
       enable = true;
       package = pkgs.dev.swayosd;

modules/home/common/vesktop-tray.nix

@@ -6,16 +6,18 @@
     systemd.user.services.vesktop-applet = {
       Unit = {
         Description = "Vesktop applet";
-        Requires = [ "tray.target" ];
+        Requires = [ "graphical-session.target" ];
         After = [
           "graphical-session.target"
           "tray.target"
         ];
-        PartOf = [ "graphical-session.target" ];
+        PartOf = [
+          "tray.target"
+        ];
       };
 
       Install = {
-        WantedBy = [ "graphical-session.target" ];
+        WantedBy = [ "tray.target" ];
       };
 
       Service = {

modules/home/common/waybar.nix

@@ -66,8 +66,8 @@ in
       enable = true;
       systemd = {
         enable = false;
-        # target = "sway-session.target";
-        inherit (config.wayland.systemd) target;
+        target = "sway-session.target";
+        # inherit (config.wayland.systemd) target;
       };
       settings = {
         mainBar = {

modules/home/common/zellij.nix

@@ -5,12 +5,14 @@
     programs.zellij = {
       enable = true;
       enableZshIntegration = true;
+      attachExistingSession = false;
+      exitShellOnExit = true;
       settings = {
         pane_frames = false;
         simplified_ui = false;
         default_shell = "zsh";
         copy_on_select = true;
-        on_force_close = "detach";
+        on_force_close = "quit";
         show_startup_tips = false;
         support_kitty_keyboard_protocol = true;
         default_layout = "swarsel";