modules/home/default.nix

@@ -152,30 +152,27 @@ in
             ;
         };
       };
-      "${deimos.name}-${user1}" = {
+      # "${deimos.name}-${user1}" = {
-        imports = builtins.attrValues {
+      #   imports = builtins.attrValues {
-          inherit (modules)
+      #     inherit (modules)
-            cli
+      #       cli
-            brave
+      #       brave
-            ghostty
+      #       ghostty
-            zed
+      #       zed
-            gaming
+      #       gaming
-            spotify
+      #       spotify
-            docs
+      #       docs
-            mpv
+      #       mpv
-            kolourPaint
+      #       kolourPaint
-            discord
+      #       discord
-            signal
+      #       signal
-            scrcpy
+      #       scrcpy
-            bitwarden
+      #       bitwarden
-            emote
+      #       emote
-            desktop
+      #       desktop
-            hypr
+      #       ;
-            wayland
+      #   };
-            theming
+      # };
-            ;
-        };
-      };
       "${charon.name}-${user1}" = {
         imports = builtins.attrValues {
           inherit (modules)
@@ -189,13 +186,13 @@ in
             mpv
             jellyfin
             kolourPaint
-            systemMonitor
             discord
             signal
             scrcpy
             bitwarden
             emote
-            gnome
+            hypr
+            wayland
             theming
             ;
         };

modules/home/gui/desktop/hypr/land/config/monitor.nix

@@ -1,6 +0,0 @@
-let
-  monitorSettings = [
-    "eDP-1,highres@highrr,0x0,1"
-  ];
-in
-monitorSettings

modules/home/gui/desktop/hypr/land/default.nix

@@ -23,7 +23,6 @@ let
     misc = import (configPath + /misc.nix);
     windowrulev2 = import (configPath + /windowrulev2.nix);
     xwayland = import (configPath + /xwayland.nix);
-    monitor = import (configPath + /monitor.nix);
     bind =
       let
         bindConfig =

modules/home/gui/desktop/wayland/waybar/config/settings.nix

@@ -1,6 +1,13 @@
-{ config, ... }:
+{ flake, config, ... }:
 let
+  inherit (flake.config.people)
+    user0
+    user1
+    user2
+    ;
+
   user = config.home.username;
+  userConfig = flake.config.people.users.${user};
 in
 {
   mainBar = {

modules/home/gui/desktop/wayland/waybar/default.nix

@@ -6,7 +6,7 @@
 }:
 let
   configPath = ./config;
-  settingsPath = import (configPath + /settings.nix) { inherit config; };
+  settingsPath = import (configPath + /settings.nix) { inherit config flake; };
   stylePath = import (configPath + /style.nix) { inherit config flake; };
 in
 {

modules/nixos/core/homeManager/default.nix

@@ -3,7 +3,7 @@
   home-manager = {
     useGlobalPkgs = true;
     useUserPackages = true;
-    backupFileExtension = "backup3";
+    backupFileExtension = "backup";
     extraSpecialArgs = {
       inherit
         flake

modules/nixos/default.nix

@@ -34,8 +34,6 @@ in
         inherit (modules)
           hypr
           wayland
-          # plasma
-          # sddm
           flatpak
           xserver
           ;
@@ -45,7 +43,8 @@ in
     charon = {
       imports = builtins.attrValues {
         inherit (modules)
-          gnome
+          hypr
+          wayland
           flatpak
           xserver
           ;