Compare commits

..

No commits in common. "b1e010ca5325a00271b4663cf593a4ca09eb785b" and "29c198a205700fe8fea111c8c2230a6e99942954" have entirely different histories.

4 changed files with 16 additions and 64 deletions

1
.github/workflows/alejandra.toml vendored Normal file
View file

@ -0,0 +1 @@
indentation = "FourSpaces"

View file

@ -2,25 +2,22 @@
name: "Flake Check Action" name: "Flake Check Action"
run-name: "nfc" run-name: "nfc"
on: on:
workflow_dispatch: workflow_dispatch:
push: push:
pull_request: pull_request:
types: [ types: [opened,edited,synchronize,reopened]
opened,
edited,
synchronize,
reopened
]
jobs: jobs:
checker: checker:
runs-on: "ubuntu-latest" runs-on: "ubuntu-latest"
steps: steps:
- name: "Repo checkout" - name: "repo checkout"
uses: "actions/checkout" uses: "actions/checkout@v4"
- name: "Nix Package Manager install" - name: "nix install"
uses: "DeterminateSystems/nix-installer-action@v16" uses: "DeterminateSystems/nix-installer-action@v16"
- name: "Flake.lock checking" - name: "flake check"
uses: "DeterminateSystems/flake-checker-action@v5" uses: "DeterminateSystems/flake-checker-action@v5"
- name: "Formatter run" - name: "Deadnix check"
run: "nix fmt" run: "nix run flake:nixpkgs#deadnix -- ."
- name: "Alejandra check"
run: "nix run flake:nixpkgs#alejandra -- --check --experimental-config .github/workflows/alejandra.toml ."

5
.gitignore vendored
View file

@ -12,7 +12,4 @@ s0men0de-nix/
.vscode/ .vscode/
.obsidian/ .obsidian/
.trash/ .trash/
.zed/ .zed/
# for local purposes
.fmtconf/

View file

@ -223,45 +223,11 @@
home-manager, home-manager,
... ...
} @ inputs: { } @ inputs: {
formatter = {
x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.writeShellApplication {
name = "hand7sfmt";
runtimeInputs = with nixpkgs.legacyPackages.x86_64-linux; [
alejandra
statix
deadnix
];
text = ''
${nixpkgs.lib.getExe nixpkgs.legacyPackages.x86_64-linux.alejandra} \
--experimental-config \
${nixpkgs.legacyPackages.x86_64-linux.writeText "alejandra.toml" ''
indentation = "FourSpaces"
''} \
--check \
${self} && ${nixpkgs.lib.getExe nixpkgs.legacyPackages.x86_64-linux.statix} \
check \
--config \
${nixpkgs.legacyPackages.x86_64-linux.writeText "statix.toml" ''
disabled = [
"empty_pattern"
]
''} \
${self} && ${nixpkgs.lib.getExe nixpkgs.legacyPackages.x86_64-linux.deadnix} \
--fail \
${self}
'';
};
};
homeConfigurations = { homeConfigurations = {
hand7s = home-manager.lib.homeManagerConfiguration { hand7s = home-manager.lib.homeManagerConfiguration {
pkgs = nixpkgs.legacyPackages.x86_64-linux; pkgs = nixpkgs.legacyPackages.x86_64-linux;
extraSpecialArgs = { extraSpecialArgs = {
inherit inherit inputs self;
inputs
self
;
}; };
modules = [ modules = [
@ -279,10 +245,7 @@
s0mePC-nix = nixpkgs.lib.nixosSystem { s0mePC-nix = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = { specialArgs = {
inherit inherit inputs self;
inputs
self
;
}; };
modules = [ modules = [
"${self}/s0mePC-nix/default.nix" "${self}/s0mePC-nix/default.nix"
@ -299,10 +262,7 @@
s0meMiniPC-nix = nixpkgs.lib.nixosSystem { s0meMiniPC-nix = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = { specialArgs = {
inherit inherit inputs self;
inputs
self
;
}; };
modules = [ modules = [
"${self}/s0meMiniPC-nix/default.nix" "${self}/s0meMiniPC-nix/default.nix"
@ -334,10 +294,7 @@
s0melapt0p-nix = nixpkgs.lib.nixosSystem { s0melapt0p-nix = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = { specialArgs = {
inherit inherit inputs self;
inputs
self
;
}; };
modules = [ modules = [
"${self}/s0melapt0p-nix/default.nix" "${self}/s0melapt0p-nix/default.nix"