From 9dbf7040ad2ff0759cf5f919a8783e468c421229 Mon Sep 17 00:00:00 2001 From: Frank LoTurco Date: Thu, 27 Aug 2026 11:32:14 -0400 Subject: [PATCH] various: remove pre-commit and use devenv for env instead. --- .gitignore | 11 ++++ .pre-commit-config.yaml | 28 -------- devenv.lock | 117 ++++++++++++++++++++++++++++++++++ devenv.nix | 57 +++++++++++++++++ devenv.yaml | 7 ++ hosts/shared/darwin.nix | 1 - hosts/shared/nixos-pc.nix | 1 - hosts/shared/nixos-server.nix | 1 - 8 files changed, 192 insertions(+), 31 deletions(-) delete mode 100644 .pre-commit-config.yaml create mode 100644 devenv.lock create mode 100644 devenv.nix create mode 100644 devenv.yaml diff --git a/.gitignore b/.gitignore index 41fbeb0..53d438d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,12 @@ **/result + +# Devenv +.devenv* +devenv.local.nix +devenv.local.yaml + +# direnv +.direnv + +# pre-commit +.pre-commit-config.yaml diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml deleted file mode 100644 index 9f26ea8..0000000 --- a/.pre-commit-config.yaml +++ /dev/null @@ -1,28 +0,0 @@ -repos: -- repo: local - hooks: - - id: nix-flake-check - name: Nix flake check - entry: nix flake check - language: system - pass_filenames: false - always_run: true - - id: nixos-drybuild-pdw-frankiel - name: pdw-frankiel build check - entry: nix build .#nixosConfigurations.pdw-frankiel.config.system.build.toplevel - language: system - pass_filenames: false - always_run: true - - id: nixos-drybuild-nero - name: nero build check - entry: nix build .#nixosConfigurations.nero.config.system.build.toplevel - language: system - pass_filenames: false - always_run: true - - id: nixos-drybuild-vergil - name: vergil build check - entry: nix build .#nixosConfigurations.vergil.config.system.build.toplevel - language: system - pass_filenames: false - always_run: true - diff --git a/devenv.lock b/devenv.lock new file mode 100644 index 0000000..a5c5ec0 --- /dev/null +++ b/devenv.lock @@ -0,0 +1,117 @@ +{ + "nodes": { + "devenv": { + "locked": { + "dir": "src/modules", + "lastModified": 1787836922, + "narHash": "sha256-SeAM6TKoXxFLwHWgkaTIZi5L5doM6mMUT3WxshF+9Eg=", + "owner": "cachix", + "repo": "devenv", + "rev": "6cdf7c1e5845b4455d0c0e1461b4c4be4f43bd7d", + "type": "github" + }, + "original": { + "dir": "src/modules", + "owner": "cachix", + "repo": "devenv", + "type": "github" + } + }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "NixOS", + "repo": "flake-compat", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "flake-compat", + "type": "github" + } + }, + "git-hooks": { + "inputs": { + "flake-compat": "flake-compat", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1787424939, + "narHash": "sha256-O2tBn84NNuHrnqNVxx/XqsXwfYvS1YwBh+7CBnbCYsk=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "809414f0cdadf82cf11b06c2b29ba9b3168b3297", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1782918843, + "narHash": "sha256-ETYnV9U7Sr+A45dohzZdfCZKOss4qrTkO+wgNZNvEc0=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e8273b29fe1390ec8d4603f2477357555291432e", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-src": { + "flake": false, + "locked": { + "lastModified": 1787394516, + "narHash": "sha256-pRGOQSClnXNI2iLUG6DYpsGvYcuw0drOutVZFTJNw90=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c8f90650c15282fa8656a041bfbbd2403997a9a7", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "inputs": { + "nixpkgs-src": "nixpkgs-src" + }, + "locked": { + "lastModified": 1787753358, + "narHash": "sha256-Tl77VbWyAKrOfRNQhL6JbQtb/MLzbYa/1RG1gWWfICk=", + "owner": "cachix", + "repo": "devenv-nixpkgs", + "rev": "256551e45f6303e142ab4a98be1bf243feb77dc0", + "type": "github" + }, + "original": { + "owner": "cachix", + "ref": "rolling", + "repo": "devenv-nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "devenv": "devenv", + "git-hooks": "git-hooks", + "nixpkgs": "nixpkgs_2" + } + } + }, + "root": "root", + "version": 7 +} \ No newline at end of file diff --git a/devenv.nix b/devenv.nix new file mode 100644 index 0000000..cde7c01 --- /dev/null +++ b/devenv.nix @@ -0,0 +1,57 @@ +{ + pkgs, + ... +}: + +{ + languages = { + nix = { + enable = true; + lsp.package = pkgs.nil; + }; + }; + + packages = with pkgs; [ + nixfmt + ]; + + git-hooks.hooks = { + nixfmt.enable = true; + + nix-flake-check = { + enable = true; + name = "Nix Flake Check"; + entry = "nix flake check"; + language = "system"; + pass_filenames = false; + always_run = true; + }; + + build-pdw-frankiel = { + enable = true; + name = "Build pdw-frankiel"; + entry = "nix build .#nixosConfigurations.pdw-frankiel.config.system.build.toplevel"; + language = "system"; + pass_filenames = false; + always_run = true; + }; + + build-nero = { + enable = true; + name = "Build nero"; + entry = "nix build .#nixosConfigurations.nero.config.system.build.toplevel"; + language = "system"; + pass_filenames = false; + always_run = true; + }; + + build-vergil = { + enable = true; + name = "Build vergil"; + entry = "nix build .#nixosConfigurations.vergil.config.system.build.toplevel"; + language = "system"; + pass_filenames = false; + always_run = true; + }; + }; +} diff --git a/devenv.yaml b/devenv.yaml new file mode 100644 index 0000000..741916a --- /dev/null +++ b/devenv.yaml @@ -0,0 +1,7 @@ +# yaml-language-server: $schema=https://devenv.sh/devenv.schema.json +inputs: + nixpkgs: + url: github:cachix/devenv-nixpkgs/rolling + git-hooks: + url: github:cachix/git-hooks.nix + diff --git a/hosts/shared/darwin.nix b/hosts/shared/darwin.nix index ab04219..2cd1c30 100644 --- a/hosts/shared/darwin.nix +++ b/hosts/shared/darwin.nix @@ -71,7 +71,6 @@ btop nerd-fonts.hack jump - pre-commit ]; }; diff --git a/hosts/shared/nixos-pc.nix b/hosts/shared/nixos-pc.nix index 2712521..b6ba6c2 100644 --- a/hosts/shared/nixos-pc.nix +++ b/hosts/shared/nixos-pc.nix @@ -367,7 +367,6 @@ in openjdk17 openjdk25 tmux - pre-commit unstable.fastfetch diff --git a/hosts/shared/nixos-server.nix b/hosts/shared/nixos-server.nix index d0b58d9..4449e8f 100644 --- a/hosts/shared/nixos-server.nix +++ b/hosts/shared/nixos-server.nix @@ -186,7 +186,6 @@ in openjdk17 openjdk25 tmux - pre-commit unstable.fastfetch