diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index af08440..7b11ade 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -7,6 +7,7 @@
   pkgs,
   unstable,
   inputs,
+  nix-your-shell,
   ...
 }:
 
@@ -15,6 +16,10 @@
 # in
 
 {
+  nixpkgs.overlays = [
+    nix-your-shell.overlays.default
+  ];
+
   nix.settings.experimental-features = [
     "nix-command"
     "flakes"
@@ -46,19 +51,24 @@
   # Set your time zone.
   time.timeZone = "Australia/Melbourne";
 
-  # Select internationalisation properties.
-  i18n.defaultLocale = "en_GB.UTF-8";
+  i18n = {
 
-  i18n.extraLocaleSettings = {
-    LC_ADDRESS = "en_AU.UTF-8";
-    LC_IDENTIFICATION = "en_AU.UTF-8";
-    LC_MEASUREMENT = "en_AU.UTF-8";
-    LC_MONETARY = "en_AU.UTF-8";
-    LC_NAME = "en_AU.UTF-8";
-    LC_NUMERIC = "en_AU.UTF-8";
-    LC_PAPER = "en_AU.UTF-8";
-    LC_TELEPHONE = "en_AU.UTF-8";
-    LC_TIME = "en_AU.UTF-8";
+  # Select internationalisation properties.
+    defaultLocale = "C.UTF-8";
+
+    extraLocaleSettings = {
+      LC_ADDRESS = "C.UTF-8";
+      LC_IDENTIFICATION = "C.UTF-8";
+      LC_MEASUREMENT = "C.UTF-8";
+      LC_MONETARY = "C.UTF-8";
+      LC_NAME = "C.UTF-8";
+      LC_NUMERIC = "C.UTF-8";
+      LC_PAPER = "C.UTF-8";
+      LC_TELEPHONE = "C.UTF-8";
+      LC_TIME = "C.UTF-8";
+    };
+
+    supportedLocales = [ "all" ];
   };
 
   # Enable the X11 windowing system.
@@ -113,6 +123,7 @@
     extraGroups = [
       "networkmanager"
       "wheel"
+      "video"
       "docker"
       "openrazer"
       "gamemode"
@@ -137,7 +148,18 @@
 
   programs.firefox.enable = true;
   programs.thunderbird.enable = true;
-  programs.fish.enable = true;
+  programs.fish = {
+    enable = true;
+    interactiveShellInit = ''
+      nix-your-shell fish | source
+    '';
+  };
+
+
+  programs.gpu-screen-recorder = {
+    enable = true;
+    package = unstable.gpu-screen-recorder;
+  };
 
   programs.corectrl = {
     enable = true;
@@ -178,13 +200,11 @@
       #  wget
       fzf
       nixfmt-rfc-style
-      dwarfs
+      unstable.dwarfs
       unrar
       mpv
-
-      wineWowPackages.stable
-      winetricks
-      steamtinkerlaunch
+      unstable.waypipe
+      unstable.nix-your-shell
 
       amdgpu_top
       mangohud
@@ -211,6 +231,7 @@
       maven
       gradle
       gcc
+      dotnetCorePackages.sdk_8_0_3xx
 
       # noisetorch
       # yad
@@ -239,7 +260,6 @@
     libxkbcommon
     dbus
     libpulseaudio
-    dotnetCorePackages.dotnet_8.sdk
     dotnetCorePackages.sdk_8_0_3xx
     alsa-lib
     icu
diff --git a/nixos/flake.lock b/nixos/flake.lock
index 5cfd568..2435a5e 100644
--- a/nixos/flake.lock
+++ b/nixos/flake.lock
@@ -1,5 +1,21 @@
 {
   "nodes": {
+    "advisory-db": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1710515894,
+        "narHash": "sha256-tmQ9TMCb2jZY3jYdf53qIberkYV3dnUzdAYYK/NB+No=",
+        "owner": "rustsec",
+        "repo": "advisory-db",
+        "rev": "369d98c1b95b7b56d0859605916d7b81a7d1f1c4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "rustsec",
+        "repo": "advisory-db",
+        "type": "github"
+      }
+    },
     "cpu-microcodes": {
       "flake": false,
       "locked": {
@@ -17,6 +33,27 @@
         "type": "github"
       }
     },
+    "crane": {
+      "inputs": {
+        "nixpkgs": [
+          "nix-your-shell",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1710886643,
+        "narHash": "sha256-saTZuv9YeZ9COHPuj8oedGdUwJZcbQ3vyRqe7NVJMsQ=",
+        "owner": "ipetkov",
+        "repo": "crane",
+        "rev": "5bace74e9a65165c918205cf67ad3977fe79c584",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ipetkov",
+        "repo": "crane",
+        "type": "github"
+      }
+    },
     "home-manger": {
       "inputs": {
         "nixpkgs": [
@@ -24,11 +61,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1742996658,
-        "narHash": "sha256-snxgTLVq6ooaD3W3mPHu7LVWpoZKczhxHAUZy2ea4oA=",
+        "lastModified": 1743136572,
+        "narHash": "sha256-uwaVrKgi6g1TUq56247j6QvvFtYHloCkjCrEpGBvV54=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "693840c01b9bef9e54100239cef937e53d4661bf",
+        "rev": "1efd2503172016a6742c87b47b43ca2c8145607d",
         "type": "github"
       },
       "original": {
@@ -37,13 +74,36 @@
         "type": "github"
       }
     },
+    "nix-your-shell": {
+      "inputs": {
+        "advisory-db": "advisory-db",
+        "crane": "crane",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1727198502,
+        "narHash": "sha256-FjGjLq/4qeZz9foA7pfz1hiXvsdmbnzB3BpiTESLE1c=",
+        "owner": "MercuryTechnologies",
+        "repo": "nix-your-shell",
+        "rev": "04dc6379eab87c128f2eca3f2238f533a95604b3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "MercuryTechnologies",
+        "repo": "nix-your-shell",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1742751704,
-        "narHash": "sha256-rBfc+H1dDBUQ2mgVITMGBPI1PGuCznf9rcWX/XIULyE=",
+        "lastModified": 1742937945,
+        "narHash": "sha256-lWc+79eZRyvHp/SqMhHTMzZVhpxkRvthsP1Qx6UCq0E=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "f0946fa5f1fb876a9dc2e1850d9d3a4e3f914092",
+        "rev": "d02d88f8de5b882ccdde0465d8fa2db3aa1169f7",
         "type": "github"
       },
       "original": {
@@ -56,11 +116,27 @@
     "root": {
       "inputs": {
         "home-manger": "home-manger",
+        "nix-your-shell": "nix-your-shell",
         "nixpkgs": "nixpkgs",
         "ucodenix": "ucodenix",
         "unstable": "unstable"
       }
     },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "ucodenix": {
       "inputs": {
         "cpu-microcodes": "cpu-microcodes"
@@ -81,11 +157,11 @@
     },
     "unstable": {
       "locked": {
-        "lastModified": 1742889210,
-        "narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=",
+        "lastModified": 1743095683,
+        "narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "698214a32beb4f4c8e3942372c694f40848b360d",
+        "rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6",
         "type": "github"
       },
       "original": {
diff --git a/nixos/flake.nix b/nixos/flake.nix
index e21ffc5..e210adc 100644
--- a/nixos/flake.nix
+++ b/nixos/flake.nix
@@ -10,12 +10,19 @@
 
     # CPU microcode updater
     ucodenix.url = "github:e-tho/ucodenix";
+
+    nix-your-shell = {
+      url = "github:MercuryTechnologies/nix-your-shell";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
   };
 
   outputs =
     {
       nixpkgs,
       unstable,
+      nix-your-shell,
       ...
     }@inputs:
     let
@@ -35,6 +42,8 @@
             inherit system;
             config.allowUnfree = true;
           };
+
+          inherit nix-your-shell;
         };
         modules = [
           ./configuration.nix