added ldflags to lazygit override

plus flake update :P

defaults/sway/config

@@ -13,9 +13,9 @@ set $term alacritty
 set $menu wofi --term '$term'
 
 ### Output configuration
-output DP-3 pos 3840 0 res 1920x1080@59Hz
+output DP-3 pos 1920 0 res 1920x1080@60Hz
-output HDMI-A-1 pos 0 0 res 1920x1080@59Hz
+output HDMI-A-1 pos 0 0 res 1920x1080@60Hz
-output DP-2 pos 1920 0 res 1920x1080@60Hz
+output DP-2 pos 3840 0 res 1920x1080@60Hz
 
 ### Wallpaper
 output HDMI-A-1 bg ~/.wallpaper/.wallpaper.png fill
@@ -25,19 +25,19 @@ output DP-3 bg ~/.wallpaper/.wallpaper.png fill
 ### Workspace binding
 
 ## DP-3 bindings
-workspace 1 output DP-2
+workspace 1 output DP-3
-workspace 2 output DP-2
+workspace 2 output DP-3
-workspace 4 output DP-2
+workspace 4 output DP-3
-workspace 5 output DP-2
+workspace 5 output DP-3
 
 ## HDMI-A-1 bindings
 workspace 3 output HDMI-A-1
 workspace 9 output HDMI-A-1
 
 ## DP-2 bindings
-workspace 6 output DP-3
+workspace 6 output DP-2
-workspace 7 output DP-3
+workspace 7 output DP-2
-workspace 8 output DP-3
+workspace 8 output DP-2
 
 ### Colour options
 set $bg 	       #24283b

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1757432263,
+        "lastModified": 1759509947,
-        "narHash": "sha256-qHn+/0+IOz5cG68BZUwL9BV3EO/e9eNKCjH3+N7wMdI=",
+        "narHash": "sha256-4XifSIHfpJKcCf5bZZRhj8C4aCpjNBaE3kXr02s4rHU=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "1fef4404de4d1596aa5ab2bd68078370e1b9dcdb",
+        "rev": "000eadb231812ad6ea6aebd7526974aaf4e79355",
         "type": "github"
       },
       "original": {
@@ -64,11 +64,11 @@
         "zon2nix": "zon2nix"
       },
       "locked": {
-        "lastModified": 1759330332,
+        "lastModified": 1761172581,
-        "narHash": "sha256-ZKyOgOOm9Itjbc5xi89xMtw+cnnOFfl79zndPMTzKpU=",
+        "narHash": "sha256-uX8FzMlRt15kvs4pPuOHZeQe1wztQXTEWOVtB2EwmB0=",
         "owner": "ghostty-org",
         "repo": "ghostty",
-        "rev": "a5aff0e347b0016e2735d4ec4b4cdca96b5438d1",
+        "rev": "bdbda2fd8380b440508246bcda0bf1198f6666e4",
         "type": "github"
       },
       "original": {
@@ -116,15 +116,15 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1748189127,
+        "lastModified": 315532800,
-        "narHash": "sha256-zRDR+EbbeObu4V2X5QCd2Bk5eltfDlCr5yvhBwUT6pY=",
+        "narHash": "sha256-sV6pJNzFkiPc6j9Bi9JuHBnWdVhtKB/mHgVmMPvDFlk=",
-        "rev": "7c43f080a7f28b2774f3b3f43234ca11661bf334",
+        "rev": "82c2e0d6dde50b17ae366d2aa36f224dc19af469",
         "type": "tarball",
-        "url": "https://releases.nixos.org/nixos/25.05/nixos-25.05.802491.7c43f080a7f2/nixexprs.tar.xz"
+        "url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.11pre877938.82c2e0d6dde5/nixexprs.tar.xz"
       },
       "original": {
         "type": "tarball",
-        "url": "https://channels.nixos.org/nixos-25.05/nixexprs.tar.xz"
+        "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz"
       }
     },
     "nixpkgs_2": {
@@ -142,11 +142,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1759281824,
+        "lastModified": 1761016216,
-        "narHash": "sha256-FIBE1qXv9TKvSNwst6FumyHwCRH3BlWDpfsnqRDCll0=",
+        "narHash": "sha256-G/iC4t/9j/52i/nm+0/4ybBmAF4hzR8CNHC75qEhjHo=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "5b5be50345d4113d04ba58c444348849f5585b4a",
+        "rev": "481cf557888e05d3128a76f14c76397b7d7cc869",
         "type": "github"
       },
       "original": {
@@ -156,13 +156,48 @@
         "type": "github"
       }
     },
