added ldflags to lazygit override

working rust package override
plus flake update :P
2025-10-23 10:36:27 -04:00 · 2025-10-22 19:45:10 -04:00 · 2025-10-22 08:19:52 -04:00 · 2025-10-21 08:33:25 -04:00 · 2025-10-18 20:31:32 -04:00 · 2025-10-18 20:31:22 -04:00
11 changed files with 146 additions and 30 deletions
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1757432263,
-        "narHash": "sha256-qHn+/0+IOz5cG68BZUwL9BV3EO/e9eNKCjH3+N7wMdI=",
+        "lastModified": 1759509947,
+        "narHash": "sha256-4XifSIHfpJKcCf5bZZRhj8C4aCpjNBaE3kXr02s4rHU=",
        "owner": "lnl7",
        "repo": "nix-darwin",
-        "rev": "1fef4404de4d1596aa5ab2bd68078370e1b9dcdb",
+        "rev": "000eadb231812ad6ea6aebd7526974aaf4e79355",
        "type": "github"
      },
      "original": {
@@ -64,11 +64,11 @@
        "zon2nix": "zon2nix"
      },
      "locked": {
-        "lastModified": 1759330332,
-        "narHash": "sha256-ZKyOgOOm9Itjbc5xi89xMtw+cnnOFfl79zndPMTzKpU=",
+        "lastModified": 1761172581,
+        "narHash": "sha256-uX8FzMlRt15kvs4pPuOHZeQe1wztQXTEWOVtB2EwmB0=",
        "owner": "ghostty-org",
        "repo": "ghostty",
-        "rev": "a5aff0e347b0016e2735d4ec4b4cdca96b5438d1",
+        "rev": "bdbda2fd8380b440508246bcda0bf1198f6666e4",
        "type": "github"
      },
      "original": {
@@ -116,15 +116,15 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1748189127,
-        "narHash": "sha256-zRDR+EbbeObu4V2X5QCd2Bk5eltfDlCr5yvhBwUT6pY=",
-        "rev": "7c43f080a7f28b2774f3b3f43234ca11661bf334",
+        "lastModified": 315532800,
+        "narHash": "sha256-sV6pJNzFkiPc6j9Bi9JuHBnWdVhtKB/mHgVmMPvDFlk=",
+        "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,
-        "narHash": "sha256-FIBE1qXv9TKvSNwst6FumyHwCRH3BlWDpfsnqRDCll0=",
+        "lastModified": 1761016216,
+        "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,
-        "narHash": "sha256-3i0IL3s18hdDlbsf0/E+5kyPRkZwGPbSFngq5eToiAA=",
+        "lastModified": 1760401936,
+        "narHash": "sha256-/zj5GYO5PKhBWGzbHbqT+ehY8EghuABdQ2WGfCwZpCQ=",
        "owner": "mitchellh",
        "repo": "zig-overlay",
-        "rev": "aafb1b093fb838f7a02613b719e85ec912914221",
+        "rev": "365085b6652259753b598d43b723858184980bbe",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/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
      #     ];
--- a/home/atuin.nix
+++ b/home/atuin.nix
@@ -1,6 +1,7 @@
-{...}: {
+{ pkgs, ...}: {
  programs.atuin = {
    enable = true;
    enableFishIntegration = true;
+    package = pkgs.atuinLatest;
  };
 }
--- a/home/default.nix
+++ b/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
--- a/home/lazygit.nix
+++ b/home/lazygit.nix
@@ -1,6 +1,7 @@
-{...}: {
+{ pkgs, ... }: {
  programs.lazygit = {
    enable = true;
+    package = pkgs.lazygitLatest;

    settings = {
      gui.theme = {
--- a/home/packages/common.nix
+++ b/home/packages/common.nix
@@ -1,5 +1,4 @@
 {
-  lib,
  pkgs,
  ...
 }: {
@@ -14,7 +13,6 @@

    # utils
    tmux
-    lazygit
    bottom
    ripgrep
    jq
--- a/modules/common/core.nix
+++ b/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;

--- a/modules/common/default.nix
+++ b/modules/common/default.nix
@@ -1,12 +1,9 @@
-{
-  pkgs,
-  lib,
-  ...
-}: {
+{ ... }: {
  imports = [
    ./core.nix
    ./environment.nix
    ./fonts.nix
+    # ./overlays.nix
    ./users.nix
  ];
 }
--- a/modules/common/overlays.nix
+++ b/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"
+    '';
+  });
+}
--- a/modules/machine/cloud/configuration.nix
+++ b/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
--- a/modules/sound/shairport.nix
+++ b/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 pa";
+    # arguments = "-v -o pa";
+  };
+
+  systemd.services.shairport-sync = {
+    serviceConfig = {
+      User = lib.mkForce "${userName}";
+    };
+    environment = {
+      XDG_RUNTIME_DIR = "/run/user/1000";
+    };
  };
 }
Author	SHA1	Message	Date
Wyatt J. Miller	0572cacd28	added ldflags to lazygit override	2025-10-23 10:36:27 -04:00
Wyatt J. Miller	ecf728bc11	working rust package override plus flake update :P	2025-10-22 19:45:10 -04:00
Wyatt J. Miller	5a59f98ebc	working overlay to get latest version of lazygit	2025-10-22 08:19:52 -04:00
Wyatt J. Miller	5ab19d093a	testing	2025-10-21 08:33:25 -04:00
Wyatt J. Miller	569141d227	flake update	2025-10-18 20:31:32 -04:00
Wyatt J. Miller	48edbfdc4b	shairport service working systemd service works now ig	2025-10-18 20:31:22 -04:00