diff --git a/hosts/default.nix b/hosts/default.nix
index f2d9e7d..e16da21 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -7,7 +7,7 @@
 in {
   flake = {
     nixosConfigurations = builtins.mapAttrs (n: v: lib.mkHost (v // {host = n;})) {
-      python = {
+      solterra = {
         system = "x86_64-linux";
         extraModules = [
           inputs.disko.nixosModules.disko
diff --git a/hosts/python/users/amadaluzia/configs/waybar/style.scss b/hosts/python/users/amadaluzia/configs/waybar/style.scss
deleted file mode 100644
index 2ee97ad..0000000
--- a/hosts/python/users/amadaluzia/configs/waybar/style.scss
+++ /dev/null
@@ -1,73 +0,0 @@
-// scheme: "Everforest dark, hard"
-// author: "Sainnhe Park (sainnhe@gmail.com)"
-//
-// base00: "2b3339" # Default Background
-// base01: "323c41" # Lighter Background (Used for status bars, line number and folding marks)
-// base02: "503946" # Selection Background
-// base03: "868d80" # Comments, Invisibles, Line Highlighting
-// base04: "d3c6aa" # Dark Foreground (Used for status bars)
-// base05: "d3c6aa" # Default Foreground, Caret, Delimiters, Operators
-// base06: "e9e8d2" # Light Foreground (Not often used)
-// base07: "fff9e8" # Light Background (Not often used)
-// base08: "7fbbb3" # Variables, XML Tags, Markup Link Text, Markup Lists, Diff Deleted
-// base09: "d699b6" # Integers, Boolean, Constants, XML Attributes, Markup Link Url
-// base0A: "83c092" # Classes, Markup Bold, Search Text Background
-// base0B: "dbbc7f" # Strings, Inherited Class, Markup Code, Diff Inserted
-// base0C: "e69875" # Support, Regular Expressions, Escape Characters, Markup Quotes
-// base0D: "a7c080" # Functions, Methods, Attribute IDs, Headings
-// base0E: "e67e80" # Keywords, Storage, Selector, Markup Italic, Diff Changed
-// base0F: "d699b6" # Deprecated, Opening/Closing Embedded Language Tags, e.g. <?php ?>
-
-$base00: #2b3339;
-$base01: #323c41;
-$base02: #503946;
-$base03: #868d80;
-$base04: #d3c6aa;
-$base05: #d3c6aa;
-$base06: #e9e8d2;
-$base07: #fff9e8;
-$base08: #7fbbb3;
-$base09: #d699b6;
-$base0A: #83c092;
-$base0B: #dbbc7f;
-$base0C: #e69875;
-$base0D: #a7c080;
-$base0E: #e67e80;
-$base0F: #d699b6;
-
-* {
-    all: unset;
-    font-size: 15px;
-    color: $base06;
-}
-
-window#waybar {
-    background: $base00;
-}
-
-tooltip {
-    background: $base01;
-}
-
-.modules-left,
-.modules-right {
-    background: $base01;
-    padding: 0px 8px;
-}
-
-.modules-center {
-    background: $base01;
-}
-
-#workspaces button {
-    padding: 6px 16px;
-    transition: 0.2s;
-}
-
-#workspaces button:hover {
-    padding: 6px 24px;
-}
-
-#workspaces button.focused {
-    background: $base02;
-}
diff --git a/hosts/python/users/amadaluzia/configs/waybar/waybar.nix b/hosts/python/users/amadaluzia/configs/waybar/waybar.nix
deleted file mode 100644
index b5eefc8..0000000
--- a/hosts/python/users/amadaluzia/configs/waybar/waybar.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-pkgs: let
-  json = pkgs.formats.json {};
-in {
-  config = json.generate "waybar.jsonc" {
-    position = "top";
-    height = 0;
-    spacing = 16;
-    modules-left = ["mpris"];
-    modules-center = ["niri/workspaces"];
-    modules-right = ["wireplumber" "clock"];
-    mpris = {
-      format = "{player_icon} {dynamic}";
-      format-paused = "{status_icon} <i>{dynamic}</i>";
-      interval = 1;
-      dynamic-len = 64;
-      player-icons = {
-        default = "▶";
-        mpv = "🎵";
-      };
-      status_icons = {
-        paused = "⏸";
-      };
-    };
-    clock = {
-      format = " {:%H:%M}";
-      tooltip-format = "{:%A, %B %d, %Y}";
-    };
-    wireplumber = {
-      format = "{icon} {volume}%";
-      format-muted = "";
-      on-click = "helvum";
-      format-icons = ["" "" ""];
-    };
-  };
-
-  style =
-    pkgs.runCommand "waybar.css" {
-      nativeBuildInputs = [pkgs.sass];
-    } ''
-      sass ${./style.scss} > $out
-    '';
-}
diff --git a/hosts/python/apps.nix b/hosts/solterra/apps.nix
similarity index 100%
rename from hosts/python/apps.nix
rename to hosts/solterra/apps.nix
diff --git a/hosts/python/default.nix b/hosts/solterra/default.nix
similarity index 100%
rename from hosts/python/default.nix
rename to hosts/solterra/default.nix
diff --git a/hosts/python/disks.nix b/hosts/solterra/disks.nix
similarity index 100%
rename from hosts/python/disks.nix
rename to hosts/solterra/disks.nix
diff --git a/hosts/python/fonts.nix b/hosts/solterra/fonts.nix
similarity index 100%
rename from hosts/python/fonts.nix
rename to hosts/solterra/fonts.nix
diff --git a/hosts/python/forgejo.nix b/hosts/solterra/forgejo.nix
similarity index 100%
rename from hosts/python/forgejo.nix
rename to hosts/solterra/forgejo.nix
diff --git a/hosts/python/hardware.nix b/hosts/solterra/hardware.nix
similarity index 100%
rename from hosts/python/hardware.nix
rename to hosts/solterra/hardware.nix
diff --git a/hosts/python/theme.nix b/hosts/solterra/theme.nix
similarity index 100%
rename from hosts/python/theme.nix
rename to hosts/solterra/theme.nix
diff --git a/hosts/python/users/amadaluzia/configs/dunst/dunstrc b/hosts/solterra/users/amadaluzia/configs/dunst/dunstrc
similarity index 100%
rename from hosts/python/users/amadaluzia/configs/dunst/dunstrc
rename to hosts/solterra/users/amadaluzia/configs/dunst/dunstrc
diff --git a/hosts/python/users/amadaluzia/configs/foot/foot.ini b/hosts/solterra/users/amadaluzia/configs/foot/foot.ini
similarity index 100%
rename from hosts/python/users/amadaluzia/configs/foot/foot.ini
rename to hosts/solterra/users/amadaluzia/configs/foot/foot.ini
diff --git a/hosts/python/users/amadaluzia/configs/kanshi/config b/hosts/solterra/users/amadaluzia/configs/kanshi/config
similarity index 100%
rename from hosts/python/users/amadaluzia/configs/kanshi/config
rename to hosts/solterra/users/amadaluzia/configs/kanshi/config
diff --git a/hosts/python/users/amadaluzia/configs/kitty/current-theme.conf b/hosts/solterra/users/amadaluzia/configs/kitty/current-theme.conf
similarity index 100%
rename from hosts/python/users/amadaluzia/configs/kitty/current-theme.conf
rename to hosts/solterra/users/amadaluzia/configs/kitty/current-theme.conf
diff --git a/hosts/python/users/amadaluzia/configs/kitty/kitty.conf b/hosts/solterra/users/amadaluzia/configs/kitty/kitty.conf
similarity index 100%
rename from hosts/python/users/amadaluzia/configs/kitty/kitty.conf
rename to hosts/solterra/users/amadaluzia/configs/kitty/kitty.conf
diff --git a/hosts/python/users/amadaluzia/configs/niri/config.kdl b/hosts/solterra/users/amadaluzia/configs/niri/config.kdl
similarity index 100%
rename from hosts/python/users/amadaluzia/configs/niri/config.kdl
rename to hosts/solterra/users/amadaluzia/configs/niri/config.kdl
diff --git a/hosts/python/users/amadaluzia/configs/qutebrowser/config.py b/hosts/solterra/users/amadaluzia/configs/qutebrowser/config.py
similarity index 100%
rename from hosts/python/users/amadaluzia/configs/qutebrowser/config.py
rename to hosts/solterra/users/amadaluzia/configs/qutebrowser/config.py
diff --git a/hosts/python/users/amadaluzia/configs/qutebrowser/theme/__init__.py b/hosts/solterra/users/amadaluzia/configs/qutebrowser/theme/__init__.py
similarity index 100%
rename from hosts/python/users/amadaluzia/configs/qutebrowser/theme/__init__.py
rename to hosts/solterra/users/amadaluzia/configs/qutebrowser/theme/__init__.py
diff --git a/hosts/python/users/amadaluzia/configs/river/init b/hosts/solterra/users/amadaluzia/configs/river/init
similarity index 100%
rename from hosts/python/users/amadaluzia/configs/river/init
rename to hosts/solterra/users/amadaluzia/configs/river/init
diff --git a/hosts/python/users/amadaluzia/configs/river/scripts/waybar.sh b/hosts/solterra/users/amadaluzia/configs/river/scripts/waybar.sh
similarity index 100%
rename from hosts/python/users/amadaluzia/configs/river/scripts/waybar.sh
rename to hosts/solterra/users/amadaluzia/configs/river/scripts/waybar.sh
diff --git a/hosts/python/users/amadaluzia/configs/rofi/config.rasi b/hosts/solterra/users/amadaluzia/configs/rofi/config.rasi
similarity index 100%
rename from hosts/python/users/amadaluzia/configs/rofi/config.rasi
rename to hosts/solterra/users/amadaluzia/configs/rofi/config.rasi
diff --git a/hosts/python/users/amadaluzia/configs/rofi/themes/nord.rasi b/hosts/solterra/users/amadaluzia/configs/rofi/themes/nord.rasi
similarity index 100%
rename from hosts/python/users/amadaluzia/configs/rofi/themes/nord.rasi
rename to hosts/solterra/users/amadaluzia/configs/rofi/themes/nord.rasi
diff --git a/hosts/python/users/amadaluzia/configs/vesktop/quickCss.css b/hosts/solterra/users/amadaluzia/configs/vesktop/quickCss.css
similarity index 100%
rename from hosts/python/users/amadaluzia/configs/vesktop/quickCss.css
rename to hosts/solterra/users/amadaluzia/configs/vesktop/quickCss.css
diff --git a/hosts/python/users/amadaluzia/configs/waybar/config.jsonc b/hosts/solterra/users/amadaluzia/configs/waybar/config.jsonc
similarity index 100%
rename from hosts/python/users/amadaluzia/configs/waybar/config.jsonc
rename to hosts/solterra/users/amadaluzia/configs/waybar/config.jsonc
diff --git a/hosts/solterra/users/amadaluzia/configs/waybar/style.css b/hosts/solterra/users/amadaluzia/configs/waybar/style.css
new file mode 100644
index 0000000..96f762d
--- /dev/null
+++ b/hosts/solterra/users/amadaluzia/configs/waybar/style.css
@@ -0,0 +1,53 @@
+@define-color base00 #2b3339;
+@define-color base01 #323c41;
+@define-color base02 #503946;
+@define-color base03 #868d80;
+@define-color base04 #d3c6aa;
+@define-color base05 #d3c6aa;
+@define-color base06 #e9e8d2;
+@define-color base07 #fff9e8;
+@define-color base08 #7fbbb3;
+@define-color base09 #d699b6;
+@define-color base0A #83c092;
+@define-color base0B #dbbc7f;
+@define-color base0C #e69875;
+@define-color base0D #a7c080;
+@define-color base0E #e67e80;
+@define-color base0F #d699b6;
+
+* {
+    all: unset;
+    font-size: 15px;
+    color: @base06;
+}
+
+window#waybar {
+    background: @base00;
+}
+
+tooltip {
+    background: @base01;
+}
+
+.modules-left,
+.modules-right {
+    background: @base01;
+    padding: 0px 8px;
+}
+
+.modules-center {
+    background: @base01;
+}
+
+#workspaces button {
+    padding: 6px 16px;
+    transition: 0.2s;
+}
+
+#workspaces button:hover {
+    padding: 6px 24px;
+}
+
+#workspaces button.focused {
+    background: @base02;
+}
diff --git a/hosts/python/users/amadaluzia/default.nix b/hosts/solterra/users/amadaluzia/default.nix
similarity index 89%
rename from hosts/python/users/amadaluzia/default.nix
rename to hosts/solterra/users/amadaluzia/default.nix
index c50e206..35d893e 100644
--- a/hosts/python/users/amadaluzia/default.nix
+++ b/hosts/solterra/users/amadaluzia/default.nix
@@ -3,9 +3,7 @@
   pkgs,
   config,
   ...
-}: let
-  waybar = import ./configs/waybar/waybar.nix pkgs;
-in {
+}: {
   alqueva.users.artur = {
     shell = config.alqueva.shells.nushell.package;
     tmpfiles = {
@@ -21,8 +19,8 @@ in {
       ".config/niri/" = ./configs/niri;
       ".config/rofi/" = ./configs/rofi;
       ".config/foot" = ./configs/foot;
-      ".config/waybar/config.jsonc" = waybar.config;
-      ".config/waybar/style.css" = waybar.style;
+      ".config/waybar/config.jsonc" = ./configs/waybar/config.jsonc;
+      ".config/waybar/style.css" = ./configs/waybar/style.css;
     };
     packages = builtins.attrValues {
       inherit