Compare commits
	
		
			1 Commits
		
	
	
		
			nix-overri
			...
			e1d13065f8
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| e1d13065f8 | 
							
								
								
									
										49
									
								
								flake.lock
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										49
									
								
								flake.lock
									
									
									
										generated
									
									
									
								
							@@ -64,11 +64,11 @@
 | 
			
		||||
        "zon2nix": "zon2nix"
 | 
			
		||||
      },
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1761172581,
 | 
			
		||||
        "narHash": "sha256-uX8FzMlRt15kvs4pPuOHZeQe1wztQXTEWOVtB2EwmB0=",
 | 
			
		||||
        "lastModified": 1760808459,
 | 
			
		||||
        "narHash": "sha256-+3ups2SbJ2y2CknaoC8P4IphJDWG/yo5loW01BF7STw=",
 | 
			
		||||
        "owner": "ghostty-org",
 | 
			
		||||
        "repo": "ghostty",
 | 
			
		||||
        "rev": "bdbda2fd8380b440508246bcda0bf1198f6666e4",
 | 
			
		||||
        "rev": "be0da4845cb629bcf1f5f1890a28850bb7adfe16",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
@@ -142,11 +142,11 @@
 | 
			
		||||
    },
 | 
			
		||||
    "nixpkgs_3": {
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1761016216,
 | 
			
		||||
        "narHash": "sha256-G/iC4t/9j/52i/nm+0/4ybBmAF4hzR8CNHC75qEhjHo=",
 | 
			
		||||
        "lastModified": 1760580664,
 | 
			
		||||
        "narHash": "sha256-/YdfibIrnqXAL8p5kqCU345mzpHoOtuVIkMiI2pF4Dc=",
 | 
			
		||||
        "owner": "nixos",
 | 
			
		||||
        "repo": "nixpkgs",
 | 
			
		||||
        "rev": "481cf557888e05d3128a76f14c76397b7d7cc869",
 | 
			
		||||
        "rev": "98ff3f9af2684f6136c24beef08f5e2033fc5389",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
@@ -156,48 +156,13 @@
 | 
			
		||||
        "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",
 | 
			
		||||
        "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"
 | 
			
		||||
        "nixpkgs": "nixpkgs_3"
 | 
			
		||||
      }
 | 
			
		||||
    },
 | 
			
		||||
    "systems": {
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										21
									
								
								flake.nix
									
									
									
									
									
								
							
							
						
						
									
										21
									
								
								flake.nix
									
									
									
									
									
								
							@@ -12,7 +12,6 @@
 | 
			
		||||
      inputs.nixpkgs.follows = "nixpkgs";
 | 
			
		||||
    };
 | 
			
		||||
    ghostty.url = "github:ghostty-org/ghostty";
 | 
			
		||||
    rust-overlay.url = "github:oxalica/rust-overlay";
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
  outputs = inputs @ {
 | 
			
		||||
@@ -22,7 +21,6 @@
 | 
			
		||||
    darwin,
 | 
			
		||||
    home-manager,
 | 
			
		||||
    ghostty,
 | 
			
		||||
    rust-overlay,
 | 
			
		||||
    ...
 | 
			
		||||
  }: let
 | 
			
		||||
    userName = "wyatt";
 | 
			
		||||
@@ -30,20 +28,9 @@
 | 
			
		||||
    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";
 | 
			
		||||
@@ -53,7 +40,6 @@
 | 
			
		||||
        role = "devel";
 | 
			
		||||
      };
 | 
			
		||||
      modules = [
 | 
			
		||||
        myOverlays
 | 
			
		||||
        ./modules/common
 | 
			
		||||
        ./modules/machine/sephiroth
 | 
			
		||||
 | 
			
		||||
@@ -62,7 +48,6 @@
 | 
			
		||||
          home-manager.useGlobalPkgs = true;
 | 
			
		||||
          home-manager.useUserPackages = true;
 | 
			
		||||
          home-manager.extraSpecialArgs = extraSpecialArgs;
 | 
			
		||||
          home-manager.backupFileExtension = "bak";
 | 
			
		||||
          home-manager.users.${userName} = import ./home;
 | 
			
		||||
        }
 | 
			
		||||
      ];
 | 
			
		||||
