Fix some more errors

common/desktop/hyprland.nix

@@ -15,4 +15,6 @@
     swaylock
     swayidle
   ]);
+
+  services.xserver.displayManager.sessionPackages = [ config.programs.hyprland.finalPackage ];
 }

common/desktop/sway.nix

@@ -18,4 +18,6 @@
   };
 
   xdg.portal.wlr.enable = true;
+
+  services.xserver.displayManager.sessionPackages = [ config.programs.sway.package ];
 }

common/login-manager/tuigreet.nix

@@ -11,7 +11,7 @@
     enable = true;
     settings = {
       default_session = {
-        command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd sway";
+        command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --remember-user-session";
         user = "greeter";
       };
     };

common/users/cameron/home-manager/hyprland.nix

@@ -22,11 +22,11 @@
       "$menu" = "dmenu_path | wmenu -p 'Run:' -l 10 | xargs hyprctl dispatch exec";
       
 
-      exec-once = startup;
+      exec-once = "${startup}";
       
       monitor = [
-        ",preferred,auto,1"
+        ",preferred,auto,auto"
-        "eDP-1,preferred,0x0,1.5"
+        "desc:BOE 0x095F,preferred,0x0,1.566667"
       ];
 
       env = [

common/users/cameron/home-manager/sway.nix

@@ -23,7 +23,7 @@
         };
 
         eDP-1 = {
-          scale = 1.5;
+          scale = "1.5";
         };
       };
 
@@ -71,7 +71,11 @@
           colors = {
             statusline = "#ffffff";
             background = "#323232";
-            inactiveWorkspace = "#32323200 #32323200 #5c5c5c";
+            inactiveWorkspace = {
+              background = "#32323200";
+              border = "#32323200";
+              text = "#5c5c5c";
+            };
           };
         }
       ];

common/users/cameron/home.nix

@@ -1,4 +1,4 @@
-{ pkgs, lib, osConfig, ... }:
+{ pkgs, lib, config, osConfig, ... }:
 
 {
   imports = [

flake.nix

@@ -27,6 +27,8 @@
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;
             home-manager.users.cameron = import ./hosts/nixos/home-manager/cameron.nix;
+
+            home-manager.extraSpecialArgs = { inherit common_dir; };
           }
         ];
       };

hosts/nixos/home-manager/cameron.nix

@@ -1,7 +1,6 @@
-{ lib, pkgs, osConfig, ... }:
+{ lib, pkgs, config, osConfig, common_dir, ... }:
 
-let common_dir = ../../../common;
+{
-in {
   imports = [
     (common_dir + /users/cameron/home.nix)
   ];