feat: restructured some stuff for user1

modules/home/default.nix

@@ -114,39 +114,65 @@ in
           inherit (modules)
             cli
             brave
-            emulators
-            firefox
+            floorp
             tor
-            code
-            gaming
-            media
-            messaging
-            sharing
-            tools
-            ;
-        };
-      };
-      "${deimos.name}-${user1}" = {
-        imports = builtins.attrValues {
-          inherit (modules)
-            cli
-            brave
             ghostty
+            prismLauncher
+            steam
             zed
-            gaming
-            spotify
-            docs
-            mpv
+            feishin
+            obsidian
+            libreOffice
+            okular
+            zathura
             kolourPaint
-            discord
+            imageViewing
+            obsStudio
+            daVinci
+            mpv
+            freetube
+            dissent
+            discordCanary
+            element
             signal
-            scrcpy
+            sharing
             bitwarden
             emote
-            desktop
+            flameshot
+            gnomeCalculator
+            scrcpy
+            systemMonitor
+            usbImager
+            virtManager
+            hypr
+            wayland
+            theming
+            polychromatic
+            dolphin
             ;
         };
       };
+      # "${deimos.name}-${user1}" = {
+      #   imports = builtins.attrValues {
+      #     inherit (modules)
+      #       cli
+      #       brave
+      #       ghostty
+      #       zed
+      #       gaming
+      #       spotify
+      #       docs
+      #       mpv
+      #       kolourPaint
+      #       discord
+      #       signal
+      #       scrcpy
+      #       bitwarden
+      #       emote
+      #       desktop
+      #       ;
+      #   };
+      # };
       "${charon.name}-${user1}" = {
         imports = builtins.attrValues {
           inherit (modules)

modules/home/gui/desktop/hypr/land/config/bind-user0.nix

@@ -24,8 +24,6 @@ let
     "5, workspace, 5"
     # Windows
     "Tab, killactive"
-    "O, splitratio, 0.33"
-    "F, splitratio, -0.33"
     # Window Focus
     "C, movefocus, l"
     "A, movefocus, u"
@@ -45,6 +43,8 @@ let
     "A, movewindow, u"
     "E, movewindow, d"
     "I, movewindow, r"
+    "equal, splitratio, 0.33"
+    "minus, splitratio, -0.33"
     # Quick Action
     "T, exec, ghostty"
     "S, exec, flameshot gui"

modules/home/gui/desktop/wayland/waybar/config/scripts/get_weather.sh

@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-
-for i in {1..5}
-do
-    text=$(curl -s "https://wttr.in/$1?format=1")
-    if [[ $? == 0 ]]
-    then
-        text=$(echo "$text" | sed -E "s/\s+/ /g")
-        tooltip=$(curl -s "https://wttr.in/$1?format=4")
-        if [[ $? == 0 ]]
-        then
-            tooltip=$(echo "$tooltip" | sed -E "s/\s+/ /g")
-            echo "{\"text\":\"$text\", \"tooltip\":\"$tooltip\"}"
-            exit
-        fi
-    fi
-    sleep 2
-done
-echo "{\"text\":\"error\", \"tooltip\":\"error\"}"

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

@@ -1,8 +1,13 @@
-{ flake, ... }:
+{ flake, config, ... }:
 let
   inherit (flake.config.people)
     user0
+    user1
+    user2
     ;
+
+  user = config.home.username;
+  userConfig = flake.config.people.users.${user};
 in
 {
   mainBar = {
@@ -30,6 +35,7 @@ in
       "disk"
       "pulseaudio"
       # "network"
+      "battery"
       "clock"
     ];
 
@@ -153,12 +159,29 @@ in
     };
 
     "custom/weather" = {
-      exec = "/home/${user0}/Files/Projects/dotfiles/modules/home/gui/desktop/wayland/waybar/config/scripts/get_weather.sh Winnipeg";
+      exec = "/home/${user}/.config/scripts/get_weather.sh Winnipeg";
       return-type = "json";
       format = "{}";
       tooltip = true;
       interval = 3600;
     };
+    battery = {
+      format = "{icon} {capacity}%";
+      format-alt = "{icon} {time}";
+      format-charging = " {capacity}%";
+      format-icons = [
+        ""
+        ""
+        ""
+        ""
+        ""
+      ];
+      format-plugged = " {capacity}%";
+      states = {
+        critical = 15;
+        warning = 30;
+      };
+    };
   };
 }
 # https://unicodes.jessetane.com/

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