@@ -77,7 +62,6 @@
 | 
			
		||||
        role = "devel";
 | 
			
		||||
      };
 | 
			
		||||
      modules = [
 | 
			
		||||
        myOverlays
 | 
			
		||||
        nix-flatpak.nixosModules.nix-flatpak
 | 
			
		||||
        ./modules/common
 | 
			
		||||
        ./modules/machine/cloud
 | 
			
		||||
@@ -87,7 +71,6 @@
 | 
			
		||||
          home-manager.useGlobalPkgs = true;
 | 
			
		||||
          home-manager.useUserPackages = true;
 | 
			
		||||
          home-manager.extraSpecialArgs = extraSpecialArgs;
 | 
			
		||||
          home-manager.backupFileExtension = "bak";
 | 
			
		||||
          home-manager.users.${userName}.imports = [
 | 
			
		||||
            ./home
 | 
			
		||||
          ];
 | 
			
		||||
@@ -104,7 +87,6 @@
 | 
			
		||||
        role = "server";
 | 
			
		||||
      };
 | 
			
		||||
      modules = [
 | 
			
		||||
        myOverlays
 | 
			
		||||
        ./modules/common
 | 
			
		||||
        ./modules/machine/valefor
 | 
			
		||||
 | 
			
		||||
@@ -113,7 +95,6 @@
 | 
			
		||||
          home-manager.useGlobalPkgs = true;
 | 
			
		||||
          home-manager.useUserPackages = true;
 | 
			
		||||
          home-manager.extraSpecialArgs = extraSpecialArgs;
 | 
			
		||||
          home-manager.backupFileExtension = "bak";
 | 
			
		||||
          home-manager.users.${userName}.imports = [
 | 
			
		||||
            ./home
 | 
			
		||||
          ];
 | 
			
		||||
@@ -130,7 +111,6 @@
 | 
			
		||||
        role = "server";
 | 
			
		||||
      };
 | 
			
		||||
      # modules = [
 | 
			
		||||
      #   myOverlays
 | 
			
		||||
      #   nix-flatpak.nixosModules.nix-flatpak
 | 
			
		||||
      #   nix-ld.nixosModules.nix-ld
 | 
			
		||||
      #   ./modules/nixos/hardware-configuration.nix
 | 
			
		||||
@@ -143,7 +123,6 @@
 | 
			
		||||
      #     home-manager.useGlobalPkgs = true;
 | 
			
		||||
      #     home-manager.useUserPackages = true;
 | 
			
		||||
      #     home-manager.extraSpecialArgs = extraSpecialArgs;
 | 
			
		||||
      #     home-manager.backupFileExtension = "bak";
 | 
			
		||||
      #     home-manager.users.${userName}.imports = [
 | 
			
		||||
      #       ./home
 | 
			
		||||
      #     ];
 | 
			
		||||
 
 | 
			
		||||
