Compare commits
	
		
			7 Commits
		
	
	
		
			e1d13065f8
			...
			master
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 9eea820f3b | |||
| 257fab9832 | |||
| a73194fed9 | |||
| 0572cacd28 | |||
| ecf728bc11 | |||
| 5a59f98ebc | |||
| 5ab19d093a | 
							
								
								
									
										49
									
								
								flake.lock
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										49
									
								
								flake.lock
									
									
									
										generated
									
									
									
								
							@@ -64,11 +64,11 @@
 | 
			
		||||
        "zon2nix": "zon2nix"
 | 
			
		||||
      },
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1760808459,
 | 
			
		||||
        "narHash": "sha256-+3ups2SbJ2y2CknaoC8P4IphJDWG/yo5loW01BF7STw=",
 | 
			
		||||
        "lastModified": 1761933492,
 | 
			
		||||
        "narHash": "sha256-DNGhpvYt6dVbkDse4s/L/jJvejvOV0bs+YWfAAskJ7g=",
 | 
			
		||||
        "owner": "ghostty-org",
 | 
			
		||||
        "repo": "ghostty",
 | 
			
		||||
        "rev": "be0da4845cb629bcf1f5f1890a28850bb7adfe16",
 | 
			
		||||
        "rev": "765ee6842930f0d6918574b9b87c2ee6583e4727",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
@@ -142,11 +142,11 @@
 | 
			
		||||
    },
 | 
			
		||||
    "nixpkgs_3": {
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1760580664,
 | 
			
		||||
        "narHash": "sha256-/YdfibIrnqXAL8p5kqCU345mzpHoOtuVIkMiI2pF4Dc=",
 | 
			
		||||
        "lastModified": 1761597516,
 | 
			
		||||
        "narHash": "sha256-wxX7u6D2rpkJLWkZ2E932SIvDJW8+ON/0Yy8+a5vsDU=",
 | 
			
		||||
        "owner": "nixos",
 | 
			
		||||
        "repo": "nixpkgs",
 | 
			
		||||
        "rev": "98ff3f9af2684f6136c24beef08f5e2033fc5389",
 | 
			
		||||
        "rev": "daf6dc47aa4b44791372d6139ab7b25269184d55",
 | 
			
		||||
        "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": 1761964689,
 | 
			
		||||
        "narHash": "sha256-Zo3LQQDz+64EQ9zor/WmeNTFLoZkjmhp0UY3G0D3seE=",
 | 
			
		||||
        "owner": "oxalica",
 | 
			
		||||
        "repo": "rust-overlay",
 | 
			
		||||
        "rev": "63d22578600f70d293aede6bc737efef60ebd97f",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
        "owner": "oxalica",
 | 
			
		||||
        "repo": "rust-overlay",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      }
 | 
			
		||||
    },
 | 
			
		||||
    "systems": {
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										21
									
								
								flake.nix
									
									
									
									
									
								
							
							
						
						
									
										21
									
								
								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
 | 
			
		||||
      #     ];
 | 
			
		||||
 
 | 
			
		||||
@@ -1,6 +1,7 @@
 | 
			
		||||
{...}: {
 | 
			
		||||
{ pkgs, ...}: {
 | 
			
		||||
  programs.atuin = {
 | 
			
		||||
    enable = true;
 | 
			
		||||
    enableFishIntegration = true;
 | 
			
		||||
    package = pkgs.atuinLatest;
 | 
			
		||||
  };
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -40,14 +40,31 @@
 | 
			
		||||
        id = "cjpalhdlnbpafiamejdnhcphjbkeiagm";
 | 
			
		||||
        sha256 = "sha256:0pdh1v0vx1d5vnl1zh7nbk6j1fh4k4hhwp1ljs203icn306lahsn";
 | 
			
		||||
        # sha256 = lib.fakeSha256;
 | 
			
		||||
        version = "1.64.0";
 | 
			
		||||
        version = "1.67.0";
 | 
			
		||||
      })
 | 
			
		||||
      (createChromiumExtension {
 | 
			
		||||
        # bitwarden
 | 
			
		||||
        id = "nngceckbapebfimnlniiiahkandclblb";
 | 
			
		||||
        sha256 = "sha256:0jxk3cqmgd5qj8hnw7s0k5s4bfrcmr0w0rckp3x0bmng07azw4gi";
 | 
			
		||||
        # sha256 = lib.fakeSha256;
 | 
			
		||||
        version = "2025.5.0";
 | 
			
		||||
        version = "2025.10.0";
 | 
			
		||||
      })
 | 
			
		||||
      (createChromiumExtension {
 | 
			
		||||
        # react dev tools
 | 
			
		||||
        id = "fmkadmapgofadopljbjfkapdkoienihi";
 | 
			
		||||
        sha256 = "sha256:01vy0x7hdkj4g3m2l4kw5rwldhhpkcxmd2miy5rj2dzxdnbchw2z";
 | 
			
		||||
        version = "7.0.1";
 | 
			
		||||
      })
 | 
			
		||||
      (createChromiumExtension {
 | 
			
		||||
        # wappalyzer
 | 
			
		||||
        id = "gppongmhjkpfnbhagpmjfkannfbllamg";
 | 
			
		||||
        sha256 = "sha256:1mi1wpm714r8yp0zh0yg6kccnld36rj4xb8j4y0c18y9176vc6wx";
 | 
			
		||||
        version = "6.10.86";
 | 
			
		||||
      })
 | 
			
		||||
      (createChromiumExtension {
 | 
			
		||||
        # obsidian web clipper
 | 
			
		||||
        id = "cnjifjpddelmedmihgijeibhnjfabmlf";
 | 
			
		||||
        sha256 = "sha256:0bp6g63g9hk2xbq054lpf5hzwmn73jzh3hswyjfp9r7yqj83mzgy";
 | 
			
		||||
        version = "0.12.0";
 | 
			
		||||
      })
 | 
			
		||||
    ];
 | 
			
		||||
  };
 | 
			
		||||
 
 | 
			
		||||