@@ -100,6 +100,12 @@ in
     #clock {
     }
 
+    #battery {
+        font-size: ${custom.font_size};
+        color: #${custom.text_color};
+        padding-right: 10px;
+    }
+
     #custom-launcher {
         font-size: 20px;
         color: #${custom.text_color};

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

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

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

@@ -3,7 +3,7 @@
     enable = true;
     settings = {
       "default" = {
-        path = "~/Files/Projects/dotfiles/modules/home/gui/desktop/wayland/wpaperd/wallpaper";
+        path = "~/.config/wallpaper";
         apply-shadow = true;
         duration = "1m";
         sorting = "random";

modules/nixos/core/doas/default.nix

@@ -1,4 +1,8 @@
-{ flake, config, ... }:
+{
+  flake,
+  config,
+  ...
+}:
 let
   inherit (flake.config.people)
     user0
@@ -11,8 +15,25 @@ let
   hostname = config.networking.hostName;
   mars = devices.mars.name;
   ceres = devices.ceres.name;
-  venus = devices.venus.names;
+  venus = devices.venus.name;
   charon = devices.charon.name;
+  deimos = devices.deimos.name;
+
+  userLogic =
+    if
+      builtins.elem hostname [
+        mars
+        deimos
+        ceres
+      ]
+    then
+      user0
+    else if hostname == charon then
+      user1
+    else if hostname == venus then
+      user2
+    else
+      "";
 in
 {
   security = {
@@ -23,18 +44,7 @@ in
           keepEnv = true;
           noPass = true;
           users = [
-            (
-              if hostname == mars then
-                user0
-              else if hostname == ceres then
-                user0
-              else if hostname == charon then
-                user1
-              else if hostname == venus then
-                user2
-              else
-                ""
-            )
+            userLogic
           ];
         }
       ];

modules/nixos/core/ssh/default.nix

@@ -17,15 +17,22 @@ let
     ;
   hostname = config.networking.hostName;
   mars = devices.mars.name;
+  deimos = devices.deimos.name;
   ceres = devices.ceres.name;
   venus = devices.venus.name;
   charon = devices.charon.name;
 
   userLogic =
-    if hostname == mars then
-      user0
-    else if hostname == ceres then
+    if
+      builtins.elem hostname [
+        mars
+        deimos
+        ceres
+      ]
+    then
       user0
+    else if hostname == charon then
+      user1
     else if hostname == venus then
       user2
     else

modules/nixos/default.nix

@@ -34,6 +34,8 @@ in
         inherit (modules)
           hypr
           wayland
+          # plasma
+          # sddm
           flatpak
           xserver
           ;

modules/nixos/desktop/wayland/greetd/default.nix

@@ -7,7 +7,14 @@
 let
   inherit (flake.config.people)
     user0
+    user1
+    user2
     ;
+  inherit (flake.config.machines) devices;
+  venus = devices.venus.name;
+  charon = devices.charon.name;
+
+  host = config.networking.hostName;
 in
 {
   services = {
@@ -18,7 +25,13 @@ in
         let
           default_session = {
             command = "${lib.meta.getExe config.programs.hyprland.package}";
-            user = user0;
+            user =
+              if host == charon then
+                user1
+              else if host == venus then
+                user2
+              else
+                user0;
           };
         in
         {

modules/nixos/desktop/wayland/regreet/default.nix

@@ -11,7 +11,7 @@ let
 in
 {
   programs.regreet = {
-    enable = true;
+    enable = false;
     package = pkgs.greetd.regreet;
     # settings = {
     #   appearance = {

modules/nixos/sops/default.nix

@@ -1,7 +1,12 @@
-{ flake, config, ... }:
+{
+  flake,
+  config,
+  ...
+}:
 let
   inherit (flake.config.people)
     user0
+    user1
     user2
     ;
   inherit (flake.config.machines)
@@ -12,12 +17,19 @@ let
   ceres = devices.ceres.name;
   venus = devices.venus.name;
   charon = devices.charon.name;
+  deimos = devices.deimos.name;
 
   userLogic =
-    if hostname == mars then
-      user0
-    else if hostname == ceres then
+    if
+      builtins.elem hostname [
+        mars
+        deimos
+        ceres
+      ]
+    then
       user0
+    else if hostname == charon then
+      user1
     else if hostname == venus then
       user2
     else