diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..b2be92b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+result
diff --git a/home/hyprland/hyprland_gunter.nix b/home/hyprland/hyprland_gunter.nix
index bc0c22a..adb87fd 100644
--- a/home/hyprland/hyprland_gunter.nix
+++ b/home/hyprland/hyprland_gunter.nix
@@ -1,4 +1,8 @@
 { inputs, pkgs, lib, config, ... }: {
+  imports = [
+    ./hyprlock.nix
+    ./hypridle.nix
+  ];
   options.hyprland.enable = lib.mkEnableOption "Hyprland";
   config = {
     home.packages = with pkgs; [
@@ -122,6 +126,9 @@
           # term
           "$mainMod,Return,exec,$term"
 
+          # hyprlock
+          "$shiftMainMod,l,exec,hyprlock"
+
           # rofi
           "$mainMod,D,exec,rofi-launcher"
           "$mainMod,P,exec,rofi-rbw"
@@ -166,6 +173,7 @@
           "waybar"
           "hyprpaper & sleep 2 && randomwp"
           "easyeffects --gapplication-service"
+          "hypridle"
           # "dunst"
         ];
       };
diff --git a/home/hyprland/hyprlock.nix b/home/hyprland/hyprlock.nix
index 88debe4..c4a7427 100644
--- a/home/hyprland/hyprlock.nix
+++ b/home/hyprland/hyprlock.nix
@@ -1,11 +1,11 @@
-{ config, pkgs, ... }: {
+{ config, osConfig, pkgs, ... }: {
 
   home.packages = with pkgs; [
     unstable.hyprlock
   ];
   xdg.configFile = {
     "hypr/hyprlock.conf" = {
-      source = config.lib.file.mkOutOfStoreSymlink ./. + "/hyprlock.conf";
+      source = config.lib.file.mkOutOfStoreSymlink ./. + "/hyprlock_${osConfig.system.name}.conf";
       target = "hypr/hyprlock.conf";
     };
   };
diff --git a/home/hyprland/hyprlock_gunter.conf b/home/hyprland/hyprlock_gunter.conf
new file mode 100644
index 0000000..46b464d
--- /dev/null
+++ b/home/hyprland/hyprlock_gunter.conf
@@ -0,0 +1,64 @@
+source = ~/.cache/wal/colors-hyprland.conf
+# BACKGROUND
+background {
+    monitor =
+    path = ~/wallpapers/current
+    blur_passes = 3
+    contrast = 0.8916
+    brightness = 0.8172
+    vibrancy = 0.1696
+    vibrancy_darkness = 0.0
+}
+
+# GENERAL
+general {
+    no_fade_in = false
+    grace = 0
+    disable_loading_bar = true
+}
+
+# INPUT FIELD
+input-field {
+    monitor =
+    size = 250, 60
+    outline_thickness = 2
+    dots_size = 0.2 # Scale of input-field height, 0.2 - 0.8
+    dots_spacing = 0.2 # Scale of dots' absolute size, 0.0 - 1.0
+    dots_center = true
+    outer_color = rgba(0, 0, 0, 0)
+    inner_color = rgba(0, 0, 0, 0.5)
+    font_color = rgb(200, 200, 200)
+    fade_on_empty = false
+    font_family = JetBrains Mono Nerd Font Mono
+    placeholder_text = <i><span foreground="##cdd6f4">Input Password...</span></i>
+    hide_input = false
+    position = 0, -120
+    halign = center
+    valign = center
+}
+
+# TIME
+label {
+    monitor =
+    text = cmd[update:1000] echo "$(date +"%b %d %H:%M")"
+    color = $foreground
+    #color = rgba(255, 255, 255, 0.6)
+    font_size = 120
+    font_family = JetBrains Mono Nerd Font Mono ExtraBold
+    position = 0, -300
+    halign = center
+    valign = top
+}
+
+## USER
+#label {
+#    monitor =
+#    text = Hi there, $USER
+#    color = $foreground
+#    #color = rgba(255, 255, 255, 0.6)
+#    font_size = 25
+#    font_family = JetBrains Mono Nerd Font Mono
+#    position = 0, -40
+#    halign = center
+#    valign = center
+#}
diff --git a/home/hyprland/hyprlock.conf b/home/hyprland/hyprlock_magicman.conf
similarity index 97%
rename from home/hyprland/hyprlock.conf
rename to home/hyprland/hyprlock_magicman.conf
index 9a31858..e289670 100644
--- a/home/hyprland/hyprlock.conf
+++ b/home/hyprland/hyprlock_magicman.conf
@@ -66,7 +66,7 @@ label {
 # Battery level
 label {
     monitor =
-    text = cmd[update:1000] echo "$(batlvl)" 
+    text = cmd[update:1000] echo "$(batlvl)"
     color = $foreground
     #color = rgba(255, 255, 255, 0.6)
     font_size = 18
diff --git a/home/hyprland/waybar/default.nix b/home/hyprland/waybar/default.nix
index d00835e..a44523a 100644
--- a/home/hyprland/waybar/default.nix
+++ b/home/hyprland/waybar/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, ... }:
+{ pkgs, lib, osConfig, ... }:
 let
   flakestat = pkgs.writeShellApplication {
     name = "flakestat";
@@ -155,7 +155,15 @@ in
       modules-left = [ "custom/launcher" "hyprland/workspaces" ];
       modules-center = [ "clock" ];
       modules-right =
-        [ "custom/flakestat" "pulseaudio" "pulseaudio#microphone" "memory" "cpu" "tray" "battery" ];
+        [
+          "custom/flakestat"
+          "pulseaudio"
+          "pulseaudio#microphone"
+          "memory"
+          "cpu"
+          "tray"
+          (lib.mkIf (osConfig.system.name == "magicman") "battery")
+        ];
       "custom/launcher" = {
         "format" = " ";
         "on-click" = "pkill rofi || ~/.config/rofi/launcher.sh";
diff --git a/hosts/gunter/configuration.nix b/hosts/gunter/configuration.nix
index d23af6c..db35f26 100644
--- a/hosts/gunter/configuration.nix
+++ b/hosts/gunter/configuration.nix
@@ -1,4 +1,4 @@
-{ config, inputs, pkgs, ... }:
+{ config, lib, inputs, pkgs, ... }:
 
 {
   imports = [
@@ -124,6 +124,7 @@
     wget
     v4l-utils
     nmap
+    (lib.mkIf (config.system.name == "gunter") pciutils)
 
     # X shit
     # xorg.xorgserver