From 9af13c680ae0ecda2160144fc52c3dc3681c1e86 Mon Sep 17 00:00:00 2001
From: tomoron <tomoron@student.42angouleme.fr>
Date: Wed, 29 Jan 2025 01:28:02 +0100
Subject: [PATCH] update flake, change kernelPackage to latest, change lock key
 to laptop, add autoSetupRemote to git configs

---
 configuration.nix         |  1 +
 flake.lock                | 30 +++++++++++++++---------------
 homes/laptop/hyprland.nix |  5 +++++
 modules/git.nix           |  7 +++++--
 modules/hyprland.nix      |  3 ---
 5 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index 2d05f5d..d510d3c 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -11,6 +11,7 @@
 
   nix.settings.experimental-features = ["nix-command" "flakes"];
   nixpkgs.config.allowUnfree = true;
+  boot.kernelPackages = pkgs.linuxPackages_latest;
 
   boot.loader = {
     systemd-boot.enable = true;
diff --git a/flake.lock b/flake.lock
index 3982feb..49f346e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -9,11 +9,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1734581003,
-        "narHash": "sha256-l/HL7yeStHQ5QnXBzH+sT8RhkYaJJop2JCieVSZ1YU8=",
+        "lastModified": 1738037010,
+        "narHash": "sha256-aJYv3EmI/fnvwd1L0xaaKxUf0R3QbDZ9EzCP2ijZLj8=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "fec1195120bbcff43da5d2d34018e71f81bc7b0c",
+        "rev": "bddd81ca4dfa5ec11aef63e5d53b34b1a7c0e124",
         "type": "gitlab"
       },
       "original": {
@@ -45,11 +45,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1734344598,
-        "narHash": "sha256-wNX3hsScqDdqKWOO87wETUEi7a/QlPVgpC/Lh5rFOuA=",
+        "lastModified": 1737968762,
+        "narHash": "sha256-xiPARGKwocaMtv+U/rgi+h2g56CZZEmrcl7ldRaslq8=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "83ecd50915a09dca928971139d3a102377a8d242",
+        "rev": "e1ae908bcc30af792b0bb0a52e53b03d2577255e",
         "type": "github"
       },
       "original": {
@@ -60,11 +60,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1734352517,
-        "narHash": "sha256-mfv+J/vO4nqmIOlq8Y1rRW8hVsGH3M+I2ESMjhuebDs=",
+        "lastModified": 1737751639,
+        "narHash": "sha256-ZEbOJ9iT72iwqXsiEMbEa8wWjyFvRA9Ugx8utmYbpz4=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "b12e314726a4226298fe82776b4baeaa7bcf3dcd",
+        "rev": "dfad538f751a5aa5d4436d9781ab27a6128ec9d4",
         "type": "github"
       },
       "original": {
@@ -76,11 +76,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1734424634,
-        "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=",
+        "lastModified": 1737885589,
+        "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33",
+        "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8",
         "type": "github"
       },
       "original": {
@@ -92,11 +92,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1734424634,
-        "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=",
+        "lastModified": 1737885589,
+        "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33",
+        "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8",
         "type": "github"
       },
       "original": {
diff --git a/homes/laptop/hyprland.nix b/homes/laptop/hyprland.nix
index f577e14..184bf3c 100644
--- a/homes/laptop/hyprland.nix
+++ b/homes/laptop/hyprland.nix
@@ -2,6 +2,11 @@
 
 {
   wayland.windowManager.hyprland.settings = {
+    bind = [
+      #lock
+      ", XF86Launch1, exec, hyprlock"
+      ", XF86Launch4, exec, pkill activate-linux"
+	];
     monitor= [
       "eDP-1, 1920x1080@120, 0x0, 1"
       "HDMI-A-1, 1920x1080@60, auto, auto"
diff --git a/modules/git.nix b/modules/git.nix
index 82b27f0..4f3ec70 100644
--- a/modules/git.nix
+++ b/modules/git.nix
@@ -5,8 +5,11 @@
     enable = true;
     userEmail = "tomoron@student.42angouleme.fr";
     userName = "tomoron";
-	extraConfig.init.defaultBranch="master";
-	extraConfig.pull.rebase = true;
+	extraConfig = {
+		init.defaultBranch="master";
+		pull.rebase = true;
+		push.autoSetupRemote = true;
+	};
     aliases = {
 	  fuck = "!f() { git reset --hard \"@{upstream}\" && git restore . && git clean -f .; };f";
 	  back = "reset HEAD~";
diff --git a/modules/hyprland.nix b/modules/hyprland.nix
index 6ee569b..471a9db 100644
--- a/modules/hyprland.nix
+++ b/modules/hyprland.nix
@@ -75,9 +75,6 @@
       # Scroll through existing workspaces with mainMod + scroll
       "$mainMod, mouse_down, workspace, e+1"
       "$mainMod, mouse_up, workspace, e-1"
-
-      #lock
-      ", XF86Launch1, exec, hyprlock"
     ];
 
     bindm = [