diff --git a/checks/pre-commit-hooks/default.nix b/checks/pre-commit-hooks/default.nix index cfd5ea3..fa644a2 100644 --- a/checks/pre-commit-hooks/default.nix +++ b/checks/pre-commit-hooks/default.nix @@ -4,9 +4,9 @@ ... }: let - inherit (inputs) git-hooks-nix; + inherit (inputs) pre-commit-hooks-nix; in -git-hooks-nix.lib.${pkgs.system}.run { +pre-commit-hooks-nix.lib.${pkgs.system}.run { src = ../..; hooks = { pre-commit-hook-ensure-sops.enable = true; diff --git a/flake.nix b/flake.nix index b79a44c..ce2b341 100644 --- a/flake.nix +++ b/flake.nix @@ -85,183 +85,178 @@ # We will handle this in the next section. outputs = inputs: - let - snowfall = inputs.snowfall-lib.mkFlake { - # You must provide our flake inputs to Snowfall Lib. - inherit inputs; + inputs.snowfall-lib.mkFlake { + # You must provide our flake inputs to Snowfall Lib. + inherit inputs; - # The `src` must be the root of the flake. See configuration - # in the next section for information on how you can move your - # Nix files to a separate directory. - src = ./.; + # The `src` must be the root of the flake. See configuration + # in the next section for information on how you can move your + # Nix files to a separate directory. + src = ./.; - # Add a module to a specific host. - systems = { - # common modules - modules.nixos = with inputs; [ - authentik-nix.nixosModules.default - chaotic.nixosModules.default - crowdsec.nixosModules.crowdsec - crowdsec.nixosModules.crowdsec-firewall-bouncer - disko.nixosModules.disko - impermanence.nixosModules.impermanence - lanzaboote.nixosModules.lanzaboote - sops-nix.nixosModules.sops - home-manager.nixosModules.home-manager - ]; + # Add a module to a specific host. + systems = { + # common modules + modules.nixos = with inputs; [ + authentik-nix.nixosModules.default + chaotic.nixosModules.default + crowdsec.nixosModules.crowdsec + crowdsec.nixosModules.crowdsec-firewall-bouncer + disko.nixosModules.disko + impermanence.nixosModules.impermanence + lanzaboote.nixosModules.lanzaboote + sops-nix.nixosModules.sops + home-manager.nixosModules.home-manager + ]; - # common darwin modules - modules.darwin = with inputs; [ - nix-homebrew.darwinModules.nix-homebrew - home-manager.darwinModules.home-manager - ]; + # common darwin modules + modules.darwin = with inputs; [ + nix-homebrew.darwinModules.nix-homebrew + home-manager.darwinModules.home-manager + ]; - # Host config - hosts = { - # ###################################################### - # Desktop # - # ###################################################### - desktop = { - modules = with inputs; [ - nixos-hardware.nixosModules.common-cpu-amd - nixos-hardware.nixosModules.common-cpu-amd-pstate - nixos-hardware.nixosModules.common-cpu-amd-zenpower - nixos-hardware.nixosModules.common-gpu-amd - nixos-hardware.nixosModules.common-hidpi - nixos-hardware.nixosModules.common-pc - ]; - }; - - # ###################################################### - # NAS # - # ###################################################### - nas = { - modules = with inputs; [ - nixos-hardware.nixosModules.common-pc - nixos-hardware.nixosModules.common-cpu-amd - nixos-hardware.nixosModules.common-cpu-amd-pstate - nixos-hardware.nixosModules.common-cpu-amd-zenpower - nixos-hardware.nixosModules.common-hidpi - home-manager.nixosModules.home-manager - ]; - # overlays = with inputs; [ crowdsec.overlays.default ]; - }; - - # ###################################################### - # Steamdeck # - # ###################################################### - deck = { - modules = with inputs; [ - disko.nixosModules.disko - jovian.nixosModules.jovian - nixos-hardware.nixosModules.common-cpu-amd - nixos-hardware.nixosModules.common-cpu-amd-pstate - nixos-hardware.nixosModules.common-cpu-amd-zenpower - nixos-hardware.nixosModules.common-gpu-amd - nixos-hardware.nixosModules.common-hidpi - nixos-hardware.nixosModules.common-pc - ]; - }; - - # ###################################################### - # NUC # - # ###################################################### - nuc = { - modules = with inputs; [ - disko.nixosModules.disko - nixos-hardware.nixosModules.common-cpu-amd - nixos-hardware.nixosModules.common-cpu-amd-pstate - nixos-hardware.nixosModules.common-cpu-amd-zenpower - nixos-hardware.nixosModules.common-gpu-amd - nixos-hardware.nixosModules.common-hidpi - nixos-hardware.nixosModules.common-pc - ]; - }; - - # ###################################################### - # Pi4 # - # ###################################################### - pi4 = { - modules = with inputs; [ - disko.nixosModules.disko - nixos-raspberrypi.nixosModules.raspberry-pi-4.base - nixos-raspberrypi.nixosModules.raspberry-pi-4.display-vc4 - nixos-raspberrypi.lib.inject-overlays - ]; - }; - - # ###################################################### - # Pi5 # - # ###################################################### - pi5 = { - modules = with inputs; [ - disko.nixosModules.disko - nixos-raspberrypi.nixosModules.raspberry-pi-5.base - nixos-raspberrypi.nixosModules.raspberry-pi-5.display-vc4 - nixos-raspberrypi.nixosModules.raspberry-pi-5.bluetooth - nixos-raspberrypi.lib.inject-overlays - ]; - }; - - # ###################################################### - # Mac # - # ###################################################### - macbook-pro-nixos = { - modules = with inputs; [ - nixos-apple-silicon.nixosModules.default - ]; - }; - }; - - overlays = with inputs; [ nix-vscode-extensions.overlays.default ]; - - homes = { + # Host config + hosts = { + # ###################################################### + # Desktop # + # ###################################################### + desktop = { modules = with inputs; [ - nix-index-database.homeModules.nix-index - sops-nix.homeManagerModules.sops + nixos-hardware.nixosModules.common-cpu-amd + nixos-hardware.nixosModules.common-cpu-amd-pstate + nixos-hardware.nixosModules.common-cpu-amd-zenpower + nixos-hardware.nixosModules.common-gpu-amd + nixos-hardware.nixosModules.common-hidpi + nixos-hardware.nixosModules.common-pc ]; + }; - overlays = with inputs; [ - nix-vscode-extensions.overlays.default + # ###################################################### + # NAS # + # ###################################################### + nas = { + modules = with inputs; [ + nixos-hardware.nixosModules.common-pc + nixos-hardware.nixosModules.common-cpu-amd + nixos-hardware.nixosModules.common-cpu-amd-pstate + nixos-hardware.nixosModules.common-cpu-amd-zenpower + nixos-hardware.nixosModules.common-hidpi + home-manager.nixosModules.home-manager ]; + # overlays = with inputs; [ crowdsec.overlays.default ]; + }; - users = { - # "matt@desktop" = { - # modules = with inputs; [ - # sops-nix.homeManagerModules.sops - # ]; - # }; - "deck@deck" = { - modules = with inputs; [ - steam-rom-manager.homeManagerModules.default - ]; - }; + # ###################################################### + # Steamdeck # + # ###################################################### + steamdeck = { + modules = with inputs; [ + disko.nixosModules.disko + jovian.nixosModules.jovian + nixos-hardware.nixosModules.common-cpu-amd + nixos-hardware.nixosModules.common-cpu-amd-pstate + nixos-hardware.nixosModules.common-cpu-amd-zenpower + nixos-hardware.nixosModules.common-gpu-amd + nixos-hardware.nixosModules.common-hidpi + nixos-hardware.nixosModules.common-pc + ]; + }; + + # ###################################################### + # NUC # + # ###################################################### + nuc = { + modules = with inputs; [ + disko.nixosModules.disko + nixos-hardware.nixosModules.common-cpu-amd + nixos-hardware.nixosModules.common-cpu-amd-pstate + nixos-hardware.nixosModules.common-cpu-amd-zenpower + nixos-hardware.nixosModules.common-gpu-amd + nixos-hardware.nixosModules.common-hidpi + nixos-hardware.nixosModules.common-pc + ]; + }; + + # ###################################################### + # Pi4 # + # ###################################################### + pi4 = { + modules = with inputs; [ + disko.nixosModules.disko + nixos-raspberrypi.nixosModules.raspberry-pi-4.base + nixos-raspberrypi.nixosModules.raspberry-pi-4.display-vc4 + nixos-raspberrypi.lib.inject-overlays + ]; + }; + + # ###################################################### + # Pi5 # + # ###################################################### + pi5 = { + modules = with inputs; [ + disko.nixosModules.disko + nixos-raspberrypi.nixosModules.raspberry-pi-5.base + nixos-raspberrypi.nixosModules.raspberry-pi-5.display-vc4 + nixos-raspberrypi.nixosModules.raspberry-pi-5.bluetooth + nixos-raspberrypi.lib.inject-overlays + ]; + }; + + # ###################################################### + # Mac # + # ###################################################### + macbook-pro-nixos = { + modules = with inputs; [ + nixos-apple-silicon.nixosModules.default + ]; + }; + }; + + overlays = with inputs; [ nix-vscode-extensions.overlays.default ]; + + homes = { + modules = with inputs; [ + nix-index-database.homeModules.nix-index + sops-nix.homeManagerModules.sops + ]; + + overlays = with inputs; [ + nix-vscode-extensions.overlays.default + ]; + + users = { + # "matt@desktop" = { + # modules = with inputs; [ + # sops-nix.homeManagerModules.sops + # ]; + # }; + "deck@steamdeck" = { + modules = with inputs; [ + steam-rom-manager.homeManagerModules.default + ]; }; }; }; + }; - # Configure Snowfall Lib, all of these settings are optional. - snowfall = { - # Choose a namespace to use for your flake's packages, library, - # and overlays. - namespace = "mjallen"; + # Configure Snowfall Lib, all of these settings are optional. + snowfall = { + # Choose a namespace to use for your flake's packages, library, + # and overlays. + namespace = "mjallen"; - # Add flake metadata that can be processed by tools like Snowfall Frost. - meta = { - # A slug to use in documentation when displaying things like file paths. - name = "mjallen"; + # Add flake metadata that can be processed by tools like Snowfall Frost. + meta = { + # A slug to use in documentation when displaying things like file paths. + name = "mjallen"; - # A title to show for your flake, typically the name. - title = "mjallen Flake"; - }; - }; - - outputs-builder = channels: { - formatter = inputs.treefmt-nix.lib.mkWrapper channels.nixpkgs ./treefmt.nix; + # A title to show for your flake, typically the name. + title = "mjallen Flake"; }; }; - in - snowfall // { - nixosConfigurations = snowfall.nixosConfigurations; + + outputs-builder = channels: { + formatter = inputs.treefmt-nix.lib.mkWrapper channels.nixpkgs ./treefmt.nix; }; + }; } \ No newline at end of file diff --git a/homes/x86_64-linux/deck@deck/default.nix b/homes/x86_64-linux/deck@steamdeck/default.nix similarity index 100% rename from homes/x86_64-linux/deck@deck/default.nix rename to homes/x86_64-linux/deck@steamdeck/default.nix diff --git a/modules/home/programs/waybar/default.nix b/modules/home/programs/waybar/default.nix index 6829fcc..3c2a046 100755 --- a/modules/home/programs/waybar/default.nix +++ b/modules/home/programs/waybar/default.nix @@ -372,7 +372,7 @@ in ${defaultBorderRadius} ${defaultCenterOptions} margin-left: 4rem; - margin-right: ${cfg.css.window.margin-right}rem; + margin-right: 400rem; } /* make window module transparent when no windows present */ diff --git a/modules/nixos/home/default.nix b/modules/nixos/home/default.nix index dfdb10f..52579e8 100644 --- a/modules/nixos/home/default.nix +++ b/modules/nixos/home/default.nix @@ -4,8 +4,12 @@ options, namespace, inputs, + system, ... }: +let + isArm = ("aarch64-linux" == system); +in { options.${namespace}.home = with lib.types; { @@ -49,9 +53,8 @@ # Make ALL external HM modules available globally sharedModules = with inputs; [ sops-nix.homeManagerModules.sops - steam-rom-manager.homeManagerModules.default # Add any other external HM modules here - ]; + ] ++ (if (!isArm) then with inputs; [ steam-rom-manager.homeManagerModules.default ] else [ ]); users.${config.${namespace}.user.name} = lib.mkAliasDefinitions options.${namespace}.home.extraOptions; # users.admin = lib.mkAliasDefinitions options.${namespace}.home.extraOptions; diff --git a/systems/aarch64-linux/pi4/default.nix b/systems/aarch64-linux/pi4/default.nix index 0b5f6cc..e7952a7 100755 --- a/systems/aarch64-linux/pi4/default.nix +++ b/systems/aarch64-linux/pi4/default.nix @@ -87,7 +87,7 @@ in "${user}" = { isNormalUser = true; # hashedPasswordFile = password; - password = "BogieDudie1"; + password = lib.mkForce "BogieDudie1"; extraGroups = [ "wheel" "docker" diff --git a/systems/aarch64-linux/pi4/sops.nix b/systems/aarch64-linux/pi4/sops.nix index a43e72e..fb8cfb0 100755 --- a/systems/aarch64-linux/pi4/sops.nix +++ b/systems/aarch64-linux/pi4/sops.nix @@ -1,10 +1,10 @@ -{ config, ... }: +{ config, lib, ... }: let user = "matt"; in { sops = { - defaultSopsFile = ../../../secrets/pi4-secrets.yaml; + defaultSopsFile = lib.mkForce ../../../secrets/pi4-secrets.yaml; # age = { # generateKey = true; # sshKeyPaths = [ "/etc/ssd/ssh_host_ed25519_key" ]; diff --git a/systems/aarch64-linux/pi5/default.nix b/systems/aarch64-linux/pi5/default.nix index f475a2d..bff1d5f 100644 --- a/systems/aarch64-linux/pi5/default.nix +++ b/systems/aarch64-linux/pi5/default.nix @@ -91,7 +91,7 @@ in users."${user}" = { isNormalUser = true; # hashedPasswordFile = password; - password = "BogieDudie1"; + password = lib.mkForce "BogieDudie1"; extraGroups = [ "wheel" "docker" diff --git a/systems/aarch64-linux/pi5/sops.nix b/systems/aarch64-linux/pi5/sops.nix index 7e007e4..823800b 100755 --- a/systems/aarch64-linux/pi5/sops.nix +++ b/systems/aarch64-linux/pi5/sops.nix @@ -1,10 +1,10 @@ -{ config, ... }: +{ config, lib, ... }: let user = "matt"; in { sops = { - defaultSopsFile = ../../../secrets/pi5-secrets.yaml; + defaultSopsFile = lib.mkForce ../../../secrets/pi5-secrets.yaml; # age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; age.keyFile = "/home/matt/.config/sops/age/keys.txt"; diff --git a/systems/x86_64-linux/desktop/sops.nix b/systems/x86_64-linux/desktop/sops.nix index 0877383..7b30e62 100755 --- a/systems/x86_64-linux/desktop/sops.nix +++ b/systems/x86_64-linux/desktop/sops.nix @@ -20,7 +20,7 @@ in # Either the group id or group name representation of the secret group # It is recommended to get the group name from `config.users.users..group` to avoid misconfiguration sops = { - defaultSopsFile = desktopSopsFile; + defaultSopsFile = lib.mkForce desktopSopsFile; # todo age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; # ------------------------------ diff --git a/systems/x86_64-linux/desktop/users.nix b/systems/x86_64-linux/desktop/users.nix index 68b3046..3dc5878 100644 --- a/systems/x86_64-linux/desktop/users.nix +++ b/systems/x86_64-linux/desktop/users.nix @@ -1,9 +1,9 @@ -{ config, namespace, ... }: +{ config, namespace, lib, ... }: let passwordFile = config.sops.secrets."desktop/matt_password".path; in { ${namespace}.user = { - passwordFile = passwordFile; + passwordFile = lib.mkForce passwordFile; }; } \ No newline at end of file diff --git a/systems/x86_64-linux/nas/sops.nix b/systems/x86_64-linux/nas/sops.nix index 43d9e5c..e2cf4d2 100755 --- a/systems/x86_64-linux/nas/sops.nix +++ b/systems/x86_64-linux/nas/sops.nix @@ -1,4 +1,4 @@ -{ config, ... }: +{ config, lib, ... }: let user = "nix-apps"; in @@ -18,7 +18,7 @@ in # Either the group id or group name representation of the secret group # It is recommended to get the group name from `config.users.users..group` to avoid misconfiguration sops = { - defaultSopsFile = ../../../secrets/nas-secrets.yaml; + defaultSopsFile = lib.mkForce ../../../secrets/nas-secrets.yaml; age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; # ------------------------------ diff --git a/systems/x86_64-linux/nas/users.nix b/systems/x86_64-linux/nas/users.nix index 5a88831..147e3ad 100755 --- a/systems/x86_64-linux/nas/users.nix +++ b/systems/x86_64-linux/nas/users.nix @@ -1,4 +1,4 @@ -{ pkgs, config, ... }: +{ pkgs, config, lib, ... }: let user = "admin"; passwordFile = config.sops.secrets."jallen-nas/admin_password".path; @@ -31,7 +31,7 @@ in "62900" "1001" ]; - hashedPasswordFile = passwordFile; + hashedPasswordFile = lib.mkForce passwordFile; shell = pkgs.zsh; packages = with pkgs; [ cachix diff --git a/systems/x86_64-linux/nuc/sops.nix b/systems/x86_64-linux/nuc/sops.nix index a37133a..347c437 100755 --- a/systems/x86_64-linux/nuc/sops.nix +++ b/systems/x86_64-linux/nuc/sops.nix @@ -1,4 +1,4 @@ -{ config, ... }: +{ config, lib, ... }: let user = "nix-apps"; in @@ -18,7 +18,7 @@ in # Either the group id or group name representation of the secret group # It is recommended to get the group name from `config.users.users..group` to avoid misconfiguration sops = { - defaultSopsFile = ../../../secrets/nuc-secrets.yaml; + defaultSopsFile = lib.mkForce ../../../secrets/nuc-secrets.yaml; age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; # ------------------------------ diff --git a/systems/x86_64-linux/nuc/users.nix b/systems/x86_64-linux/nuc/users.nix index a0b94b5..7c73234 100755 --- a/systems/x86_64-linux/nuc/users.nix +++ b/systems/x86_64-linux/nuc/users.nix @@ -1,4 +1,4 @@ -{ pkgs, config, ... }: +{ pkgs, lib, ... }: let user = "admin"; # passwordFile = config.sops.secrets."jallen-nas/admin_password".path; @@ -22,7 +22,7 @@ in "libvirtd" ]; # hashedPasswordFile = passwordFile; - password = "BogieDudie1"; + password = lib.mkForce "BogieDudie1"; shell = pkgs.zsh; packages = with pkgs; [ ]; diff --git a/systems/x86_64-linux/deck/boot.nix b/systems/x86_64-linux/steamdeck/boot.nix similarity index 100% rename from systems/x86_64-linux/deck/boot.nix rename to systems/x86_64-linux/steamdeck/boot.nix diff --git a/systems/x86_64-linux/deck/configuration.nix b/systems/x86_64-linux/steamdeck/configuration.nix similarity index 91% rename from systems/x86_64-linux/deck/configuration.nix rename to systems/x86_64-linux/steamdeck/configuration.nix index d8dc727..536dd1c 100755 --- a/systems/x86_64-linux/deck/configuration.nix +++ b/systems/x86_64-linux/steamdeck/configuration.nix @@ -30,9 +30,7 @@ # Define a user account. Don't forget to set a password with ‘passwd’. users.users = { deck = { - hashedPasswordFile = config.sops.secrets."steamdeck/deck-password".path; - isNormalUser = true; - extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. + hashedPasswordFile = lib.mkForce config.sops.secrets."steamdeck/deck-password".path; openssh.authorizedKeys.keys = [ # macBook "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCw9zq8DLGByI5v2gAn95hKNyOsm3g61a2buxu2BBMFysQJgmZPCCLUqRJKhSM5Vm/JOgsAmdpRBRZQoHD+6S844CJHb4v4VIbjkyQgYCuM7Rst2IOZ5QybvsA2/D0nwytZ+HXQqDj2AagUYDbz0gyyIHkDQ5YGBMkvkWz/h1Vci6aoBM7VihEDM4KlWoTVuPeASGM8r5IZ2FS83Djbqo4ov6AYvLMrKB9Z7hmFgH6R3LE0gxOkzbGVXtSuvJyrjvgytoT22UhATjjxSQ9D+YJXXkQoB3lUdg8OoIquUPjMZpl4mR8ffvseWPfcvD1XlD5t+TOHFqKpESO547tlOBYhdpew+NSgAXpamCU6oyV8tDCywLQu2ucxHRn78u6WXzWHkDtffdhzmk6TZaPhWqVHuTGjR4higBgGqUfSaKOMszt+FDRZAr3HtuQ2+zJ8bowK9fW5OqilTtK2HtQqroD9ApegDNbqOz6kGy5IycSXvqPURy/M4lxZxbtBPuemcJs= mattjallen@MacBook-Pro.local" @@ -41,11 +39,6 @@ # desktop nixos "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPTBMydhOc6SnOdB5WrEd7X07DrboAtagCUgXiOJjLov matt@matt-nixos" ]; - packages = with pkgs; [ - firefox - tree - ]; - shell = lib.mkForce pkgs.zsh; }; }; diff --git a/systems/x86_64-linux/deck/default.nix b/systems/x86_64-linux/steamdeck/default.nix similarity index 97% rename from systems/x86_64-linux/deck/default.nix rename to systems/x86_64-linux/steamdeck/default.nix index ef15414..287e02e 100644 --- a/systems/x86_64-linux/deck/default.nix +++ b/systems/x86_64-linux/steamdeck/default.nix @@ -34,5 +34,6 @@ user = { name = "deck"; }; + network.hostName = "steamdeck"; }; } \ No newline at end of file diff --git a/systems/x86_64-linux/deck/jovian.nix b/systems/x86_64-linux/steamdeck/jovian.nix similarity index 100% rename from systems/x86_64-linux/deck/jovian.nix rename to systems/x86_64-linux/steamdeck/jovian.nix diff --git a/systems/x86_64-linux/deck/networking.nix b/systems/x86_64-linux/steamdeck/networking.nix similarity index 100% rename from systems/x86_64-linux/deck/networking.nix rename to systems/x86_64-linux/steamdeck/networking.nix diff --git a/systems/x86_64-linux/deck/sops.nix b/systems/x86_64-linux/steamdeck/sops.nix similarity index 97% rename from systems/x86_64-linux/deck/sops.nix rename to systems/x86_64-linux/steamdeck/sops.nix index 15dafa1..519bc2b 100755 --- a/systems/x86_64-linux/deck/sops.nix +++ b/systems/x86_64-linux/steamdeck/sops.nix @@ -18,7 +18,7 @@ in # Either the group id or group name representation of the secret group # It is recommended to get the group name from `config.users.users..group` to avoid misconfiguration sops = { - defaultSopsFile = (lib.snowfall.fs.get-file "secrets/steamdeck-secrets.yaml"); + defaultSopsFile = lib.mkForce (lib.snowfall.fs.get-file "secrets/steamdeck-secrets.yaml"); age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; # ------------------------------ diff --git a/templates/checks/pre-commit-hooks/default.nix b/templates/checks/pre-commit-hooks/default.nix deleted file mode 100644 index e653756..0000000 --- a/templates/checks/pre-commit-hooks/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ - inputs, - lib, - namespace, - pkgs, - ... -}: -let - inherit (inputs) pre-commit-hooks-nix; -in -pre-commit-hooks-nix.lib.${pkgs.system}.run { - src = ./.; - hooks = - let - excludes = [ - "flake.lock" - "*.md" - ]; - fail_fast = true; - verbose = true; - in - { - deadnix = { - enable = true; - - settings = { - edit = true; - }; - }; - - nixfmt = { - enable = true; - package = pkgs.nixfmt-rfc-style; - }; - - pre-commit-hook-ensure-sops.enable = true; - - prettier = { - enable = true; - inherit excludes fail_fast verbose; - - description = "pre-commit hook for prettier"; - settings = { - binPath = "${lib.getExe pkgs.prettierd}"; - write = true; - }; - }; - }; -} \ No newline at end of file diff --git a/treefmt.nix b/treefmt.nix index 3a5e9c4..81fd4ee 100644 --- a/treefmt.nix +++ b/treefmt.nix @@ -26,7 +26,7 @@ gofmt.enable = true; isort.enable = true; nixfmt.enable = true; - nufmt.enable = true; + # nufmt.enable = true; ruff-check.enable = true; ruff-format.enable = true; rustfmt.enable = true;