Move everything to correct places

home/communication.nix

@@ -68,6 +68,9 @@ in {
   home.packages = with pkgs; [
     reader
     tdf
+    slack
+    telegram-desktop
+    vesktop # Discord client
   ];
 
   accounts.email = {

home/config/dev.nix

@@ -101,6 +101,29 @@
           Do not include a `Co-authored-by`.
         '';
       };
+
+      mcpServers = {
+        fetch = {
+          args = ["-y" "@modelcontextprotocol/server-fetch"];
+          command = "npx";
+          type = "stdio";
+        };
+        playwright = {
+          args = ["-y" "@modelcontextprotocol/server-playwright"];
+          command = "npx";
+          type = "stdio";
+        };
+        stackexchange = {
+          args = ["-y" "mcp-server-stackexchange"];
+          command = "npx";
+          type = "stdio";
+        };
+        arxiv = {
+          args = ["-y" "mcp-server-arxiv"];
+          command = "npx";
+          type = "stdio";
+        };
+      };
     };
   };
 }

home/default.nix

@@ -10,7 +10,7 @@
       # inputs.ovos.homeManagerModules.default
       ./gaming.nix
       ./ssh.nix
-      ./email.nix
+      ./communication.nix
       ./gpg
       ./niri
       ./stylix.nix

home/misc/everything.nix

@@ -27,8 +27,6 @@
     cider-2 # Apple music player
     fractal # Matrix client
     gomuks # Matrix client TUI
-    telegram-desktop
-    vesktop # Discord client
     filezilla # FTP Client
     mochi # SRS flashcards
   ];

home/niri/shell.nix

@@ -52,7 +52,7 @@
         wallpaper = {
           enabled = true;
           overviewEnabled = false;
-          directory = "/nix/harbor/desktops/configurations/home/toph@endurance/wallpapers";
+          directory = "/nix/harbor/desktops/home/wallpapers";
           recursiveSearch = false;
           randomEnabled = true;
         };

modules/flake/homes.nix

@@ -3,7 +3,9 @@
 
   mkHome = user: host: {
     imports = [
-      (self + "/configurations/home/${user}@${host}")
+      (self + "/home")
+      # TODO: Import this conditionally!
+      # (self + "/home/by-host/${host}")
       (self + "/modules/home")
     ];
   };

modules/flake/hosts.nix

@@ -3,7 +3,7 @@
 
   mkHost = hostname: config:
     {
-      path = ../../configurations/nixos/${hostname};
+      path = ../../hosts/${hostname};
       deployable = true;
       specialArgs = {inherit inputs hostname;};
     }

modules/nixos/profiles/graphical/wm.nix

@@ -1,11 +1,16 @@
 {
-  inputs,
   pkgs,
   lib,
   config,
   ...
 }: let
   inherit (lib) mkIf;
+
+  sddmTheme = pkgs.sddm-astronaut.override {
+    embeddedTheme = "japanese_aesthetic";
+    themeConfig = {
+    };
+  };
 in {
   imports = [
     #inputs.niri.nixosModules.niri
@@ -18,6 +23,8 @@ in {
       libsForQt5.qtstyleplugin-kvantum
       xwayland-satellite
       nautilus
+      sddmTheme
+      kdePackages.qtmultimedia # required for our sddm theme
     ];
 
     programs.niri = {
@@ -26,14 +33,28 @@ in {
     };
 
     services = {
-      xserver.enable = true;
+      xserver = {
+        enable = true;
+        displayManager.setupCommands = ''
+          /run/current-system/sw/bin/xrandr --output HDMI-A-1 --primary
+          /run/current-system/sw/bin/xrandr --output DP-3 --right-of HDMI-A-1 --rotate left
+        '';
+      };
 
       displayManager = {
         defaultSession = "niri";
 
-        sddm = {
+        sddm = let
+          theme = "sddm-astronaut-theme";
+        in {
           enable = true;
-          wayland.enable = true;
+          package = pkgs.kdePackages.sddm;
+
+          # wayland.enable = true;
+
+          inherit theme;
+          extraPackages = [sddmTheme];
+          settings.Theme.Current = theme;
         };
       };
     };

modules/nixos/users.nix

@@ -27,6 +27,7 @@
     users = {
       users.toph = {
         isNormalUser = true;
+        uid = 1000;
         initialPassword = "wheel";
         # hashedPasswordFile = config.age.secrets.tophPassword.path;
         shell = pkgs.fish;

overlays/default.nix

@@ -8,10 +8,11 @@
   # wrapper that provides channels arg to each overlay
   withChannels = overlayFn: final: prev: let
     # Import channels with the same config as the main nixpkgs
-    importChannel = input: import input {
-      system = final.stdenv.hostPlatform.system;
-      config = final.config;
-    };
+    importChannel = input:
+      import input {
+        system = final.stdenv.hostPlatform.system;
+        config = final.config;
+      };
   in
     overlayFn {
       inherit inputs;
@@ -31,4 +32,5 @@ in [
   (withChannels (import ./lix.nix))
   (withChannels (import ./packages.nix))
   (withChannels (import ./unstable.nix))
+  (withChannels (import ./spacedrive.nix))
 ]

overlays/spacedrive.nix

@@ -0,0 +1,12 @@
+{
+  channels,
+  lib,
+  ...
+}: final: prev: {
+  spacedrive_v2 = channels.unstable.spacedrive.overrideAttrs (old: {
+    src = prev.fetchurl {
+      url = "https://github.com/spacedriveapp/spacedrive/releases/download/v2.0.0-alpha.1/Spacedrive-linux-x86_64.deb";
+      hash = lib.fakeHash;
+    };
+  });
+}

packages/solidtime-desktop/package.nix

@@ -1,5 +0,0 @@
-{pkgs, ...}:
-pkgs.writeShellApplication {
-  name = "connect-to-mercury";
-  text = builtins.readFile ./connect-to-mercury;
-}