tweaked server config

modules/home/environment/starship.nix

@@ -61,7 +61,7 @@
         hostname = {
           ssh_symbol = "🌐";
           ssh_only = false;
-          format = "[@](bold blue)[$hostname](bold red) [via $ssh_symbol]";
+          format = "[@](bold blue)[$hostname $ssh_symbol](bold red)";
         };
 
         nix_shell = {

modules/home/environment/stylixhome.nix

@@ -1,8 +1,9 @@
-{ lib, self, config, pkgs, ... }:
+{ lib, self, config, host, pkgs, ... }:
 
 let
   scheme = "tokyo-night-dark";
   wallpaper = "${self}/assets/wallpapers/dark-waves.jpg";
+  server = (host == "xenon");
 in {
   options = {
     movOpts.envConfig.stylixHomeConfig.enable =
@@ -15,7 +16,7 @@ in {
       image = wallpaper;
       polarity = "dark";
       autoEnable = true;
-      opacity.terminal = 0.5;
+      opacity.terminal = if !server then 0.5 else null;
       targets = {
         waybar.enable = false;
         btop.enable = false;

modules/home/servermodule.nix

@@ -2,37 +2,17 @@
   imports = [
     ./environment/starship.nix
     ./environment/userpkgs.nix
-    ./environment/zshell.nix
+    ./environment/stylixhome.nix
+    ./environment/zsh
     ./programs/nixvim
     ./programs/autojump.nix
     ./programs/bat.nix
+    ./programs/kitty.nix
     ./programs/btop.nix
     ./programs/eza.nix
     ./programs/fzf.nix
     ./programs/git.nix
     ./programs/yazi.nix
-    ./scripts
+    ./files.nix
   ];
-
-  movOpts = {
-    # ./environment
-    zshConfig.enable = lib.mkDefault false;
-    starshipConfig.enable = lib.mkDefault false;
-    userPkgs.enable = lib.mkDefault false;
-
-    # ./programs
-    autojumpConfig.enable = lib.mkDefault false;
-    btopConfig.enable = lib.mkDefault false;
-    ezaConfig.enable = lib.mkDefault false;
-    fzfConfig.enable = lib.mkDefault false;
-    gitConfig.enable = lib.mkDefault false;
-    yaziConfig.enable = lib.mkDefault false;
-    batConfig.enable = lib.mkDefault false;
-
-    # ./scripts
-    movScripts.enable = lib.mkDefault false;
-    movScripts.commandScripts.enable = lib.mkDefault false;
-    movScripts.hyprlandControls.enable = lib.mkDefault false;
-    movScripts.nixShortcuts.enable = lib.mkDefault false;
-  };
 }

modules/server/cdn/jellyfin.nix

@@ -2,10 +2,10 @@
 
 {
   options = {
-    movOpts.jellyfinConfig.enable =
+    movOpts.serverCfg.jellyfinConfig.enable =
       lib.mkEnableOption "Enables the server's jellyfin config";
   };
-  config = lib.mkIf config.movOpts.jellyfinConfig.enable {
+  config = lib.mkIf config.movOpts.serverCfg.jellyfinConfig.enable {
     services.jellyfin = {
       enable = true;
       openFirewall = true;

modules/server/default.nix

@@ -2,8 +2,4 @@
 
 {
   imports = [ ./cdn ./glasshaus ];
-  movOpts = {
-    jellyfinConfig.enable = lib.mkDefault false;
-    caddyConfig.enable = lib.mkDefault false;
-  };
 }

modules/server/glasshaus/caddy.nix

@@ -2,10 +2,10 @@
 
 {
   options = {
-    movOpts.caddyConfig.enable = lib.mkEnableOption
+    movOpts.serverCfg.caddyConfig.enable = lib.mkEnableOption
       "Enable my caddy config for the glasshaus.info domain name";
   };
-  config = lib.mkIf config.movOpts.caddyConfig.enable {
+  config = lib.mkIf config.movOpts.serverCfg.caddyConfig.enable {
     services.caddy = {
       enable = true;
       configFile = pkgs.writeText "Caddyfile" ''