diff --git a/flake.lock b/flake.lock
index 795a617..4516727 100644
--- a/flake.lock
+++ b/flake.lock
@@ -153,6 +153,24 @@
         "type": "github"
       }
     },
+    "hyprpaper": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_2"
+      },
+      "locked": {
+        "lastModified": 1680381117,
+        "narHash": "sha256-/Kz4Qy+jx1+bfSq6e2W3MbyODkhs6GqKiiybNtqzvbc=",
+        "owner": "JulienMalka",
+        "repo": "hyprpaper",
+        "rev": "61fd6d3965ae0e1509602dd0b6e2d2c4ebb2e460",
+        "type": "github"
+      },
+      "original": {
+        "owner": "JulienMalka",
+        "repo": "hyprpaper",
+        "type": "github"
+      }
+    },
     "linkal": {
       "inputs": {
         "flake-utils": [
@@ -179,7 +197,7 @@
     },
     "nixos-apple-silicon": {
       "inputs": {
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs_3",
         "rust-overlay": "rust-overlay"
       },
       "locked": {
@@ -213,6 +231,22 @@
       }
     },
     "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1674641431,
+        "narHash": "sha256-qfo19qVZBP4qn5M5gXc/h1MDgAtPA5VxJm9s8RUAkVk=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "9b97ad7b4330aacda9b2343396eb3df8a853b4fc",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1679172431,
         "narHash": "sha256-XEh5gIt5otaUbEAPUY5DILUTyWe1goAyeqQtmwaFPyI=",
@@ -228,7 +262,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_3": {
+    "nixpkgs_4": {
       "locked": {
         "lastModified": 1680122840,
         "narHash": "sha256-zCQ/9iFHzCW5JMYkkHMwgK1/1/kTMgCMHq4THPINpAU=",
@@ -251,9 +285,10 @@
         "home-manager": "home-manager",
         "homepage": "homepage",
         "hyprland": "hyprland",
+        "hyprpaper": "hyprpaper",
         "linkal": "linkal",
         "nixos-apple-silicon": "nixos-apple-silicon",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_4",
         "simple-nixos-mailserver": "simple-nixos-mailserver",
         "sops-nix": "sops-nix",
         "unstable": "unstable"
diff --git a/flake.nix b/flake.nix
index 5c5c8f8..42f6a3f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -54,6 +54,9 @@
       url = "github:hyprwm/Hyprland";
     };
 
+    hyprpaper = {
+      url = "github:JulienMalka/hyprpaper";
+    };
 
   };
 
diff --git a/home-manager-modules/hyprland/default.nix b/home-manager-modules/hyprland/default.nix
index 35b930c..a6131a0 100644
--- a/home-manager-modules/hyprland/default.nix
+++ b/home-manager-modules/hyprland/default.nix
@@ -17,9 +17,12 @@ with lib;
         package = pkgs.hyprland;
 
       };
+
+      home.packages = [ pkgs.hyprpaper ];
+
       xdg.configFile."hypr/hyprland.conf".text = ''
                 exec-once=${pkgs.dbus}/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY HYPRLAND_INSTANCE_SIGNATURE XDG_CURRENT_DESKTOP && systemctl --user start hyprland-session.target
-                exec-once = waybar
+                exec-once = waybar & hyprpaper
                 # Monitors
                 monitor = eDP-1, preferred, auto, auto
     
@@ -166,7 +169,6 @@ with lib;
                 bind = SUPER SHIFT, F, exec, $files
                 bind = SUPER SHIFT, B, exec, $browser
                 bind = SUPER, SPACE, exec, $launcher
-                bind = SUPER, E, exec, $emoji
                 bind = SUPER, X, exec, power-menu
     
                 # Function keys
@@ -187,7 +189,7 @@ with lib;
                 bind = SUPER, Q, killactive,
                 bind = SUPER, M, exit,
                 bind = SUPER, F, fullscreen,
-                bind = SUPER, Space, togglefloating,
+                bind = SUPER, D, togglefloating,
                 bind = SUPER, P, pseudo, # dwindle
                 bind = SUPER, J, togglesplit, # dwindle
     
@@ -226,6 +228,10 @@ with lib;
                 bind = SUPER, mouse_down, workspace, e+1
                 bind = SUPER, mouse_up, workspace, e-1
       '';
+      xdg.configFile."hypr/hyprpaper.conf".text = ''
+        preload = ${../../machines/macintosh/wallpaper.jpg}
+        wallpaper = ,${../../machines/macintosh/wallpaper.jpg}
+      '';
 
     };
 }
diff --git a/home-manager-modules/waybar/default.nix b/home-manager-modules/waybar/default.nix
index 970efe1..23bfd7f 100644
--- a/home-manager-modules/waybar/default.nix
+++ b/home-manager-modules/waybar/default.nix
@@ -16,11 +16,10 @@ with lib;
           layer = "top";
           modules-left = [ "custom/arch" "wlr/workspaces" ];
           modules-center = [ "clock" ];
-          modules-right = [ "backlight" "pulseaudio" "network" "battery" ];
-          "custom/arch" = {
+          modules-right = [ "backlight" "network" "battery" ];
+          "custom/nixos" = {
             format = " ❄ ";
             tooltip = false;
-            on-click = "sh $HOME/.config/rofi/bin/powermenu";
           };
           "wlr/workspaces" = {
             format = "{name}";
@@ -67,7 +66,7 @@ with lib;
         };
       };
       style = ''
-              * {
+        * {
           border: none;
           font-family: 'Fira Code', 'Symbols Nerd Font Mono';
           font-size: 12px;
@@ -80,14 +79,14 @@ with lib;
         }
 
         #custom-arch, #workspaces {
-          border-radius: 10px;
+          border-radius: 8px;
           background-color: #11111b;
-          color: #cba6f7;
+          color: #7eb9e3;
           margin-top: 15px;
         	margin-right: 15px;
           padding-top: 1px;
-          padding-left: 10px;
-          padding-right: 10px;
+          padding-left: 5px;
+          padding-right: 5px;
         }
 
         #custom-arch {
diff --git a/lib/default.nix b/lib/default.nix
index 6528ecd..f04e742 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -51,6 +51,7 @@ in
               buildbot-badges = prev.pkgs.callPackage ../packages/buildbot-badges { };
               linkal = inputs.linkal.defaultPackage."${system}";
               mosh = prev.unstable.mosh;
+              hyprpaper = inputs.hyprpaper.packages.${system}.default;
             })
         ];
       }