Merge pull request 'nix-rewrite' (#73) from nix-rewrite into main

good enough for now

.gitignore

@@ -22,4 +22,7 @@ target/
 *.log
 
 # debug
-.vscode/
+.vscode/
+
+# nix
+result/

flake.lock

@@ -38,16 +38,16 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1712439257,
+        "lastModified": 1712543224,
-        "narHash": "sha256-aSpiNepFOMk9932HOax0XwNxbA38GOUVOiXfUVPOrck=",
+        "narHash": "sha256-9RSfZL1TKYdGxZwgDxwtBtsKMGR4Zgn+DAnF9s71/lU=",
-        "owner": "nixos",
+        "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ff0dbd94265ac470dda06a657d5fe49de93b4599",
+        "rev": "b0dab7cc34ef4d8a1b2de36178da801090bcb271",
         "type": "github"
       },
       "original": {
-        "owner": "nixos",
+        "owner": "NixOS",
-        "ref": "nixos-unstable",
+        "ref": "nixpkgs-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -55,7 +55,8 @@
     "root": {
       "inputs": {
         "fenix": "fenix",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs_2",
+        "systems": "systems"
       }
     },
     "rust-analyzer-src": {
@@ -74,6 +75,21 @@
         "repo": "rust-analyzer",
         "type": "github"
       }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1689347949,
+        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "type": "github"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -1,39 +1,63 @@
 {
-  description = "forcebot_rs flake";
+  description = "A basic flake";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    systems.url = "github:nix-systems/default-linux";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
     fenix.url = "github:nix-community/fenix/monthly";
   };
+
   outputs = {
+    self,
+    systems,
     nixpkgs,
     fenix,
-    ...
   } @ inputs: let
-    system = "x86_64-linux";
+    eachSystem = nixpkgs.lib.genAttrs (import systems);
-    overlays = [fenix.overlays.default];
+    pkgsFor = eachSystem (system:
-    pkgs = import nixpkgs {
+      import nixpkgs {
-      inherit system overlays;
+        localSystem.system = system;
-    };
+        overlays = [fenix.overlays.default];
+      });
   in {
-    devShells.${system}.default = pkgs.mkShell {
+    packages = eachSystem (system: let
-      name = "forcebot_rs-devenv";
+      pkgs = nixpkgs.legacyPackages.${system};
-      nativeBuildInputs = [pkgs.pkg-config];
+      version = (builtins.fromTOML (builtins.readFile ./Cargo.toml)).package.version;
-      buildInputs = with pkgs; [openssl libiconv];
+    in {
-      packages = with pkgs; [
+      default = pkgsFor.${system}.rustPlatform.buildRustPackage {
-        nil
+        pname = "forcebot_rs";
-        alejandra
+        version = "${version}";
-        rust-analyzer-nightly
+
-        (fenix.packages.${system}.complete.withComponents [
+        src = self;
-          "cargo"
+
-          "clippy"
+        cargoLock = {
-          "rust-src"
+          lockFile = ./Cargo.lock;
-          "rustc"
+        };
-          "rustfmt"
+
-        ])
+        nativeBuildInputs = with pkgs; [pkg-config];
-      ];
+        buildInputs = with pkgs; [openssl];
-      RUST_BACKTRACE = 1;
+
-      RUST_SRC_PATH = "${fenix.packages.${system}.complete.rust-src}/lib/rustlib/src/rust/library";
+        doCheck = false;
-    };
+      };
+    });
+    devShells = eachSystem (system: {
+      default = pkgsFor.${system}.mkShell {
+        packages = with pkgsFor.${system}; [
+          nil
+          alejandra
+          rust-analyzer-nightly
+          (fenix.packages.${system}.complete.withComponents [
+            "cargo"
+            "clippy"
+            "rust-src"
+            "rustc"
+            "rustfmt"
+          ])
+        ];
+        RUST_BACKTRACE = 1;
+        RUST_SRC_PATH = "${fenix.packages.${system}.complete.rust-src}/lib/rustlib/src/rust/library";
+      };
+    });
+    nixosModules.default = import ./nix/module.nix {inherit self;};
   };
 }

nix/module.nix

@@ -0,0 +1,30 @@
+{self}: {
+  pkgs,
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib) types;
+  inherit (lib.modules) mkIf;
+  inherit (lib.options) mkOption mkEnableOption;
+  inherit (pkgs.stdenv.hostPlatform) system;
+  cfg = config.services.forcebot_rs;
+in {
+  options.services.forcebot_rs = {
+    enable = mkEnableOption ''
+      Enable forcebot
+    '';
+
+    package = mkOption {
+      type = types.package;
+      default = self.packages.${system}.default;
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.services.forcebot_rs = {
+      wantedBy = ["multi-user.target"];
+      serviceConfig.ExecStart = "${cfg.package}/bin/forcebot_rs";
+    };
+  };
+}