try to make builds work

This commit is contained in:
Noah Masur
2025-10-29 12:03:20 -04:00
parent 431ebd732c
commit 2e4467b6ea
7 changed files with 16 additions and 33 deletions

24
flake.lock generated
View File

@@ -148,29 +148,6 @@
"type": "github" "type": "github"
} }
}, },
"helix": {
"inputs": {
"nixpkgs": [
"nixpkgs"
],
"rust-overlay": [
"rust-overlay"
]
},
"locked": {
"lastModified": 1762973522,
"narHash": "sha256-CFyvvZvKDkTFF7niIQp5hhks5OR1u10H3e89chURCkg=",
"owner": "helix-editor",
"repo": "helix",
"rev": "948ac05aa0db64e0e5d00710db36eb244076e988",
"type": "github"
},
"original": {
"owner": "helix-editor",
"repo": "helix",
"type": "github"
}
},
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@@ -363,7 +340,6 @@
"inputs": { "inputs": {
"darwin": "darwin", "darwin": "darwin",
"disko": "disko", "disko": "disko",
"helix": "helix",
"home-manager": "home-manager", "home-manager": "home-manager",
"mac-app-util": "mac-app-util", "mac-app-util": "mac-app-util",
"nix2vim": "nix2vim", "nix2vim": "nix2vim",

View File

@@ -75,12 +75,12 @@
inputs.rust-overlay.follows = "rust-overlay"; inputs.rust-overlay.follows = "rust-overlay";
}; };
# Text editor # # Text editor
helix = { # helix = {
url = "github:helix-editor/helix"; # url = "github:helix-editor/helix";
inputs.nixpkgs.follows = "nixpkgs"; # inputs.nixpkgs.follows = "nixpkgs";
inputs.rust-overlay.follows = "rust-overlay"; # inputs.rust-overlay.follows = "rust-overlay";
}; # };
# # Nextcloud Apps # # Nextcloud Apps
# nextcloud-news = { # nextcloud-news = {

View File

@@ -67,7 +67,7 @@ lib
inputs.nur.overlays.default inputs.nur.overlays.default
inputs.nix2vim.overlay inputs.nix2vim.overlay
inputs.zellij-switch.overlays.default inputs.zellij-switch.overlays.default
inputs.helix.overlays.default # inputs.helix.overlays.default
] ]
++ (importOverlays ../overlays); ++ (importOverlays ../overlays);

View File

@@ -2,6 +2,12 @@ inputs: _final: prev: {
awscli2 = prev.awscli2.overrideAttrs ( awscli2 = prev.awscli2.overrideAttrs (
finalAttrs: previousAttrs: { finalAttrs: previousAttrs: {
src = prev.fetchFromGitHub {
owner = "aws";
repo = "aws-cli";
rev = "2.31.27";
hash = "sha256-NnAEdbIZVri9Bi0KBlcZIVox+LbuD0/hBdtYB/UFHeo=";
};
disabledTestPaths = previousAttrs.disabledTestPaths ++ [ disabledTestPaths = previousAttrs.disabledTestPaths ++ [
"tests/unit/customizations" "tests/unit/customizations"
]; ];

View File

@@ -189,7 +189,7 @@ in
auto-format = true; auto-format = true;
file-types = [ "hcl" ]; file-types = [ "hcl" ];
formatter = { formatter = {
command = lib.getExe pkgs.packer; command = "${pkgs.packer}/bin/packer";
args = [ args = [
"fmt" "fmt"
"-" "-"

View File

@@ -29,6 +29,7 @@ in
pkgs.pop # Send emails from a TUI pkgs.pop # Send emails from a TUI
pkgs.crush # AI LLM Agent pkgs.crush # AI LLM Agent
pkgs.gemini-cli # AI LLM Agent
]; ];

View File

@@ -66,7 +66,7 @@ in
helix.enable = lib.mkDefault true; helix.enable = lib.mkDefault true;
jujutsu.enable = lib.mkDefault true; jujutsu.enable = lib.mkDefault true;
lazygit.enable = lib.mkDefault true; lazygit.enable = lib.mkDefault true;
neovim.enable = lib.mkDefault true; # neovim.enable = lib.mkDefault true;
nix-index.enable = lib.mkDefault true; nix-index.enable = lib.mkDefault true;
nixpkgs.enable = lib.mkDefault true; nixpkgs.enable = lib.mkDefault true;
notes.enable = lib.mkDefault true; notes.enable = lib.mkDefault true;