i got no clue what i did

8 files changed, 66 insertions, 51 deletions

diff --git a/configuration.nix b/configuration.nix
index 1421c0b..3b4ea62 100755
--- a/configuration.nix
+++ b/configuration.nix
@@ -9,7 +9,7 @@
     # === Environment Choice ===
     # Uncomment one of the following to select your environment:
     ./modules/nixos/des/i3wm.nix
-    #./modules/nixos/des/niri.nix
+    #./modules/nixos/des/gnome.nix
   ];
 }
 
diff --git a/flake.lock b/flake.lock
index 10b11a9..39d0bc5 100755
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1769580047,
-        "narHash": "sha256-tNqCP/+2+peAXXQ2V8RwsBkenlfWMERb+Uy6xmevyhM=",
+        "lastModified": 1770260404,
+        "narHash": "sha256-3iVX1+7YUIt23hBx1WZsUllhbmP2EnXrV8tCRbLxHc8=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "366d78c2856de6ab3411c15c1cb4fb4c2bf5c826",
+        "rev": "0d782ee42c86b196acff08acfbf41bb7d13eed5b",
         "type": "github"
       },
       "original": {
@@ -31,11 +31,11 @@
         "xwayland-satellite-unstable": "xwayland-satellite-unstable"
       },
       "locked": {
-        "lastModified": 1770056451,
-        "narHash": "sha256-8dDG3+suKAiWFAdP6S9OKasusbC/cP33wA/zQw/i9bE=",
+        "lastModified": 1770271466,
+        "narHash": "sha256-Pyc3p/V7ruQplnU31r+umLSNlSGwOOoHzhWfzfLmiiw=",
         "owner": "sodiboo",
         "repo": "niri-flake",
-        "rev": "fffa014b0fd6ff9ebf1c86fc460fee2ea0ac9a5e",
+        "rev": "76e1d271485b00a5d98aeb1dd76408594741c039",
         "type": "github"
       },
       "original": {
@@ -64,11 +64,11 @@
     "niri-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1769577126,
-        "narHash": "sha256-v9vz9Rj4MGwPuhGELdvpRKl2HH+xvkgat6VwL0L86Fg=",
+        "lastModified": 1770092965,
+        "narHash": "sha256-++K1ftjwPqMJzIO8t2GsdkYQzC2LLA5A1w21Uo+SLz4=",
         "owner": "YaLTeR",
         "repo": "niri",
-        "rev": "f30db163b5748e8cf95c05aba77d0d3736f40543",
+        "rev": "189917c93329c86ac2ddd89f459c26a028d590ba",
         "type": "github"
       },
       "original": {
@@ -79,11 +79,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1770019141,
-        "narHash": "sha256-VKS4ZLNx4PNrABoB0L8KUpc1fE7CLpQXQs985tGfaCU=",
+        "lastModified": 1770197578,
+        "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "cb369ef2efd432b3cdf8622b0ffc0a97a02f3137",
+        "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2",
         "type": "github"
       },
       "original": {
@@ -95,11 +95,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1769900590,
-        "narHash": "sha256-I7Lmgj3owOTBGuauy9FL6qdpeK2umDoe07lM4V+PnyA=",
+        "lastModified": 1770136044,
+        "narHash": "sha256-tlFqNG/uzz2++aAmn4v8J0vAkV3z7XngeIIB3rM3650=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "41e216c0ca66c83b12ab7a98cc326b5db01db646",
+        "rev": "e576e3c9cf9bad747afcddd9e34f51d18c855b4e",
         "type": "github"
       },
       "original": {
@@ -111,11 +111,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1769598131,
-        "narHash": "sha256-e7VO/kGLgRMbWtpBqdWl0uFg8Y2XWFMdz0uUJvlML8o=",
+        "lastModified": 1770136044,
+        "narHash": "sha256-tlFqNG/uzz2++aAmn4v8J0vAkV3z7XngeIIB3rM3650=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "fa83fd837f3098e3e678e6cf017b2b36102c7211",
+        "rev": "e576e3c9cf9bad747afcddd9e34f51d18c855b4e",
         "type": "github"
       },
       "original": {
@@ -152,11 +152,11 @@
     "xwayland-satellite-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1769713942,
-        "narHash": "sha256-0BtCSO2qzYK/akRDsERqRVLknCYD3FYErc+szreSHUo=",
+        "lastModified": 1770167989,
+        "narHash": "sha256-rE2WTxKHe3KMG/Zr5YUNeKHkZfWwSFl7yJXrOKnunHg=",
         "owner": "Supreeeme",
         "repo": "xwayland-satellite",
-        "rev": "37ec78ee26e158b71f42e113e0e7dd9d5eb6bdb0",
+        "rev": "0947c4685f6237d4f8045482ce0c62feab40b6c4",
         "type": "github"
       },
       "original": {
diff --git a/modules/home/default.nix b/modules/home/default.nix
index b05750c..aa77672 100644
--- a/modules/home/default.nix
+++ b/modules/home/default.nix
@@ -4,6 +4,6 @@
   # Home environment orchestrator
   imports = [
     ./i3wm/original/default.nix
-    ./i3wm/nord-blue/default.nix
+    #./i3wm/nord-blue/default.nix
   ];
 }
diff --git a/modules/home/i3wm/nord-blue/alacritty.nix b/modules/home/i3wm/nord-blue/alacritty.nix
index beccbd9..1f6aa49 100644
--- a/modules/home/i3wm/nord-blue/alacritty.nix
+++ b/modules/home/i3wm/nord-blue/alacritty.nix
@@ -3,5 +3,5 @@
 {
   programs.alacritty = {
     enable = true;
-  }
-}
\ No newline at end of file
+  };
+}
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
+  ];
+}
diff --git a/modules/home/i3wm/nord-blue/variables.nix b/modules/home/i3wm/nord-blue/variables.nix
index 0a5d027..b023e75 100644
--- a/modules/home/i3wm/nord-blue/variables.nix
+++ b/modules/home/i3wm/nord-blue/variables.nix
@@ -1,12 +1,9 @@
-{ ... }:
-
 {
   colors = {
-    main = #2D333F
-
+    main = "#2D333F";
+    # Add other colours
   };
-  wallpaper = {
-    wave = import ./wallpapers/wave-minimal.jpeg
+
+  wallpaper = "~/Documents/4. Configuration/modules/home/i3wm/nord-blue/wallpapers/wave-minimal.png
       # Add other wallpapers eventually
-  }
-}
\ No newline at end of file
+}
diff --git a/modules/nixos/des/gnome.nix b/modules/nixos/des/gnome.nix
new file mode 100644
index 0000000..79d32c8
--- /dev/null
+++ b/modules/nixos/des/gnome.nix
@@ -0,0 +1,14 @@
+{ config, pkgs, ... }:
+
+{
+  services.displayManager.gdm.enable = true;
+  services.desktopManager.gnome.enable = true;
+
+  # To disable installing GNOME's suite of applications
+  # and only be left with GNOME shell.
+  services.gnome.core-apps.enable = false;
+  services.gnome.core-developer-tools.enable = false;
+  services.gnome.games.enable = false;
+  environment.gnome.excludePackages = with pkgs; [ gnome-tour gnome-user-docs ];
+
+}
\ No newline at end of file
diff --git a/modules/polybar.nix b/modules/polybar.nix
deleted file mode 100755
index e69de29..0000000
--- a/modules/polybar.nix
+++ /dev/null