1 files changed, 22 insertions, 18 deletions

diff --git a/modules/home/i3wm/nord-blue/i3.nix b/modules/home/i3wm/nord-blue/i3.nix
index e3a3e17..e6dd3a4 100644
--- a/modules/home/i3wm/nord-blue/i3.nix
+++ b/modules/home/i3wm/nord-blue/i3.nix
@@ -1,23 +1,27 @@
 { pkgs, config, lib, ... }:
 
 let 
-  vars = import ./variables.nix {inherit ...; }; 
+  vars = import ./variables.nix; 
+  mod = "Mod4";
 in 
 {
-  packages = with pkgs; [
-    feh # Wallpaper
-  ];
-  programs = {
+ xsession.windowManager = {
     i3 = {
       enable = true;
       config = {
-        modifier = "Mod4";
+        modifier = mod;
+
+        startup = [
+          { command = "sh -c 'feh --bg-fill ${vars.wallpaper}'"; }
+        ];
         
         keybindings = lib.mkOptionDefault {
           "${mod}+Enter" = "exec ${pkgs.alacritty}/bin/alacritty"; # Lanuch alacritty as a terminal
           "${mod}+m" = "exec ${pkgs.dmenu}/bin/dmenu"; # Launch dmenu (app launcher)
           "${mod}+q" = "kill"; # Close an app (kill the process)
-          "${mod}+Alt+l" = "exec sh -c '${pkgs.lock-screen}/bin/lock-screen' ${wallpaper}";
+          "${mod}+Alt+l" = "exec sh -c 'lock-screen ${vars.wallpaper}'"; # Lock screen
+          "${mod}+Shift+r" = "restart";
+          "${mod}+Ctrl+Shift+e" = "exec sh -c 'i3-msg exit'";
 
 
           # === FOCUS === #
@@ -49,14 +53,14 @@ in
           "${mod}+Shift+Right" = "focus right";
         };
       };
-
-      extraPackages = with pkgs; [
-        dmenu # App launcher
-        i3-lock # Lock screen
-        imagemagick # Handle wallpaper resizing for i3-lock
-        polybar # Status bar
-        alacritty # Terminal Emulator
-      ];
-    }
-  }
-}
\ No newline at end of file
+    };
+  };
+  home.packages = with pkgs; [
+    dmenu # App launcher
+    i3lock # Lock screen
+    imagemagick # Handle wallpaper resizing for i3-lock
+    polybar # Status bar
+    alacritty # Terminal Emulator
+    feh # Wallpaper utility
+  ];
+}