Completed migration

home/shell/other.nix

@@ -26,5 +26,4 @@
     ++ lib.optionals osConfig.niksos.portable [
       inputs.somcli.defaultPackage.${pkgs.system}
     ];
-    ;
 }

home/wayland/hyprland/binds.nix

@@ -56,59 +56,54 @@
         in
           builtins.toString (x + 1 - (c * 10));
       in [
-        "$mod, ${ws}, workspace, ${toString (x + 1)}"
-        "$mod SHIFT, ${ws}, movetoworkspace, ${toString (x + 1)}"
+        "$m, ${ws}, workspace, ${toString (x + 1)}"
+        "$m SHIFT, ${ws}, movetoworkspace, ${toString (x + 1)}"
       ]
     )
     10);
 in {
-  config = lib.mkIf desktop {
-    home.file.".XCompose".text = ''
-      <Multi_key> <s> <h> <r> <u> <g> : "¯\\_(ツ)_/¯" # Shrug.
-    '';
-
   wayland.windowManager.hyprland.settings = {
-      "$mod" = "ALT";
+    "$m" = "ALT";
 
     bindm = [
-        "$mod, mouse:272, movewindow"
-        "$mod, mouse:273, resizewindow"
-        "$mod ALT, mouse:272, resizewindow"
+      "$m, mouse:272, movewindow"
+      "$m, mouse:273, resizewindow"
+      "$m ALT, mouse:272, resizewindow"
     ];
 
     bind =
       [
-          "$mod SHIFT, E, exec, uwsm stop"
-          "$mod, Q, killactive,"
-          "$mod, F, fullscreen,"
-          "$mod, SPACE, togglefloating,"
-          "$mod, O, pseudo,"
-          "$mod ALT, ,resizeactive,"
+        "$m SHIFT, E, exec, uwsm stop"
+        "$m, Q, killactive,"
+        "$m, F, fullscreen,"
+        "$m, SPACE, togglefloating,"
+        "$m, O, pseudo,"
+        "$m ALT, ,resizeactive,"
 
-          "$mod, D, exec, ${fuzzel}"
-          "$mod, Return, exec, ${foot}"
-          "$mod Shift, Return, exec, ${firefox}"
-          "$mod, Escape, exec, ${hyprlock}"
+        "$m, D, exec, ${fuzzel}"
+        "$m, Return, exec, ${foot}"
+        "$m Shift, Return, exec, ${firefox}"
+        "$m, Escape, exec, ${hyprlock}"
 
-          "$mod, A, exec, ${pulsemixer}"
-          "$mod, B, exec, ${bluetui}"
-          "$mod, N, exec, ${nmtui}"
+        "$m, A, exec, ${pulsemixer}"
+        "$m, B, exec, ${bluetui}"
+        "$m, N, exec, ${nmtui}"
         ''
-            $mod, S, exec, bash -c 'hyprctl notify -1 5000 "rgb(${base0D})" "$(${getExe (import ./scripts.nix {inherit pkgs;}).statusnotify})"'
+          $m, S, exec, bash -c 'hyprctl notify -1 5000 "rgb(${base0D})" "$(${getExe (import ./scripts.nix {inherit pkgs;}).statusnotify})"'
         ''
 
-          "$mod, Print, exec, ${grimblast} copy area"
+        "$m, Print, exec, ${grimblast} copy area"
         ", Print, exec, ${grimblast} save area - | ${swappy} -f -"
 
-          "$mod, h, movefocus, l"
-          "$mod, l, movefocus, r"
-          "$mod, k, movefocus, u"
-          "$mod, j, movefocus, d"
+        "$m, h, movefocus, l"
+        "$m, l, movefocus, r"
+        "$m, k, movefocus, u"
+        "$m, j, movefocus, d"
 
-          "$mod SHIFT, h, movewindow, l"
-          "$mod SHIFT, l, movewindow, r"
-          "$mod SHIFT, k, movewindow, u"
-          "$mod SHIFT, j, movewindow, d"
+        "$m SHIFT, h, movewindow, l"
+        "$m SHIFT, l, movewindow, r"
+        "$m SHIFT, k, movewindow, u"
+        "$m SHIFT, j, movewindow, d"
       ]
       ++ workspaces
       ++ lib.optionals games (let
@@ -119,9 +114,10 @@ in {
         "Super, d, exec, ${dolphin}"
       ])
       ++ lib.optionals portable [
-          "$mod Shift, S, exec, ${somcli}"
-	] ++ lib.optionals fingerprint [
-	  ", XF86PowerOff, exec, ${uwsm} app -- pgrep fprintd-verify && exit 0 || ${foot} -a 'foot-fprintd' sh -c 'fprintd-verify && systemctl sleep'" #NOTE: Also check home/wayland/hyprland/settings + system/hardware/fingerprint
+        "$m Shift, S, exec, ${somcli}"
+      ]
+      ++ lib.optionals fingerprint [
+        ", XF86PowerOff, exec, pgrep fprintd-verify || ${uwsm} app -- ${foot} -a 'foot-fprintd' sh -c 'fprintd-verify && systemctl sleep'" #NOTE: Also check home/wayland/hyprland/settings + system/hardware/fingerprint
       ];
 
     bindl = [
@@ -143,5 +139,4 @@ in {
       ",XF86MonBrightnessDown, exec, ${brightnessctl} s 10%-"
     ];
   };
-  };
 }

system/desktop/greetd.nix

@@ -3,7 +3,7 @@
   lib,
   ...
 }: let
-  cfg = config.niksos.desktop.enable && config.niksos.desktop.hyprland.enable;
+  cfg = config.niksos.desktop.enable && config.niksos.desktop.hyprland;
 in {
   config = lib.mkIf cfg {
     # greetd display manager

system/desktop/hyprland.nix

@@ -4,7 +4,7 @@
   lib,
   ...
 }: let
-  cfg = config.niksos.desktop.enable && config.niksos.desktop.hyprland.enable;
+  cfg = config.niksos.desktop.enable && config.niksos.desktop.hyprland;
 in {
   config = lib.mkIf cfg {
     programs.hyprland = {

system/desktop/plasma6.nix

@@ -4,7 +4,7 @@
   config,
   ...
 }: let
-  cfg = config.niksos.desktop.enable && config.niksos.desktop.kde.enable;
+  cfg = config.niksos.desktop.enable && config.niksos.desktop.kde;
 in {
   config = lib.mkIf cfg {
     niksos.desktop.hyprland = lib.mkForce false;

system/desktop/polkit.nix

@@ -4,7 +4,7 @@
   pkgs,
   ...
 }: let
-  cfg = config.niksos.desktop.enable && config.niksos.desktop.hyprland.enable;
+  cfg = config.niksos.desktop.enable && config.niksos.desktop.hyprland;
 in {
   systemd.user.services.polkit-gnome-authentication-agent-1 = lib.mkIf cfg {
     description = "polkit-gnome-authentication-agent-1";

system/desktop/xdg.nix

@@ -4,7 +4,7 @@
   lib,
   ...
 }: let
-  cfg = config.niksos.desktop.enable && config.niksos.desktop.hyprland.enable;
+  cfg = config.niksos.desktop.enable && config.niksos.desktop.hyprland;
 in {
   xdg.portal = lib.mkIf cfg {
     enable = true;