+    "nixpkgs_4": {
+      "locked": {
+        "lastModified": 1744536153,
+        "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "darwin": "darwin",
         "ghostty": "ghostty",
         "home-manager": "home-manager",
         "nix-flatpak": "nix-flatpak",
-        "nixpkgs": "nixpkgs_3"
+        "nixpkgs": "nixpkgs_3",
+        "rust-overlay": "rust-overlay"
+      }
+    },
+    "rust-overlay": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_4"
+      },
+      "locked": {
+        "lastModified": 1761100675,
+        "narHash": "sha256-LX3TCDBeNpCWTDXtGyRASVcLmRPChSli34bgHnZ1DCw=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "72161c6c53f6e3f8dadaf54b2204a5094c6a16ae",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
       }
     },
     "systems": {
@@ -196,11 +231,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1748261582,
+        "lastModified": 1760401936,
-        "narHash": "sha256-3i0IL3s18hdDlbsf0/E+5kyPRkZwGPbSFngq5eToiAA=",
+        "narHash": "sha256-/zj5GYO5PKhBWGzbHbqT+ehY8EghuABdQ2WGfCwZpCQ=",
         "owner": "mitchellh",
         "repo": "zig-overlay",
-        "rev": "aafb1b093fb838f7a02613b719e85ec912914221",
+        "rev": "365085b6652259753b598d43b723858184980bbe",
         "type": "github"
       },
       "original": {

flake.nix

@@ -12,6 +12,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     ghostty.url = "github:ghostty-org/ghostty";
+    rust-overlay.url = "github:oxalica/rust-overlay";
   };
 
   outputs = inputs @ {
@@ -21,6 +22,7 @@
     darwin,
     home-manager,
     ghostty,
+    rust-overlay,
     ...
   }: let
     userName = "wyatt";
@@ -28,9 +30,20 @@
     extraSpecialArgs = {
       inherit userName userEmail ghostty;
     };
+
+    myOverlays = { ... }: {
+      nixpkgs.overlays = [
+        rust-overlay.overlays.default
+        self.common.overlays
+      ];
+    };
   in {
     meta = import ./meta;
 
+    common = {
+      overlays = import ./modules/common/overlays.nix;
+    };
+
     # Primary laptop - MacBook Pro (2023, M3)
     darwinConfigurations."sephiroth" = darwin.lib.darwinSystem {
       system = "aarch64-darwin";
@@ -40,6 +53,7 @@
         role = "devel";
       };
       modules = [
+        myOverlays
         ./modules/common
         ./modules/machine/sephiroth
 
@@ -48,6 +62,7 @@
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
           home-manager.extraSpecialArgs = extraSpecialArgs;
+          home-manager.backupFileExtension = "bak";
           home-manager.users.${userName} = import ./home;
         }
       ];
@@ -62,6 +77,7 @@
         role = "devel";
       };
       modules = [
+        myOverlays
         nix-flatpak.nixosModules.nix-flatpak
         ./modules/common
         ./modules/machine/cloud
@@ -71,6 +87,7 @@
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
           home-manager.extraSpecialArgs = extraSpecialArgs;
+          home-manager.backupFileExtension = "bak";
           home-manager.users.${userName}.imports = [
             ./home
           ];
@@ -87,6 +104,7 @@
         role = "server";
       };
       modules = [
+        myOverlays
         ./modules/common
         ./modules/machine/valefor
 
@@ -95,6 +113,7 @@
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
           home-manager.extraSpecialArgs = extraSpecialArgs;
+          home-manager.backupFileExtension = "bak";
           home-manager.users.${userName}.imports = [
             ./home
           ];
@@ -111,6 +130,7 @@
         role = "server";
       };
       # modules = [
