refactor: rewrite using flake-parts module for better flexibility

.github/dependabot.yml

@@ -3,5 +3,5 @@ updates:
   - package-ecosystem: github-actions
     directory: "/"
     schedule:
-      interval: daily
-    open-pull-requests-limit: 10
+      interval: monthly
+    open-pull-requests-limit: 10

.github/workflows/auto-upgrade-flakes.yaml

@@ -1,10 +1,8 @@
 name: "Auto update flake lock file"
-
 on:
   workflow_dispatch:
   schedule:
     - cron: "0 12 * * 0"
-
 jobs:
   createPullRequest:
     uses: loophp/flake-lock-update-workflow/.github/workflows/auto-upgrade-flakes.yaml@main

.github/workflows/flake-check.yaml

@@ -0,0 +1,14 @@
+name: "Nix flake check"
+on:
+  workflow_call:
+  pull_request:
+  push:
+jobs:
+  tests:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: cachix/install-nix-action@v31
+        with:
+          nix_path: nixpkgs=channel:nixos-unstable
+      - run: nix flake check --accept-flake-config

.gitignore

@@ -1,2 +1,3 @@
 /.direnv/
 /private.pem
+.pre-commit-config.yaml

README.md

@@ -1,7 +1,7 @@
 [![GitHub Workflow Status][github workflow status]][2]
- ![GitHub stars][github stars]
- ![License][mit]
- [![Donate!][donate github]][5]
+![GitHub stars][github stars]
+![License][mit]
+[![Donate!][donate github]][5]
 
 # Nix (dotfiles) configurations
 

hosts/minimac/system/modules.nix → _to_migrate/hosts/ec2/system/modules.nix

@@ -1,5 +1,5 @@
-{ ... }:
+
 {
-  sshd.enable = true;
   desktop.enable = true;
+  sshd.enable = true;
 }

hosts/elitebook820/home/default.nix → _to_migrate/hosts/elitebook820/home/default.nix

