move xdg.userDirs config to modules/shared/user

Signed-off-by: unexplrd <unexplrd@linerds.us>

hosts/dunamis/configuration.nix

@@ -5,7 +5,7 @@
   ...
 }: {
   imports = with inputs; [
-    self.nixosModules.shared
+    self.modules.shared.nixos
     self.nixosModules.desktop
     self.nixosModules.system
     ./disko

hosts/eldrid/configuration.nix

@@ -1,6 +1,6 @@
 {inputs, ...}: {
   imports = with inputs; [
-    self.nixosModules.shared
+    self.modules.shared.nixos
     self.nixosModules.desktop
     self.nixosModules.system
     ./disko

hosts/legion/configuration.nix

@@ -4,7 +4,7 @@
   ...
 }: {
   imports = with inputs; [
-    self.nixosModules.shared
+    self.modules.shared.nixos
     self.nixosModules.desktop
     self.nixosModules.system
     ./disko

hosts/morphius/configuration.nix

@@ -7,7 +7,7 @@
   imports = with inputs; [
     self.nixosModules.desktop
     self.nixosModules.system
-    self.nixosModules.shared
+    self.modules.shared.nixos
     ./disko
     ./hardware
     ./misc

modules/home/desktop/common/default.nix

@@ -1,5 +1,4 @@
 {
   imports = [
-    ./xdg-userdirs.nix
   ];
 }

modules/home/desktop/common/xdg-userdirs.nix

@@ -1,17 +0,0 @@
-{config, ...}: let
-  inherit (config.home) homeDirectory;
-  home = f: "${homeDirectory}/${f}";
-in {
-  xdg.userDirs = {
-    enable = true;
-    createDirectories = true;
-    templates = home "temps";
-    publicShare = home "pub";
-    desktop = home "desktop";
-    download = home "downloads";
-    documents = home "docs";
-    pictures = home "pics";
-    videos = home "vids";
-    music = home "music";
-  };
-}

modules/home/desktop/default.nix

@@ -1,6 +1,6 @@
 {
   imports = [
-    ./common
+    # ./common
     ./cosmic
     ./gnome
     ./hyprland

modules/home/desktop/niri/services/kanshi/default.nix

@@ -17,6 +17,13 @@
         adaptiveSync = true;
       };
     }
+    {
+      output = {
+        criteria = second;
+        mode = "1920x1080@74.973";
+        adaptiveSync = true;
+      };
+    }
     {
       output = {
         criteria = builtin.eldrid;
@@ -33,19 +40,19 @@
         # adaptiveSync = true;
       };
     }
-    {
-      output = {
-        criteria = second;
-        mode = "1920x1080@74.973";
-        position = "1920,0";
-        transform = "90";
-        adaptiveSync = true;
-      };
-    }
     {
       profile = {
         name = "dunamis";
-        outputs = [{criteria = main;} {criteria = second;}];
+        outputs = [
+          {criteria = main;}
+          {
+            criteria = second;
+            position = "1920,180";
+            scale = 1.2;
+            # transform = "90";
+            adaptiveSync = true;
+          }
+        ];
       };
     }
     {

modules/shared/user/common.nix

@@ -1,4 +1,5 @@
 {
+  config,
   inputs,
   osConfig,
   ...
@@ -8,7 +9,27 @@
     self.homeModules.desktop
     self.homeModules.programs
   ];
+
   inherit (osConfig) desktop;
-  home.stateVersion = osConfig.system.stateVersion;
+
-  home.sessionPath = ["$HOME/.local/bin"];
+  home = {
+    inherit (osConfig.system) stateVersion;
+    sessionPath = ["$HOME/.local/bin"];
+  };
+
+  xdg.userDirs = let
+    inherit (config.home) homeDirectory;
+    homeDir = f: "${homeDirectory}/${f}";
+  in {
+    enable = true;
+    createDirectories = true;
+    templates = homeDir "temps";
+    publicShare = homeDir "pub";
+    desktop = homeDir "desktop";
+    download = homeDir "downloads";
+    documents = homeDir "docs";
+    pictures = homeDir "pics";
+    videos = homeDir "vids";
+    music = homeDir "music";
+  };
 }