+      #   myOverlays
       #   nix-flatpak.nixosModules.nix-flatpak
       #   nix-ld.nixosModules.nix-ld
       #   ./modules/nixos/hardware-configuration.nix
@@ -123,6 +143,7 @@
       #     home-manager.useGlobalPkgs = true;
       #     home-manager.useUserPackages = true;
       #     home-manager.extraSpecialArgs = extraSpecialArgs;
+      #     home-manager.backupFileExtension = "bak";
       #     home-manager.users.${userName}.imports = [
       #       ./home
       #     ];

home/atuin.nix

@@ -1,6 +1,7 @@
-{...}: {
+{ pkgs, ...}: {
   programs.atuin = {
     enable = true;
     enableFishIntegration = true;
+    package = pkgs.atuinLatest;
   };
 }

home/default.nix

@@ -27,6 +27,7 @@ in {
     ./browser.nix
     ./zellij.nix
     ./bat.nix
+    ./lazygit.nix
   ];
 
   # Home Manager needs a bit of information about you and the

home/lazygit.nix

@@ -1,6 +1,7 @@
-{...}: {
+{ pkgs, ... }: {
   programs.lazygit = {
     enable = true;
+    package = pkgs.lazygitLatest;
 
     settings = {
       gui.theme = {

home/packages/common.nix

@@ -1,5 +1,4 @@
 {
-  lib,
   pkgs,
   ...
 }: {
@@ -14,7 +13,6 @@
 
     # utils
     tmux
-    lazygit
     bottom
     ripgrep
     jq

home/shell.nix

@@ -1,4 +1,4 @@
-{pkgs, ...}: {
+{pkgs, lib, ...}: {
   programs.fish = {
     enable = true;
     # initExtra = ''
@@ -52,6 +52,27 @@
         '';
         onEvent = "fish_greeting";
       };
+    } // lib.optionalAttrs pkgs.stdenv.isLinux {
+      block = {
+        body = ''
+          systemd-inhibit --what=sleep --who="$USER" --why="manual invocation" --mode=block sleep infinity &
+          set -g INHIBIT_PID $last_pid
+          echo "Sleep inhibited. PID: $INHIBIT_PID"
+        '';
+      };
+
+      unblock = {
+        body = ''
+          if set -q INHIBIT_PID
+            kill $INHIBIT_PID 2>/dev/null
+            and echo "Sleep inhibitor removed. PID: $INHIBIT_PID"
+            or echo "Failed to kill process or already terminated."
+            set -e INHIBIT_PID
+          else
+            echo "No active sleep inhibitor found."
+          end
+        '';
+      };
     };
   };
 

modules/common/core.nix

@@ -8,6 +8,9 @@
 
   # Allow unfree packages
   nixpkgs.config.allowUnfree = true;
+  nixpkgs.config.permittedInsecurePackages = [
+    "mbedtls-2.28.10"
+  ];
 
   nix.package = pkgs.nix;
 

modules/common/default.nix

@@ -1,12 +1,9 @@
-{
+{ ... }: {
-  pkgs,
-  lib,
-  ...
-}: {
   imports = [
     ./core.nix
     ./environment.nix
     ./fonts.nix
+    # ./overlays.nix
     ./users.nix
   ];
 }

modules/common/overlays.nix

@@ -0,0 +1,50 @@
+final: prev: let
+  rust_1_90_0 = prev.rust-bin.stable."1.90.0".default;
+  myRustPlatform = prev.makeRustPlatform {
+    cargo = rust_1_90_0;
+    rustc = rust_1_90_0;
+  };
+in {
+  lazygitLatest = prev.lazygit.overrideAttrs (_: rec {
+    version = "0.55.1";
+    src = prev.fetchFromGitHub {
+      owner = "jesseduffield";
+      repo = "lazygit";
+      rev = "v${version}";
+      hash = "sha256-UofhgILZhVXnYiGpb25m4Ct4sbu5pRmjVgj3oEf5Uyk=";
+    };
+    vendorHash = null;
+    subPackages = [ "." ];
+    ldflags = [
+      "-X main.version=${version}"
+      "-X main.buildSource=nix"
+    ];
+  });
+
+  atuinLatest = (prev.atuin.override {
+    rustPlatform = myRustPlatform;
+  }).overrideAttrs (oldAttrs: rec {
+    version = "18.10.0";
+
+    src = prev.fetchFromGitHub {
+      owner = "atuinsh";
+      repo = "atuin";
+      rev = "v${version}";
+      hash = "sha256-bfSa3RtVXxHt3usDqqpE/oXKKDUZOrf+tD9uL59fr6M=";
+    };
+
+    cargoDeps = myRustPlatform.fetchCargoVendor {
+      # name = "atuin-${version}-vendor.tar.gz";
+      inherit src;
+      hash = "sha256-67ffivZVCly1GWA3fJ9mT8nGv2EGd6eCthbaIu/IW3M=";
+    };
+
+    preCheck = (oldAttrs.preCheck or "") + ''
+      export HOME="$TMPDIR"
+      export XDG_CONFIG_HOME="$TMPDIR/.config"
+      export XDG_DATA_HOME="$TMPDIR/.local/share"
+      export XDG_STATE_HOME="$TMPDIR/.local/state"
+      mkdir -p "$XDG_CONFIG_HOME" "$XDG_DATA_HOME" "$XDG_STATE_HOME"
+    '';
+  });
+}

modules/machine/cloud/configuration.nix

@@ -18,7 +18,7 @@
 in {
   imports = [
     (import ../../apps/flatpak.nix {
-      inherit lib pkgs flatpakPackages;
+      inherit lib pkgs flatpakPackages userName;
     })
     ../../apps/gaming.nix
     ../../apps/appimage.nix

modules/machine/cloud/hardware-configuration.nix

@@ -12,24 +12,24 @@
     (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
-  boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod"];
+  boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "thunderbolt" "ahci" "usb_storage" "usbhid" "sd_mod"];
   boot.initrd.kernelModules = [];
   boot.kernelModules = ["kvm-amd"];
   boot.extraModulePackages = [];
 
   fileSystems."/" = {
-    device = "/dev/disk/by-label/COMPUTER";
+    device = "/dev/disk/by-uuid/f8f39aae-61d2-437d-a8e1-01066bbb3c5c";
     fsType = "xfs";
   };
 
   fileSystems."/boot" = {
-    device = "/dev/disk/by-label/BOOT";
+    device = "/dev/disk/by-uuid/B72F-087F";
     fsType = "vfat";
     options = ["fmask=0022" "dmask=0022"];
   };
 
   swapDevices = [
-    {device = "/dev/disk/by-label/SWAP";}
+    {device = "/dev/disk/by-uuid/6d6bcc02-20a9-4ae8-9c1e-5124fb2b2634";}
   ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking

modules/sound/shairport.nix

@@ -1,7 +1,16 @@
-{pkgs, ...}: {
+{ lib, pkgs, userName, ...}: {
   services.shairport-sync = {
     enable = pkgs.stdenv.isLinux;
     openFirewall = pkgs.stdenv.isLinux;
-    arguments = "-v -o pw";
+    # arguments = "-v -o pa";
+  };
+
+  systemd.services.shairport-sync = {
+    serviceConfig = {
+      User = lib.mkForce "${userName}";
+    };
+    environment = {
+      XDG_RUNTIME_DIR = "/run/user/1000";
+    };
   };
 }