@@ -27,6 +27,7 @@ in {
 | 
			
		||||
    ./browser.nix
 | 
			
		||||
    ./zellij.nix
 | 
			
		||||
    ./bat.nix
 | 
			
		||||
    ./lazygit.nix
 | 
			
		||||
  ];
 | 
			
		||||
 | 
			
		||||
  # Home Manager needs a bit of information about you and the
 | 
			
		||||
 
 | 
			
		||||
@@ -1,6 +1,7 @@
 | 
			
		||||
{...}: {
 | 
			
		||||
{ pkgs, ... }: {
 | 
			
		||||
  programs.lazygit = {
 | 
			
		||||
    enable = true;
 | 
			
		||||
    package = pkgs.lazygitLatest;
 | 
			
		||||
 | 
			
		||||
    settings = {
 | 
			
		||||
      gui.theme = {
 | 
			
		||||
 
 | 
			
		||||
@@ -1,5 +1,4 @@
 | 
			
		||||
{
 | 
			
		||||
  lib,
 | 
			
		||||
  pkgs,
 | 
			
		||||
  ...
 | 
			
		||||
}: {
 | 
			
		||||
@@ -14,7 +13,6 @@
 | 
			
		||||
 | 
			
		||||
    # utils
 | 
			
		||||
    tmux
 | 
			
		||||
    lazygit
 | 
			
		||||
    bottom
 | 
			
		||||
    ripgrep
 | 
			
		||||
    jq
 | 
			
		||||
 
 | 
			
		||||
@@ -8,6 +8,9 @@
 | 
			
		||||
 | 
			
		||||
  # Allow unfree packages
 | 
			
		||||
  nixpkgs.config.allowUnfree = true;
 | 
			
		||||
  nixpkgs.config.permittedInsecurePackages = [
 | 
			
		||||
    "mbedtls-2.28.10"
 | 
			
		||||
  ];
 | 
			
		||||
 | 
			
		||||
  nix.package = pkgs.nix;
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -1,12 +1,9 @@
 | 
			
		||||
{
 | 
			
		||||
  pkgs,
 | 
			
		||||
  lib,
 | 
			
		||||
  ...
 | 
			
		||||
}: {
 | 
			
		||||
{ ... }: {
 | 
			
		||||
  imports = [
 | 
			
		||||
    ./core.nix
 | 
			
		||||
    ./environment.nix
 | 
			
		||||
    ./fonts.nix
 | 
			
		||||
    # ./overlays.nix
 | 
			
		||||
    ./users.nix
 | 
			
		||||
  ];
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										50
									
								
								modules/common/overlays.nix
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										50
									
								
								modules/common/overlays.nix
									
									
									
									
									
										Normal file
									
								
							@@ -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"
 | 
			
		||||
    '';
 | 
			
		||||
  });
 | 
			
		||||
}
 | 
			
		||||
		Reference in New Issue
	
	Block a user