@@ -1,7 +1,6 @@
 | 
			
		||||
{ pkgs, ...}: {
 | 
			
		||||
{...}: {
 | 
			
		||||
  programs.atuin = {
 | 
			
		||||
    enable = true;
 | 
			
		||||
    enableFishIntegration = true;
 | 
			
		||||
    package = pkgs.atuinLatest;
 | 
			
		||||
  };
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -27,7 +27,6 @@ in {
 | 
			
		||||
    ./browser.nix
 | 
			
		||||
    ./zellij.nix
 | 
			
		||||
    ./bat.nix
 | 
			
		||||
    ./lazygit.nix
 | 
			
		||||
  ];
 | 
			
		||||
 | 
			
		||||
  # Home Manager needs a bit of information about you and the
 | 
			
		||||
 
 | 
			
		||||
@@ -1,7 +1,6 @@
 | 
			
		||||
{ pkgs, ... }: {
 | 
			
		||||
{...}: {
 | 
			
		||||
  programs.lazygit = {
 | 
			
		||||
    enable = true;
 | 
			
		||||
    package = pkgs.lazygitLatest;
 | 
			
		||||
 | 
			
		||||
    settings = {
 | 
			
		||||
      gui.theme = {
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,5 @@
 | 
			
		||||
{
 | 
			
		||||
  lib,
 | 
			
		||||
  pkgs,
 | 
			
		||||
  ...
 | 
			
		||||
}: {
 | 
			
		||||
@@ -13,6 +14,7 @@
 | 
			
		||||
 | 
			
		||||
    # utils
 | 
			
		||||
    tmux
 | 
			
		||||
    lazygit
 | 
			
		||||
    bottom
 | 
			
		||||
    ripgrep
 | 
			
		||||
    jq
 | 
			
		||||
 
 | 
			
		||||
@@ -43,7 +43,25 @@
 | 
			
		||||
            "Can I get a waffle? Can I please get a waffle?" \
 | 
			
		||||
            "I'm lesbian. I thought you were American." \
 | 
			
		||||
            "You gotta give 'em that 'hawk tuah' and spit on that thang!" \
 | 
			
		||||
            "We don't do that here..."
 | 
			
		||||
            "We don't do that here..." \
 | 
			
		||||
            "What are those?! They are my crocs..." \
 | 
			
		||||
            "It's an avocado... Thanks!" \
 | 
			
		||||
            "I am once again asking for your financial support" \
 | 
			
		||||
            "Is that a weed?" \
 | 
			
		||||
            "No, this is Patrick!" \
 | 
			
		||||
            "Come ride, heroes, ride" \
 | 
			
		||||
            "Away with the tide" \
 | 
			
		||||
            "Concede your mind unto the fiend" \
 | 
			
		||||
            "Darkness come, rend the shield of light" \
 | 
			
		||||
            "The sun is setting, darkness taking over - a date with chaos and you're dressed to the nines" \
 | 
			
		||||
            "Now kneel overdweller, your lord commands, there's no salvation for the sons of man" \
 | 
			
		||||
            "Snap click clank whirr whizz wham boom!" \
 | 
			
		||||
            "Rohs an kyn ala na" \
 | 
			
		||||
            "If you’ve brought your ivory standard, I’ll be happy to tell you where you can stick it" \
 | 
			
		||||
            "Speeches? Oh, yes, I love them. There's nothing like a good exposition when you're having trouble sleeping!" \
 | 
			
		||||
            "Somehow, the boy just isn't very buoyant" \
 | 
			
		||||
            "I am...not interested, little sun. Try again when you have become a man"
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
          set choose_meme (random)"%"(count $memes)
 | 
			
		||||
          set choose_meme $memes[(math $choose_meme"+1")]
 | 
			
		||||
 
 | 
			
		||||
@@ -8,9 +8,6 @@
 | 
			
		||||
 | 
			
		||||
  # Allow unfree packages
 | 
			
		||||
  nixpkgs.config.allowUnfree = true;
 | 
			
		||||
  nixpkgs.config.permittedInsecurePackages = [
 | 
			
		||||
    "mbedtls-2.28.10"
 | 
			
		||||
  ];
 | 
			
		||||
 | 
			
		||||
  nix.package = pkgs.nix;
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -1,9 +1,12 @@
 | 
			
		||||
{ ... }: {
 | 
			
		||||
{
 | 
			
		||||
  pkgs,
 | 
			
		||||
  lib,
 | 
			
		||||
  ...
 | 
			
		||||
}: {
 | 
			
		||||
  imports = [
 | 
			
		||||
    ./core.nix
 | 
			
		||||
    ./environment.nix
 | 
			
		||||
    ./fonts.nix
 | 
			
		||||
    # ./overlays.nix
 | 
			
		||||
    ./users.nix
 | 
			
		||||
  ];
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -1,50 +0,0 @@
 | 
			
		||||
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