From ada913b9c0159281a2f6faf9083e6ac344362b22 Mon Sep 17 00:00:00 2001 From: Joseph Hanson Date: Fri, 27 Dec 2024 13:04:19 -0600 Subject: [PATCH] change nix formatters and add mise flake --- .envrc | 1 + flake.lock | 93 +++++++++++++++++++++++++++++++++++++++++++++++------- flake.nix | 6 +++- 3 files changed, 87 insertions(+), 13 deletions(-) diff --git a/.envrc b/.envrc index 51f921a..fe6d52a 100644 --- a/.envrc +++ b/.envrc @@ -1,2 +1,3 @@ use nix export SOPS_AGE_KEY_FILE="$(expand_path ./age.key)" +export EDITOR="hx" diff --git a/flake.lock b/flake.lock index 4b9e432..80d1a99 100644 --- a/flake.lock +++ b/flake.lock @@ -237,6 +237,24 @@ "inputs": { "systems": "systems_4" }, + "locked": { + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_4": { + "inputs": { + "systems": "systems_5" + }, "locked": { "lastModified": 1681202837, "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", @@ -251,9 +269,9 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_5": { "inputs": { - "systems": "systems_5" + "systems": "systems_6" }, "locked": { "lastModified": 1710146030, @@ -269,9 +287,9 @@ "type": "github" } }, - "flake-utils_5": { + "flake-utils_6": { "inputs": { - "systems": "systems_6" + "systems": "systems_7" }, "locked": { "lastModified": 1681202837, @@ -652,6 +670,25 @@ "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-2.tar.gz" } }, + "mise": { + "inputs": { + "flake-utils": "flake-utils_3", + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1735325928, + "narHash": "sha256-MfOIDwb6pMakn9eCulGrPwAMuL5qFOhwaEoFFeuv8cY=", + "owner": "jdx", + "repo": "mise", + "rev": "323a85b6f7632b906cb113a428519f2ba89197e7", + "type": "github" + }, + "original": { + "owner": "jdx", + "repo": "mise", + "type": "github" + } + }, "mk-naked-shell": { "flake": false, "locked": { @@ -720,7 +757,7 @@ "nix-minecraft": { "inputs": { "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_4", "nixpkgs": [ "nixpkgs-unstable" ] @@ -742,7 +779,7 @@ "nix-vscode-extensions": { "inputs": { "flake-compat": "flake-compat_4", - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_5", "nixpkgs": [ "nixpkgs" ] @@ -854,6 +891,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1729980323, + "narHash": "sha256-eWPRZAlhf446bKSmzw6x7RWEE4IuZgAp8NW3eXZwRAY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "86e78d3d2084ff87688da662cf78c2af085d8e73", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1735141468, "narHash": "sha256-VIAjBr1qGcEbmhLwQJD6TABppPMggzOvqFsqkDoMsAY=", @@ -869,7 +922,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1734649271, "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", @@ -885,7 +938,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1682134069, "narHash": "sha256-TnI/ZXSmRxQDt2sjRYK/8j8iha4B4zP2cnQCZZ3vp7k=", @@ -924,7 +977,7 @@ "nur": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -1058,11 +1111,12 @@ "hyprland-plugins": "hyprland-plugins", "krewfile": "krewfile", "lix-module": "lix-module", + "mise": "mise", "nix-inspect": "nix-inspect", "nix-minecraft": "nix-minecraft", "nix-vscode-extensions": "nix-vscode-extensions", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "nixpkgs-unstable": "nixpkgs-unstable", "nixvirt-git": "nixvirt-git", "nur": "nur", @@ -1227,6 +1281,21 @@ "type": "github" } }, + "systems_7": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "talhelper": { "inputs": { "flake-parts": "flake-parts_2", @@ -1293,8 +1362,8 @@ }, "vscode-server": { "inputs": { - "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_4" + "flake-utils": "flake-utils_6", + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1729422940, diff --git a/flake.nix b/flake.nix index 3090c60..afcf1f7 100644 --- a/flake.nix +++ b/flake.nix @@ -92,6 +92,9 @@ url = "github:hyprwm/hyprland-plugins"; inputs.hyprland.follows = "hyprland"; }; + + # Mise + mise.url = "github:jdx/mise"; }; outputs = @@ -107,6 +110,7 @@ lix-module, vscode-server, krewfile, + mise, ... }@inputs: let @@ -117,7 +121,7 @@ in rec { # Use nixpkgs-fmt for 'nix fmt' - formatter = forAllSystems (system: nixpkgs.legacyPackages."${system}".nixpkgs-fmt); + formatter = forAllSystems (system: nixpkgs.legacyPackages."${system}".nixfmt-rfc-style); # setup devshells against shell.nix # devShells = forAllSystems (pkgs: import ./shell.nix { inherit pkgs; });