diff --git a/flake.lock b/flake.lock index ed91fc0..9ce363b 100644 --- a/flake.lock +++ b/flake.lock @@ -446,6 +446,22 @@ "type": "github" } }, + "nixpkgs_6": { + "locked": { + "lastModified": 1780243769, + "narHash": "sha256-x5UQuRsH3MqI0U9afaXSNqzTPSeZlRLvFAav2Ux1pNw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "331800de5053fcebacf6813adb5db9c9dca22a0c", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "carbonfox": "carbonfox", @@ -457,7 +473,8 @@ "nix-darwin": "nix-darwin", "nixpkgs": "nixpkgs_4", "zig": "zig", - "zls-flake": "zls-flake" + "zls-flake": "zls-flake", + "zmx": "zmx" } }, "systems": { @@ -552,6 +569,25 @@ "repo": "zls", "type": "github" } + }, + "zmx": { + "inputs": { + "nixpkgs": "nixpkgs_6" + }, + "locked": { + "lastModified": 1780871875, + "narHash": "sha256-y26C7U1sqhypvUrDUg0z0j0NRfS762Bj4nZk6DzEJWU=", + "ref": "main", + "rev": "72583c504bff63a81502fa13eeb3d1a63c13ba27", + "revCount": 3, + "type": "git", + "url": "https://tangled.org/ethanholz.com/zmx-binary-flake" + }, + "original": { + "ref": "main", + "type": "git", + "url": "https://tangled.org/ethanholz.com/zmx-binary-flake" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 411b3b8..613827f 100644 --- a/flake.nix +++ b/flake.nix @@ -23,6 +23,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; jj-starship.url = "github:dmmulroy/jj-starship"; + zmx.url = "git+https://tangled.org/ethanholz.com/zmx-binary-flake?ref=main"; }; outputs = inputs @ {self, ...}: let diff --git a/lib/default.nix b/lib/default.nix index 338c69f..01b2d0a 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -25,15 +25,6 @@ in { nix.enable = false; nixpkgs.config.allowUnfree = true; - environment.etc."determinate/config.json".text = '' - { - "authentication": { - "additionalNetrcSources": [ - "/Users/ethan/.config/nix/netrc" - ] - } - } - ''; # Create /etc/zshrc that loads the nix-darwin environment. programs.zsh.enable = true; # default shell on catalina diff --git a/lib/shared/home.nix b/lib/shared/home.nix index ab4fe42..5a5ba7c 100644 --- a/lib/shared/home.nix +++ b/lib/shared/home.nix @@ -10,6 +10,7 @@ # config.allowUnfree = true; # }; zig = inputs.zig.packages.${system}."0.15.1"; + zmx = inputs.zmx.packages.${system}.default; base = if pkgs.stdenv.isDarwin then "/Users/${userName}" @@ -52,6 +53,7 @@ in { home.packages = [ zig jj-starship + zmx # # It is sometimes useful to fine-tune packages, for example, by applying # # overrides. You can do that directly here, just don't forget the @@ -66,52 +68,34 @@ in { # echo "Hello, ${config.home.username}!" # '') pkgs.grype - pkgs.charm-freeze pkgs.fd - pkgs.govulncheck - pkgs.revive pkgs.fzf pkgs.ripgrep - pkgs.age - pkgs.sops pkgs.golangci-lint - pkgs.gitleaks - # Git - pkgs.bfg-repo-cleaner pkgs.just - pkgs.git-cliff pkgs.typescript pkgs.yq-go pkgs.yubikey-manager - pkgs.tailwindcss pkgs.neovim pkgs.htop pkgs.btop pkgs.stow pkgs.ffmpeg - pkgs.actionlint - pkgs.jupyter - pkgs.dive pkgs.opentofu pkgs.croc pkgs.iperf3 pkgs.commit-mono pkgs.geist-font - pkgs.flyctl - pkgs.libwebp - pkgs.yt-dlp pkgs.vhs pkgs.minisign pkgs.typst - pkgs.hugo pkgs.tflint - pkgs.repomix pkgs.lychee - pkgs.vscode-langservers-extracted pkgs.prettierd pkgs.podman-compose pkgs.syft - pkgs.pass + pkgs.duckdb + pkgs.scorecard ]; # Home Manager is pretty good at managing dotfiles. The primary way to manage @@ -226,13 +210,8 @@ in { }; lfs.enable = true; ignores = [ - "salt-server.log" - ".ccls*" - "commit_convention.yml" ".direnv/" ".envrc" - ".oprc" - "repomix-output.txt" ]; settings = { alias = { @@ -383,10 +362,6 @@ in { ''; }; - programs.bat = { - enable = true; - }; - programs.direnv = { enable = true; nix-direnv.enable = true; @@ -416,13 +391,6 @@ in { extensions = [pkgs.gh-dash]; }; - programs.helix = { - enable = true; - settings = { - theme = "carbonfox"; - }; - }; - programs.jujutsu = { enable = true; settings = { diff --git a/lib/shared/lsp.nix b/lib/shared/lsp.nix index 204a422..5a4d41f 100644 --- a/lib/shared/lsp.nix +++ b/lib/shared/lsp.nix @@ -9,13 +9,10 @@ in { pkgs.lua-language-server pkgs.nil pkgs.gopls - # pkgs.ansible-language-server pkgs.ltex-ls - # pkgs.ansible-lint pkgs.stylua pkgs.terraform-ls pkgs.zls - # ziggy pkgs.astro-language-server pkgs.svelte-language-server pkgs.typescript-language-server @@ -23,5 +20,7 @@ in { pkgs.yaml-language-server pkgs.harper pkgs.luajitPackages.tree-sitter-cli + pkgs.actionlint + pkgs.vscode-langservers-extracted ]; }