diff --git a/home/desktop/default.nix b/home/desktop/default.nix
index 69fad73..4322638 100644
--- a/home/desktop/default.nix
+++ b/home/desktop/default.nix
@@ -1,32 +1,25 @@
-{ pkgs, inputs, lib, system, ... }:
-let isDarwin = builtins.match ".*-darwin" system != null;
-in {
-  imports = [ inputs.catppuccin.homeModules.catppuccin ]
-    ++ lib.optionals (!isDarwin) [
-      ./hyprland
-      ./rofi
-      ./waybar
-      ./gtk.nix
-      ./qt.nix
-    ] ++ lib.optionals isDarwin [ ./sketchybar.nix ];
+{ pkgs, inputs, ... }: {
+  imports = [
+    inputs.catppuccin.homeModules.catppuccin
+    ./hyprland
+    ./rofi
+    ./waybar
+    ./gtk.nix
+    ./qt.nix
+  ];
 
-  _module.args.compositor = if isDarwin then "quartz" else "hyprland";
+  _module.args.compositor = "hyprland";
 
-  home = lib.mkIf (!isDarwin) {
-    packages = with pkgs; [ waypaper awww ];
-    file.".config/waypaper/config.ini".source = ./waypaper.ini;
-  };
+  home.packages = with pkgs; [ waypaper awww ];
+  home.file.".config/waypaper/config.ini".source = ./waypaper.ini;
 
-  # TODO: Qutebrowser install
-  programs = lib.mkIf (!isDarwin) {
+  programs = {
     mangohud = {
       enable = true;
       settings = {
         position = "top-right";
-
         offset_x = 20;
         offset_y = 20;
-
         fps = true;
         cpu_stats = true;
         gpu_stats = true;
@@ -34,15 +27,9 @@ in {
         gpu_temp = true;
         ram = true;
         vram = true;
-
         background_alpha = 0.5;
       };
     };
-
-    # TODO: Needs config!
-    mpv = {
-      enable = true;
-
-    };
+    mpv.enable = true;
   };
 }
diff --git a/home/desktop/hyprland/default.nix b/home/desktop/hyprland/default.nix
index 15b91ca..03cbf45 100644
--- a/home/desktop/hyprland/default.nix
+++ b/home/desktop/hyprland/default.nix
@@ -1,4 +1,4 @@
-{ inputs, pkgs, lib, ... }:
+{ inputs, pkgs, ... }:
 let
   super = "SUPER";
   terminal = "kitty";
@@ -9,7 +9,7 @@ let
   power =
     "rofi -show p -modi p:rofi-power-menu -theme $HOME/.config/rofi/power.rasi";
   apps = "rofi -show window ${theme}";
-in lib.mkIf (!pkgs.stdenv.isDarwin) {
+in {
 
   imports = [ ./hypridle.nix ./hyprlock.nix ./mako.nix ./portal.nix ];
 
diff --git a/home/shell.nix b/home/shell.nix
index 8e70d85..d566bec 100644
--- a/home/shell.nix
+++ b/home/shell.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }: {
+{ pkgs, isDarwin, lib, ... }: {
   home.packages = with pkgs; [
     eza # ls replacement
     tdf # terminal pdf viewer
@@ -71,7 +71,7 @@
   programs.newsboat = {
     enable = true;
     autoReload = true;
-    browser = if pkgs.stdenv.isDarwin then "open" else "xdg-open";
+    browser = if isDarwin then "open" else "xdg-open";
     urls = [
       {
         url = "https://www.tagesschau.de/xml/rss2";
@@ -171,10 +171,15 @@
       cat = "bat --color=always --style=numbers";
       grep = "rg";
       cp = "rsync -ah --progress";
-      nix-switch = if pkgs.stdenv.isDarwin then
+      nix-switch = if isDarwin then
         "sudo darwin-rebuild switch --flake ~/.config/nix#(hostname -s)"
       else
         "sudo nixos-rebuild switch --flake ~/.config/nix#(hostname -s)";
+
+      nix-check = if isDarwin then
+        "nix eval ~/.config/nix#darwinConfigurations.(hostname -s).config.system.build.toplevel.outPath"
+      else
+        "nix flake check --no-build ~/.config/nix";
     };
 
     interactiveShellInit = ''
@@ -266,6 +271,6 @@
     ".config/fastfetch/config.jsonc".source = ./fastfetch.jsonc;
     ".config/tabiew/theme.toml".source = ./tabiew.toml;
     ".config/kitty/tab_bar.py".source = ./tab_bar.py;
-    ".hushlogin".text = ""; # Suppress login
+    ".hushlogin" = lib.mkIf isDarwin { text = ""; }; # Suppress Login
   };
 }