overheating: add patched ssdt

nix/flake.lock

@@ -364,11 +364,11 @@
         "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1715970545,
+        "lastModified": 1716242428,
-        "narHash": "sha256-WD6Iyb9DV1R5a2A0UIVT8GyzRhs9ntOPGKDubEUUVNs=",
+        "narHash": "sha256-9itkgx3Sl8xPToweCHQoLfvyiTX/b5PZb7clYcKYyIs=",
         "owner": "hyprwm",
         "repo": "hyprlock",
-        "rev": "997f222b0fec6ac74ec718b53600e77c2b26860a",
+        "rev": "18d2d2ba6af6ac76e4714fae2737a55d223716f8",
         "type": "github"
       },
       "original": {
@@ -977,11 +977,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1716087663,
+        "lastModified": 1716244104,
-        "narHash": "sha256-zuSAGlx8Qk0OILGCC2GUyZ58/SJ5R3GZdeUNQ6IS0fQ=",
+        "narHash": "sha256-XXbqfkyWe0d0O+zqRQWi2oXi6wYDmTzXedFkBRwx1VI=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "0bf1808e70ce80046b0cff821c019df2b19aabf5",
+        "rev": "fddd52460e3332eedd8a0043af5675338a5b3e0b",
         "type": "github"
       },
       "original": {

nix/hardware/overheating/configuration.nix

@@ -3,12 +3,13 @@
   imports = [
     ../../modules/ironbar_config.nix
     ../../modules/boot_params.nix
+    ./dsdt.nix
   ];
   boot.kernelPackages = pkgs.linuxPackages_latest;
   networking.hostName = "overheating";
   programs.ironbar.monitor = "eDP-1";
   programs.ironbar.scale = "2.0";
-  programs.boot.boot_params = [ ];
+  programs.boot.boot_params = [ "rtc_cmos.use_acpi_alarm=1" ];
   hardware.bluetooth.enable = true;
   hardware.bluetooth.powerOnBoot = true;
 }

nix/hardware/overheating/dsdt.nix

@@ -0,0 +1,20 @@
+{ pkgs, ... }:
+let
+  # credit to benley: https://github.com/benley/dotfiles/commit/325748c3a8553d55c9fab08654a77b252aa0fde7
+  patched_ssdt = pkgs.stdenv.mkDerivation {
+    name = "patched_ssdt";
+    src = ./.;
+    buildInputs = [ pkgs.libarchive ];
+    installPhase = ''
+      mkdir -p kernel/firmware/acpi
+      cp ${./ssdt6.aml} kernel/firmware/acpi/ssdt6.aml
+      mkdir -p $out
+      echo kernel/firmware/acpi/ssdt6.aml | bsdcpio -v -o -H newc -R 0:0 > $out/lenotrolli-ssdt.img
+    '';
+  };
+in
+
+{
+  boot.kernelParams = [ "mem_sleep_default=deep" ];
+  boot.initrd.prepend = [ "${patched_ssdt}/lenotrolli-ssdt.img" ];
+}

nix/programs/coding.nix

@@ -8,7 +8,7 @@
 
   home.packages = with pkgs; [
     #basics
-    git
+    gitui
     gcc
     meson
     ninja

nix/programs/hyprland/config.nix

@@ -30,7 +30,8 @@
       "$mod SUPER,G,exec,oxicalc"
       "$mod SUPER,D,exec,oxishut"
       "$mod SUPER,A,exec,oxipaste"
-      "$mod SUPERSHIFT,L,exec, playerctl -a pause & hyprlock & systemctl hibernate"
+      "$mod SUPERSHIFT,L,exec, playerctl -a pause & hyprlock & systemctl suspend"
+      "$mod SUPERSHIFT,K,exec, playerctl -a pause & hyprlock & systemctl hibernate"
 
       # media keys
       ",XF86AudioMute,exec, $HOME/.config/scripts/audio_control.sh mute"

nix/programs/individual_configs/default.nix

@@ -6,5 +6,6 @@
     ./ncspot.nix
     ./ssh.nix
     ./direnv.nix
+    ./git.nix
   ];
 }

nix/programs/individual_configs/git.nix

@@ -0,0 +1,16 @@
+{
+  programs.git = {
+    enable = true;
+    userName = "DashieTM";
+    userEmail = "fabio.lenherr@gmail.com";
+    extraConfig = {
+      merge = {
+        tool = "nvimdiff";
+      };
+      diff = {
+        tool = "nvimdiff";
+      };
+    };
+  };
+
+}

nix/programs/nvim/lua/plugins/plugins.lua

@@ -273,4 +273,11 @@ return {
 			{ "<leader>fy", "<cmd>Yazi<CR>", desc = "Toggle Yazi" },
 		},
 	},
+	{
+		"sindrets/diffview.nvim",
+		keys = {
+			{ "<leader>gd", "<cmd>DiffviewOpen<CR>", desc = "Toggle Difftool" },
+		},
+	},
+	{ "akinsho/git-conflict.nvim", version = "*", config = true },
 }