@@ -1,4 +1,4 @@
-{ ... }:
+
 {
   shell.enable = true;
   thunderbird.enable = true;

hosts/elitebook820/system/configuration.nix → _to_migrate/hosts/elitebook820/system/configuration.nix

@@ -1,4 +1,4 @@
-{ ... }:
+
 {
   # Use the GRUB 2 boot loader.
   # boot.loader.grub.enable = true;

hosts/router/system/modules.nix → _to_migrate/hosts/elitebook820/system/modules.nix

@@ -1,5 +1,5 @@
-{ ... }:
+
 {
-  sshd.enable = true;
   vpn.enable = true;
+  sshd.enable = true;
 }

hosts/imac/home/default.nix → _to_migrate/hosts/imac/home/default.nix

@@ -1,4 +1,4 @@
-{ ... }:
+
 {
   code.enable = true;
   desktop.enable = true;

hosts/imac/system/configuration.nix → _to_migrate/hosts/imac/system/configuration.nix

@@ -3,7 +3,6 @@
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
 { config, pkgs, ... }:
-
 {
   imports = [
     ./hardware-configuration.nix

hosts/imac/system/hardware-configuration.nix → _to_migrate/hosts/imac/system/hardware-configuration.nix

@@ -8,7 +8,6 @@
   modulesPath,
   ...
 }:
-
 {
   imports = [
     inputs.nixos-hardware.nixosModules.apple-imac-14-2

hosts/imac/system/modules.nix → _to_migrate/hosts/imac/system/modules.nix

@@ -1,4 +1,4 @@
-{ ... }:
+
 {
   sshd.enable = true;
   vpn.enable = true;

hosts/lw196205087/default.nix → _to_migrate/hosts/lw196205087/default.nix

@@ -1,4 +1,4 @@
-{ ... }:
+
 {
   imports = [
     ./home.nix

hosts/minimac/home/default.nix → _to_migrate/hosts/minimac/home/default.nix

@@ -1,4 +1,4 @@
-{ ... }:
+
 {
   code.enable = true;
   desktop.enable = true;

hosts/minimac/system/hardware-configuration.nix → _to_migrate/hosts/minimac/system/hardware-configuration.nix

@@ -5,7 +5,6 @@
   modulesPath,
   ...
 }:
-
 {
   imports = [
     inputs.nixos-hardware.nixosModules.apple-macmini-4-1

hosts/ec2/system/modules.nix → _to_migrate/hosts/minimac/system/modules.nix

@@ -1,5 +1,5 @@
-{ ... }:
+
 {
-  desktop.enable = true;
   sshd.enable = true;
+  desktop.enable = true;
 }

hosts/router/home/home.nix → _to_migrate/hosts/router/home/home.nix

@@ -1,4 +1,4 @@
-{ ... }:
+
 {
   shell.enable = true;
 }

hosts/router/system/caddy.nix → _to_migrate/hosts/router/system/caddy.nix

@@ -1,4 +1,4 @@
-{ ... }:
+
 {
   networking = {
     firewall = {

hosts/elitebook820/system/modules.nix → _to_migrate/hosts/router/system/modules.nix

@@ -1,5 +1,5 @@
-{ ... }:
+
 {
-  vpn.enable = true;
   sshd.enable = true;
+  vpn.enable = true;
 }

hosts/router/system/pi-hole.nix → _to_migrate/hosts/router/system/pi-hole.nix

@@ -1,4 +1,4 @@
-{ ... }:
+
 {
   services.caddy.virtualHosts."pi-hole.router.lan".extraConfig = ''
     tls internal

hosts/router/system/prometheus.old → _to_migrate/hosts/router/system/prometheus.old

@@ -1,4 +1,4 @@
-{ ... }:
+
 {
   services.prometheus = {
     enable = true;

flake.nix

@@ -5,34 +5,45 @@
     nixpkgs.url = "github:/nixos/nixpkgs/nixos-unstable";
     nixpkgs-master.url = "github:NixOS/nixpkgs/master";
     nixpkgs-unstable.url = "github:/nixos/nixpkgs/nixpkgs-unstable";
+
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
+
     home-manager.url = "github:nix-community/home-manager";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
+
     deploy-rs.url = "github:serokell/deploy-rs";
     deploy-rs.inputs.nixpkgs.follows = "nixpkgs";
+
     plasma-manager.url = "github:nix-community/plasma-manager";
     plasma-manager.inputs.nixpkgs.follows = "nixpkgs";
+
     nur.url = "github:nix-community/NUR";
+
     systems.url = "github:nix-systems/default";
+
     flake-parts.url = "github:hercules-ci/flake-parts";
+    flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs";
+
+    git-hooks.url = "github:cachix/git-hooks.nix";
+    git-hooks.inputs.nixpkgs.follows = "nixpkgs";
+
     nix-oracle-db.url = "github:drupol/nix-oracle-db";
-    nixos-generators = {
-      url = "github:nix-community/nixos-generators";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+
+    nixos-generators.url = "github:nix-community/nixos-generators";
+    nixos-generators.inputs.nixpkgs.follows = "nixpkgs";
+
     pkgs-by-name-for-flake-parts.url = "github:drupol/pkgs-by-name-for-flake-parts";
+
     nix-webapps.url = "github:TLATER/nix-webapps";
+
     import-tree.url = "github:vic/import-tree";
-  };
 
-  outputs =
-    inputs@{ flake-parts, ... }:
-    flake-parts.lib.mkFlake { inherit inputs; } {
-      systems = import inputs.systems;
+    nixos-facter-modules.url = "github:numtide/nixos-facter-modules";
+
+    treefmt-nix.url = "github:numtide/treefmt-nix";
+
+    make-shell.url = "github:nicknovitski/make-shell";
+  };
 
-      imports = [
-        inputs.pkgs-by-name-for-flake-parts.flakeModule
-        (inputs.import-tree ./imports)
-      ];
-    };
+  outputs = inputs: inputs.flake-parts.lib.mkFlake { inherit inputs; } (inputs.import-tree ./modules);
 }