diff --git a/modules/home/apps/cli-apps/fish/default.nix b/modules/home/apps/cli-apps/fish/default.nix
index 9c80178..c05e3f9 100644
--- a/modules/home/apps/cli-apps/fish/default.nix
+++ b/modules/home/apps/cli-apps/fish/default.nix
@@ -16,27 +16,37 @@ in
   };
 
   config = mkIf cfg.enable {
-    home.packages = with pkgs.fishPlugins; [
-      forgit
-      sponge
-    ];
-
     programs = {
       fish = {
         enable = true;
-        shellInit = "
-	zoxide init fish | source
-	direnv hook fish | source
-	source ~/.config/op/plugins.sh
-	";
+        shellInit = ''
+          zoxide init fish | source
+          direnv hook fish | source
+          source ~/.config/op/plugins.sh
+
+          set -x LESS_TERMCAP_mb \e'[01;32m'
+          set -x LESS_TERMCAP_md \e'[01;32m'
+          set -x LESS_TERMCAP_me \e'[0m'
+          set -x LESS_TERMCAP_se \e'[0m'
+          set -x LESS_TERMCAP_so \e'[01;47;34m'
+          set -x LESS_TERMCAP_ue \e'[0m'
+          set -x LESS_TERMCAP_us \e'[01;36m'
+          set -x LESS -R
+          set -x GROFF_NO_SGR 1
+        '';
         shellAliases = {
           vim = "nvim";
           ls = "colorls --gs";
           l = "ls -l";
-          la = "ls -a";
-          lla = "ls -la";
+          la = "ls -la";
           lt = "ls --tree";
         };
+        plugins = with pkgs.fishPlugins; [
+          {
+            name = "forgit";
+            src = forgit.src;
+          }
+        ];
       };
 
       zoxide = {
diff --git a/modules/nixos/apps/cli-apps/nixvim/default.nix b/modules/nixos/apps/cli-apps/nixvim/default.nix
index 121341f..3f5a976 100644
--- a/modules/nixos/apps/cli-apps/nixvim/default.nix
+++ b/modules/nixos/apps/cli-apps/nixvim/default.nix
@@ -23,6 +23,8 @@ in
       variables = {
         EDITOR = "nvim";
         SUDOEDITOR = "nvim";
+        PAGER = "less";
+        MANPAGER = "less";
       };
     };
 
diff --git a/modules/nixos/archetypes/gaming/default.nix b/modules/nixos/archetypes/gaming/default.nix
index 945afde..7baba0c 100644
--- a/modules/nixos/archetypes/gaming/default.nix
+++ b/modules/nixos/archetypes/gaming/default.nix
@@ -19,7 +19,6 @@ in
     wyrdgard = {
       submodules = {
         basics = enabled;
-        graphical-interface = enabled;
         games = enabled;
         socials = enabled;
       };
diff --git a/modules/nixos/graphical-interface/desktop-manager/addons/rofi/config.rasi b/modules/nixos/desktop/addons/rofi/config.rasi
similarity index 100%
rename from modules/nixos/graphical-interface/desktop-manager/addons/rofi/config.rasi
rename to modules/nixos/desktop/addons/rofi/config.rasi
diff --git a/modules/nixos/graphical-interface/desktop-manager/addons/rofi/default.nix b/modules/nixos/desktop/addons/rofi/default.nix
similarity index 76%
rename from modules/nixos/graphical-interface/desktop-manager/addons/rofi/default.nix
rename to modules/nixos/desktop/addons/rofi/default.nix
index 8c780ed..f26bbb7 100644
--- a/modules/nixos/graphical-interface/desktop-manager/addons/rofi/default.nix
+++ b/modules/nixos/desktop/addons/rofi/default.nix
@@ -7,7 +7,7 @@
   ...
 }:
 let
-  cfg = config.${namespace}.graphical-interface.desktop-manager.addons.rofi;
+  cfg = config.${namespace}.desktop.addons.rofi;
 
   inherit (lib)
     mkIf
@@ -17,7 +17,7 @@ let
     ;
 in
 {
-  options.${namespace}.graphical-interface.desktop-manager.addons.rofi = {
+  options.${namespace}.desktop.addons.rofi = {
     enable = mkEnableOption "Rofi";
     package = mkOption {
       type = types.package;
diff --git a/modules/nixos/graphical-interface/desktop-manager/addons/waybar/config b/modules/nixos/desktop/addons/waybar/config
similarity index 100%
rename from modules/nixos/graphical-interface/desktop-manager/addons/waybar/config
rename to modules/nixos/desktop/addons/waybar/config
diff --git a/modules/nixos/graphical-interface/desktop-manager/addons/waybar/default.nix b/modules/nixos/desktop/addons/waybar/default.nix
similarity index 78%
rename from modules/nixos/graphical-interface/desktop-manager/addons/waybar/default.nix
rename to modules/nixos/desktop/addons/waybar/default.nix
index 0ea8e7b..fe0204f 100644
--- a/modules/nixos/graphical-interface/desktop-manager/addons/waybar/default.nix
+++ b/modules/nixos/desktop/addons/waybar/default.nix
@@ -7,7 +7,7 @@
   ...
 }:
 let
-  cfg = config.${namespace}.graphical-interface.desktop-manager.addons.waybar;
+  cfg = config.${namespace}.desktop.addons.waybar;
 
   inherit (lib)
     mkEnableOption
@@ -17,7 +17,7 @@ let
     ;
 in
 {
-  options.${namespace}.graphical-interface.desktop-manager.addons.waybar = {
+  options.${namespace}.desktop.addons.waybar = {
     enable = mkEnableOption "Waybar";
     package = mkOption {
       type = types.package;
diff --git a/modules/nixos/graphical-interface/desktop-manager/addons/waybar/style.css b/modules/nixos/desktop/addons/waybar/style.css
similarity index 100%
rename from modules/nixos/graphical-interface/desktop-manager/addons/waybar/style.css
rename to modules/nixos/desktop/addons/waybar/style.css
diff --git a/modules/nixos/graphical-interface/desktop-manager/hyprland/default.nix b/modules/nixos/desktop/hyprland/default.nix
similarity index 94%
rename from modules/nixos/graphical-interface/desktop-manager/hyprland/default.nix
rename to modules/nixos/desktop/hyprland/default.nix
index 80a366b..ed79bc0 100644
--- a/modules/nixos/graphical-interface/desktop-manager/hyprland/default.nix
+++ b/modules/nixos/desktop/hyprland/default.nix
@@ -4,6 +4,7 @@
   lib,
   pkgs,
   system,
+  namespace,
   ...
 }:
 with lib.wyrdgard;
@@ -15,7 +16,7 @@ let
     mkMerge
     types
     ;
-  cfg = config.wyrdgard.graphical-interface.desktop-manager.hyprland;
+  cfg = config.${namespace}.desktop.hyprland;
 
   cachix-url = "https://hyprland.cachix.org";
   cachix-key = "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=";
@@ -35,7 +36,7 @@ let
   '';
 in
 {
-  options.wyrdgard.graphical-interface.desktop-manager.hyprland = {
+  options.${namespace}.desktop.hyprland = {
     enable = mkEnableOption "Whether to enable hyprland";
     settings = mkOption {
       type = types.attrs;
@@ -55,6 +56,8 @@ in
       xfce.thunar
       dunst
 
+      elegant-sddm
+
       jq
       focus-1password
     ];
@@ -70,19 +73,14 @@ in
 
     services = {
       xserver = enabled;
-      greetd = {
+      displayManager.sddm = {
         enable = true;
-        settings = {
-          default_session = {
-            command = "${lib.getExe pkgs.greetd.tuigreet} --cmd Hyprland";
-            user = config.wyrdgard.user.name;
-          };
-        };
+        theme = "Elegant";
       };
     };
 
     wyrdgard = {
-      graphical-interface.desktop-manager.addons = {
+      desktop.addons = {
         waybar = enabled;
         rofi = {
           enable = true;
@@ -110,7 +108,7 @@ in
 
                 "[workspace 3 silent] steam"
                 "[workspace 2 silent] discord"
-                "[workspace 2 silent] noisetorch"
+                "[workspace 2 silent] noisetorch -i"
                 "[workspace 4 silent] 1password"
                 "[workspace 1 silent] zen"
               ];
diff --git a/modules/nixos/graphical-interface/desktop-manager/kde/default.nix b/modules/nixos/desktop/kde/default.nix
similarity index 72%
rename from modules/nixos/graphical-interface/desktop-manager/kde/default.nix
rename to modules/nixos/desktop/kde/default.nix
index 99af216..a6e793d 100644
--- a/modules/nixos/graphical-interface/desktop-manager/kde/default.nix
+++ b/modules/nixos/desktop/kde/default.nix
@@ -1,16 +1,17 @@
 {
   config,
   lib,
+  namespace,
   pkgs,
   ...
 }:
 with lib;
 with lib.wyrdgard;
 let
-  cfg = config.wyrdgard.graphical-interface.desktop-manager.kde;
+  cfg = config.${namespace}.desktop.kde;
 in
 {
-  options.wyrdgard.graphical-interface.desktop-manager.kde = with types; {
+  options.${namespace}.desktop.kde = with types; {
     enable = mkEnableOption "Whether to enable a kde plasma6";
   };
 
diff --git a/modules/nixos/graphical-interface/display-manager/greetd/default.nix b/modules/nixos/graphical-interface/display-manager/greetd/default.nix
deleted file mode 100644
index fcfd04f..0000000
--- a/modules/nixos/graphical-interface/display-manager/greetd/default.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  pkgs,
-  config,
-  lib,
-  ...
-}:
-with lib;
-with lib.wyrdgard;
-let
-  cfg = config.wyrdgard.graphical-interface.display-manager.greetd;
-
-  hyperland = config.wyrdgard.graphical-interface.desktop-manager.hyperland;
-  hyprland-session = "${inputs.hyprland.packages.${pkgs.system}.hyperland}/share/wayland-sessions";
-  kde-session = "${inputs.plasma6.packages.${pkgs.system}.plasma6}/share/wayland-sessions";
-
-  tuigreet = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --remember --remember-session";
-
-  command =
-    if hyperland.enable then
-      "${tuigreet} --sessions ${hyprland-session}"
-    else
-      "${tuigreet} --sessions ${kde-session}";
-in
-{
-  options.wyrdgard.graphical-interface.display-manager.greetd = with types; {
-    enable = mkEnableOption "Whether to enable a sddm";
-  };
-
-  config = mkIf cfg.enable {
-    services = {
-      xserver = enabled;
-      greetd = {
-        enable = true;
-        settings = {
-          default_session = {
-            command = command;
-            user = config.wyrdgard.user.name;
-          };
-        };
-      };
-    };
-  };
-}
diff --git a/modules/nixos/graphical-interface/display-manager/sddm/default.nix b/modules/nixos/graphical-interface/display-manager/sddm/default.nix
deleted file mode 100644
index 09bf3ef..0000000
--- a/modules/nixos/graphical-interface/display-manager/sddm/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ config, lib, ... }:
-with lib;
-with lib.wyrdgard;
-let
-  cfg = config.wyrdgard.graphical-interface.display-manager.sddm;
-in
-{
-  options.wyrdgard.graphical-interface.display-manager.sddm = with types; {
-    enable = mkEnableOption "Whether to enable a sddm";
-  };
-
-  config = mkIf cfg.enable {
-    services = {
-      xserver = enabled;
-      displayManager = {
-        sddm = {
-          enable = true;
-          wayland.enable = true;
-        };
-      };
-    };
-  };
-}
diff --git a/modules/nixos/submodules/graphical-interface/default.nix b/modules/nixos/submodules/graphical-interface/default.nix
deleted file mode 100644
index ac01313..0000000
--- a/modules/nixos/submodules/graphical-interface/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-with lib;
-with lib.wyrdgard;
-let
-  cfg = config.wyrdgard.submodules.graphical-interface;
-in
-{
-  options.wyrdgard.submodules.graphical-interface = with types; {
-    enable = mkBoolOpt false "Whether to enable a graphical interface";
-  };
-
-  config = mkIf cfg.enable {
-    environment.systemPackages = with pkgs; [ xdg-utils ];
-
-    wyrdgard.graphical-interface =
-      {
-      };
-  };
-}
diff --git a/modules/nixos/system/boot/default.nix b/modules/nixos/system/boot/default.nix
index 4d7e225..81d6487 100644
--- a/modules/nixos/system/boot/default.nix
+++ b/modules/nixos/system/boot/default.nix
@@ -15,9 +15,13 @@ in
   };
 
   config = mkIf cfg.enable {
-    boot.kernelPackages = pkgs.linuxPackages_latest;
-    boot.loader.systemd-boot.enable = true;
-    boot.loader.efi.canTouchEfiVariables = true;
+    boot = {
+      kernelPackages = pkgs.linuxPackages_latest;
+      loader = {
+        systemd-boot.enable = true;
+        efi.canTouchEfiVariables = true;
+      };
+    };
 
     services.fstrim = enabled;
   };
diff --git a/systems/x86_64-linux/yggdrasil/default.nix b/systems/x86_64-linux/yggdrasil/default.nix
index bf902a5..5160c4a 100644
--- a/systems/x86_64-linux/yggdrasil/default.nix
+++ b/systems/x86_64-linux/yggdrasil/default.nix
@@ -11,13 +11,17 @@ in
 
   environment.systemPackages = with pkgs; [
     path-of-building
-    steamcmd
+    pkgs.most
+    pkgs.man-pages
+    pkgs.man-pages-posix
   ];
 
   environment.pathsToLink = [ "/libexec" ];
 
   virtualisation.waydroid = enabled;
 
+  services.xserver.displayManager.setupCommands = "xrandr --output HDMI-A-1 --off";
+
   wyrdgard = {
     archetypes = {
       gaming.enable = true;
@@ -28,7 +32,7 @@ in
       obs-studio = enabled;
     };
 
-    graphical-interface.desktop-manager.hyprland = {
+    desktop.hyprland = {
       enable = true;
       settings = {
         monitor = [
@@ -39,7 +43,7 @@ in
         ];
 
         exec-once = [
-          "xrandr --output DP-2 --primary"
+          "xrandr --output DP-2 --primary --output HDMI-A-1 --on"
           "hyprctl dispatch moveworkspacetomonitor 4 HDMI-A-1"
         ];