stuff IDK

system/inputMethods.nix

@@ -1,37 +1,26 @@
 { config, lib, pkgs, systemName, ... }:
 
 {
-  console.keyMap = "ie";
+  # Set console keymap based on systemName
+  console.keyMap = if systemName == "laptop" then "ie" else "us";
 
-  i18n = lib.mkMerge [
-    (lib.mkIf (systemName == "laptop") {
-      defaultLocale = "en_IE.UTF-8";
-      extraLocaleSettings = {
-        LC_ADDRESS = "en_IE.UTF-8";
-        LC_IDENTIFICATION = "en_IE.UTF-8";
-        LC_MEASUREMENT = "en_IE.UTF-8";
-        LC_MONETARY = "en_IE.UTF-8";
-        LC_NAME = "en_IE.UTF-8";
-        LC_NUMERIC = "en_IE.UTF-8";
-        LC_PAPER = "en_IE.UTF-8";
-        LC_TELEPHONE = "en_IE.UTF-8";
-        LC_TIME = "en_IE.UTF-8";
-      };
-    })
+  # Locale settings
+  i18n.defaultLocale =
+    if systemName == "laptop"
+    then "en_IE.UTF-8"
+    else "en_US.UTF-8";
 
-    (lib.mkIf (systemName == "pc") {
-      defaultLocale = "en_US.UTF-8";
-      extraLocaleSettings = {
-        LC_ADDRESS = "en_US.UTF-8";
-        LC_IDENTIFICATION = "en_US.UTF-8";
-        LC_MEASUREMENT = "en_US.UTF-8";
-        LC_MONETARY = "en_US.UTF-8";
-        LC_NAME = "en_US.UTF-8";
-        LC_NUMERIC = "en_US.UTF-8";
-        LC_PAPER = "en_US.UTF-8";
-        LC_TELEPHONE = "en_US.UTF-8";
-        LC_TIME = "en_US.UTF-8";
-      };
-    })
-  ];
+  i18n.extraLocaleSettings = let
+    locale = if systemName == "laptop" then "en_IE.UTF-8" else "en_US.UTF-8";
+  in {
+    LC_ADDRESS = locale;
+    LC_IDENTIFICATION = locale;
+    LC_MEASUREMENT = locale;
+    LC_MONETARY = locale;
+    LC_NAME = locale;
+    LC_NUMERIC = locale;
+    LC_PAPER = locale;
+    LC_TELEPHONE = locale;
+    LC_TIME = locale;
+  };
 }

system/nixOSPkgs.nix

@@ -131,6 +131,7 @@ in
     nix-ld = {
       enable = true;
       libraries = with pkgs; [
+        gcc15.cc.lib
         # add libraries here if needed
         # alsa-lib
         # libGL
@@ -194,7 +195,7 @@ in
 
     # --- Development toolchains ---
     cmake
-    gcc
+    gcc15
     gnumake
     jdk11
     ladspaPlugins