diff --git a/hosts/ch-clt-dsk01/home.nix b/hosts/ch-clt-dsk01/home.nix
index 43d607e..9b39244 100644
--- a/hosts/ch-clt-dsk01/home.nix
+++ b/hosts/ch-clt-dsk01/home.nix
@@ -13,6 +13,8 @@
     };
 
     settings = {
+      host = "c-clt-dsk01";
+
       applications.common.enable = true;
       applications.alacritty.enable = false;
       applications.devenv.enable = false;
diff --git a/hosts/p-th-rpi-01/home.nix b/hosts/p-th-rpi-01/home.nix
index 6e9d5a8..2fa79a2 100644
--- a/hosts/p-th-rpi-01/home.nix
+++ b/hosts/p-th-rpi-01/home.nix
@@ -13,6 +13,8 @@
     };
 
     settings = {
+      host = "p-th-rpi-01";
+    
       applications.common.enable = false;
       applications.alacritty.enable = false;
       applications.devenv.enable = false;
diff --git a/hosts/ti-clt-dsk01/home.nix b/hosts/ti-clt-dsk01/home.nix
index 02e544d..57a1346 100644
--- a/hosts/ti-clt-dsk01/home.nix
+++ b/hosts/ti-clt-dsk01/home.nix
@@ -13,6 +13,8 @@
     };
 
     settings = {
+      host = "ti-clt-dsk01";
+
       applications.common.enable = true;
       applications.alacritty.enable = false;
       applications.devenv.enable = true;
diff --git a/hosts/ti-clt-lpt01/configuration.nix b/hosts/ti-clt-lpt01/configuration.nix
index af67d1c..b0ae7da 100644
--- a/hosts/ti-clt-lpt01/configuration.nix
+++ b/hosts/ti-clt-lpt01/configuration.nix
@@ -11,11 +11,12 @@
 
   settings = {
     hostname = "ti-clt-lpt01";
-    display-manager = "cosmic-greeter";
+    display-manager = "greetd";
     desktop-environments = {
-      cosmic.enable = true;
-      hyprland.enable = true;
+      cosmic.enable = false;
+      hyprland.enable = false;
       gnome.enable = false;
+      niri.enable = true;
     };
     applications = {
       common.enable = true;
diff --git a/hosts/ti-clt-lpt01/home.nix b/hosts/ti-clt-lpt01/home.nix
index 8ed4ca1..879db29 100644
--- a/hosts/ti-clt-lpt01/home.nix
+++ b/hosts/ti-clt-lpt01/home.nix
@@ -13,6 +13,8 @@
     };
 
     settings = {
+      host = "ti-clt-lpt01";
+
       applications.common.enable = true;
       applications.alacritty.enable = true;
       applications.devenv.enable = true;
@@ -45,6 +47,7 @@
       theming.stylix.theme = "da-one-ocean";
 
       desktop-environments.hyprland.enable = false;
+      desktop-environments.niri.enable = true;
     };
 
     home.packages = with pkgs; [
diff --git a/hosts/ti-clt-tbl01/home.nix b/hosts/ti-clt-tbl01/home.nix
index 7cf079e..24db063 100644
--- a/hosts/ti-clt-tbl01/home.nix
+++ b/hosts/ti-clt-tbl01/home.nix
@@ -13,6 +13,8 @@
     };
 
     settings = {
+      host = "ti-clt-tbl01";
+
       applications.common.enable = true;
       applications.alacritty.enable = false;
       applications.devenv.enable = false;
diff --git a/hosts/v-th-ctr-01/home.nix b/hosts/v-th-ctr-01/home.nix
index 45f3f2c..f22577d 100644
--- a/hosts/v-th-ctr-01/home.nix
+++ b/hosts/v-th-ctr-01/home.nix
@@ -13,6 +13,8 @@
     };
 
     settings = {
+      host = "v-th-ctr-01";
+
       applications.common.enable = false;
       applications.alacritty.enable = false;
       applications.devenv.enable = false;
diff --git a/modules/home/default.nix b/modules/home/default.nix
index e91e52b..7c6f8fb 100644
--- a/modules/home/default.nix
+++ b/modules/home/default.nix
@@ -1,6 +1,13 @@
 { inputs, outputs, config, lib, ... }:
 
 {
+  options = {
+    settings.host = lib.mkOption {
+      type = lib.types.str;
+      description = "Hostname";
+    };
+  };
+
   imports = [
     ./applications/alacritty.nix
     ./applications/common.nix
diff --git a/modules/home/desktop-environments/niri/default.nix b/modules/home/desktop-environments/niri/default.nix
index 64b2e37..d359e27 100644
--- a/modules/home/desktop-environments/niri/default.nix
+++ b/modules/home/desktop-environments/niri/default.nix
@@ -37,7 +37,7 @@ in {
     programs.niri.enable = true;
     programs.niri.package = pkgs.unstable.niri;
 
-    programs.niri.settings.outputs = {
+    programs.niri.settings.outputs = lib.mkIf (config.settings.host == "ti-clt-dsk01") {
       "HDMI-A-1".position = {
         x = 1920;
         y = 0;