From f7058034fe0f30ff4e27df142cba057ae9d50ddd Mon Sep 17 00:00:00 2001
From: voidarc <admin@voidarc.co.uk>
Date: Wed, 17 Jun 2026 16:07:55 +0100
Subject: [PATCH] added wshowkeys to pc and fixed deprecated i3 packages

---
 configs/configuration-pc.nix |  7 ++++-
 flake.lock                   | 57 +++++++++++++++++++++++++++++++++++-
 flake.nix                    |  4 +++
 modules/i3/i3.nix            |  2 +-
 4 files changed, 67 insertions(+), 3 deletions(-)

diff --git a/configs/configuration-pc.nix b/configs/configuration-pc.nix
index 97e666a..42579c4 100644
--- a/configs/configuration-pc.nix
+++ b/configs/configuration-pc.nix
@@ -124,7 +124,7 @@
       docker
       orca-slicer
       ffmpeg
-			inputs.norgolith.packages.${pkgs.stdenv.hostPlatform.system}.default
+      inputs.norgolith.packages.${pkgs.stdenv.hostPlatform.system}.default
     ];
   };
 
@@ -132,6 +132,11 @@
     inputs.sls-steam.packages.${pkgs.stdenv.hostPlatform.system}.wrapped
   ];
 
+  programs.wshowkeys = {
+    enable = true;
+    package = inputs.wshowkeys.packages.${pkgs.stdenv.hostPlatform.system}.default;
+  };
+
   programs.steam = {
     enable = true;
     extraCompatPackages = with pkgs; [
diff --git a/flake.lock b/flake.lock
index 8754603..6534492 100644
--- a/flake.lock
+++ b/flake.lock
@@ -196,6 +196,24 @@
         "type": "github"
       }
     },
+    "flake-utils_3": {
+      "inputs": {
+        "systems": "systems_6"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "fsel": {
       "inputs": {
         "flake-utils": "flake-utils",
@@ -862,7 +880,8 @@
         "omnisearch": "omnisearch",
         "otter-launcher": "otter-launcher",
         "sls-steam": "sls-steam",
-        "way-edges": "way-edges"
+        "way-edges": "way-edges",
+        "wshowkeys": "wshowkeys"
       }
     },
     "rust-analyzer-src": {
@@ -996,6 +1015,21 @@
         "type": "github"
       }
     },
+    "systems_6": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "utils": {
       "inputs": {
         "systems": "systems"
@@ -1035,6 +1069,27 @@
         "type": "github"
       }
     },
+    "wshowkeys": {
+      "inputs": {
+        "flake-utils": "flake-utils_3",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1781708685,
+        "narHash": "sha256-NH5b736WoI9LodJKPlonO1X+Lxg8URMLLRkT5to61Zg=",
+        "owner": "voidarclabs",
+        "repo": "wshowkeys",
+        "rev": "47dfb7a0237acbf847ca28cbb88000b33929f50a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "voidarclabs",
+        "repo": "wshowkeys",
+        "type": "github"
+      }
+    },
     "xdph": {
       "inputs": {
         "hyprland-protocols": [
diff --git a/flake.nix b/flake.nix
index 2cc34cc..8ee4caf 100644
--- a/flake.nix
+++ b/flake.nix
@@ -17,6 +17,10 @@
       url = "github:NTBBloodbath/norgolith";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    wshowkeys = {
+      url = "github:voidarclabs/wshowkeys";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
     # Utils
     doot = {
diff --git a/modules/i3/i3.nix b/modules/i3/i3.nix
index c96ffc1..dc2b8b3 100644
--- a/modules/i3/i3.nix
+++ b/modules/i3/i3.nix
@@ -21,7 +21,7 @@
       extraPackages = with pkgs; [
         dmenu # application launcher most people use
         i3status # gives you the default i3 status bar
-        xorg.xinit
+        xinit
       ];
     };
   };