summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flake.nix101
-rw-r--r--src/assets/gifs/index.ts20
-rw-r--r--src/styles/main.css2
3 files changed, 64 insertions, 59 deletions
diff --git a/flake.nix b/flake.nix
index 66dd943..65ee21f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -25,62 +25,69 @@
};
outputs = inputs:
- inputs.flake-parts.lib.mkFlake { inherit inputs; } {
- imports = with inputs; [ treefmt-nix.flakeModule pre-commit.flakeModule ];
+ inputs.flake-parts.lib.mkFlake {inherit inputs;} {
+ imports = with inputs; [
+ treefmt-nix.flakeModule
+ pre-commit.flakeModule
+ ];
- systems =
- [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
+ systems = [
+ "x86_64-linux"
+ "aarch64-linux"
+ "x86_64-darwin"
+ "aarch64-darwin"
+ ];
- perSystem = { lib, pkgs, config, self', ... }:
- let
- nodejs-slim = pkgs.nodejs-slim_20; # this should be the current lts
+ perSystem = {
+ lib,
+ pkgs,
+ config,
+ self',
+ ...
+ }: let
+ nodejs-slim = pkgs.nodejs-slim_20; # this should be the current lts
+ corepack = pkgs.corepack_20;
- enableAll = lib.flip lib.genAttrs (lib.const { enable = true; });
- in {
- treefmt = {
- projectRootFile = ".git/config";
+ enableAll = lib.flip lib.genAttrs (lib.const {enable = true;});
+ in {
+ treefmt = {
+ projectRootFile = ".git/config";
- programs = enableAll [ "deadnix" "nixfmt" "prettier" ];
+ programs = enableAll ["alejandra" "deadnix" "prettier"];
- settings.global = {
- excludes = [
- "./node_modules/*"
- "./dist/*"
- "./.astro/*"
- "flake.lock"
- "pnpm-lock.yaml"
- ];
- };
- };
-
- pre-commit.settings = {
- settings.treefmt.package = config.treefmt.build.wrapper;
-
- hooks = enableAll [
- "actionlint"
- "eclint"
- "eslint"
- "markdownlint"
- "nil"
- "statix"
- "treefmt"
+ settings.global = {
+ excludes = [
+ "./node_modules/*"
+ "./dist/*"
+ "./.astro/*"
+ "flake.lock"
+ "pnpm-lock.yaml"
];
};
+ };
- devShells.default = pkgs.mkShellNoCC {
- shellHook = config.pre-commit.installationScript;
- packages = [
- self'.formatter
- nodejs-slim
- # use pnpm from package.json
- (pkgs.runCommand "corepack-enable" {
- nativeBuildInputs = [ nodejs-slim ];
- } ''
- mkdir -p $out/bin
- corepack enable --install-directory $out/bin
- '')
- ];
+ pre-commit.settings.hooks =
+ (enableAll [
+ "actionlint"
+ "eclint"
+ "eslint"
+ "nil"
+ "statix"
+ "treefmt"
+ ])
+ // {
+ treefmt.package = config.treefmt.build.wrapper;
};
+
+ devShells.default = pkgs.mkShellNoCC {
+ shellHook = config.pre-commit.installationScript;
+ packages = [
+ self'.formatter
+ nodejs-slim
+ # use pnpm from package.json
+ corepack
+ ];
};
+ };
};
}
diff --git a/src/assets/gifs/index.ts b/src/assets/gifs/index.ts
index 58fa23d..0525584 100644
--- a/src/assets/gifs/index.ts
+++ b/src/assets/gifs/index.ts
@@ -8,19 +8,19 @@ import steam from "./steam.gif";
import weezer from "./weezer.gif";
interface Gif {
- image: ImageMetadata;
- alt: string;
+ image: ImageMetadata;
+ alt: string;
}
const gifs: Gif[] = [
- { image: acab, alt: "ACAB!" },
- { image: arnold, alt: "Hey Arnold!" },
- { image: capitalism, alt: "Let's crush capitalism!" },
- { image: legalize, alt: "Legalize marijuana now!" },
- { image: poweredByNix, alt: "Powered by NixOS" },
- { image: pride, alt: "LGBTQ Pride now!" },
- { image: steam, alt: "Play on Steam!" },
- { image: weezer, alt: "Weezer fan" }
+ { image: acab, alt: "ACAB!" },
+ { image: arnold, alt: "Hey Arnold!" },
+ { image: capitalism, alt: "Let's crush capitalism!" },
+ { image: legalize, alt: "Legalize marijuana now!" },
+ { image: poweredByNix, alt: "Powered by NixOS" },
+ { image: pride, alt: "LGBTQ Pride now!" },
+ { image: steam, alt: "Play on Steam!" },
+ { image: weezer, alt: "Weezer fan" },
];
export default gifs;
diff --git a/src/styles/main.css b/src/styles/main.css
index 974dd5c..89789c2 100644
--- a/src/styles/main.css
+++ b/src/styles/main.css
@@ -10,7 +10,6 @@
body {
background-color: var(--background-color);
font-family: var(--primary-font), system-ui;
-;
line-height: 1.5rem;
margin-left: auto;
margin-right: auto;
@@ -72,4 +71,3 @@ footer {
display: flex;
}
}
-