diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 3123bc8..3e4234e 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -17,7 +17,7 @@ repos: - id: mixed-line-ending - id: trailing-whitespace - repo: https://github.com/adrienverge/yamllint.git - rev: v1.37.1 + rev: v1.38.0 hooks: - id: yamllint args: @@ -32,7 +32,7 @@ repos: document-start: false line-length: false - repo: https://github.com/NixOS/nixfmt - rev: v1.1.0 + rev: v1.2.0 hooks: - id: nixfmt-nix - repo: https://github.com/astro/deadnix diff --git a/darwin/default.nix b/darwin/default.nix index bfc1b09..0e927dd 100644 --- a/darwin/default.nix +++ b/darwin/default.nix @@ -37,11 +37,4 @@ let ++ lib.optionals (builtins.pathExists ./hosts/${name}) [ ./hosts/${name} ]; }; in -( - lib.genAttrs - (builtins.attrNames (builtins.readDir ./hosts)) - ( - name: - mac { inherit name; } - ) -) +(lib.genAttrs (builtins.attrNames (builtins.readDir ./hosts)) (name: mac { inherit name; })) diff --git a/darwin/hosts/lithic/default.nix b/darwin/hosts/lithic/default.nix index f1aa2b0..7d1a96f 100644 --- a/darwin/hosts/lithic/default.nix +++ b/darwin/hosts/lithic/default.nix @@ -1,4 +1,4 @@ -{ config, ... }: +{ ... }: let username = "greg"; in diff --git a/home/baseline/ssh.nix b/home/baseline/ssh.nix index 184609d..44f431c 100644 --- a/home/baseline/ssh.nix +++ b/home/baseline/ssh.nix @@ -5,7 +5,7 @@ # This allows things like SSH in distrobox to read the config file just fine home.file.".ssh/config" = { target = ".ssh/config_source"; - onChange = ''cat ~/.ssh/config_source > ~/.ssh/config && chmod 600 ~/.ssh/config''; + onChange = "cat ~/.ssh/config_source > ~/.ssh/config && chmod 600 ~/.ssh/config"; }; programs.ssh = { enable = true; diff --git a/home/default.nix b/home/default.nix index 17b79d8..e71ab90 100644 --- a/home/default.nix +++ b/home/default.nix @@ -10,7 +10,8 @@ let let inherit (metadata.hosts.${host}) system; pkgs = nixpkgs.${system}; - username = if builtins.hasAttr "user" metadata.hosts.${host} then metadata.hosts.${host}.user else "greg"; + username = + if builtins.hasAttr "user" metadata.hosts.${host} then metadata.hosts.${host}.user else "greg"; in top.hmunstable.lib.homeManagerConfiguration { inherit pkgs; @@ -31,8 +32,4 @@ let }; }; in -( - lib.genAttrs - (builtins.attrNames (builtins.readDir ./hosts)) - user -) +(lib.genAttrs (builtins.attrNames (builtins.readDir ./hosts)) user) diff --git a/home/hosts/lithic/default.nix b/home/hosts/lithic/default.nix index 16e110b..d8caec5 100644 --- a/home/hosts/lithic/default.nix +++ b/home/hosts/lithic/default.nix @@ -4,9 +4,11 @@ ... }: let - python = pkgs.python312.withPackages (p: with p; [ - ipython - ]); + python = pkgs.python312.withPackages ( + p: with p; [ + ipython + ] + ); in { # Disables hitting local cache @@ -32,13 +34,15 @@ in podman poetry pre-commit - (pulumi.withPackages (p: with p; [ - pulumi-aws-native - pulumi-command - pulumi-go - pulumi-nodejs - pulumi-python - ])) + (pulumi.withPackages ( + p: with p; [ + pulumi-aws-native + pulumi-command + pulumi-go + pulumi-nodejs + pulumi-python + ] + )) python rustc terraform diff --git a/manifests/gitea/dump-cronjob.yaml b/manifests/gitea/dump-cronjob.yaml index ff2261a..51e75e7 100644 --- a/manifests/gitea/dump-cronjob.yaml +++ b/manifests/gitea/dump-cronjob.yaml @@ -76,4 +76,3 @@ spec: secretKeyRef: name: gitea-config key: minio_secret - diff --git a/modules/nix-conf.nix b/modules/nix-conf.nix index f574b84..5e8ee08 100644 --- a/modules/nix-conf.nix +++ b/modules/nix-conf.nix @@ -58,12 +58,17 @@ in "gregory.hellings" ]; # For home and for work machines substituters = - (if cfg.cache then [ - #"http://chronicles.shire-zebra.ts.net:9000/binary-cache/" - "http://nas1.shire-zebra.ts.net:8080/default" - ] else [ - "http://nas1.thehellings.lan:8080/default" - ]) + ( + if cfg.cache then + [ + #"http://chronicles.shire-zebra.ts.net:9000/binary-cache/" + "http://nas1.shire-zebra.ts.net:8080/default" + ] + else + [ + "http://nas1.thehellings.lan:8080/default" + ] + ) ++ [ "https://ai.cachix.org" "https://nixpkgs-python.cachix.org" diff --git a/modules/nixos/proxy.nix b/modules/nixos/proxy.nix index 46cc37b..f7bc25a 100644 --- a/modules/nixos/proxy.nix +++ b/modules/nixos/proxy.nix @@ -54,7 +54,7 @@ with lib; target = mkOption { type = types.str; - description = ''The destination that is being proxied.''; + description = "The destination that is being proxied."; example = "http://localhost:8080"; };