.gitignore

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

flake.lock

@@ -38,16 +38,16 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1712543224,
-        "narHash": "sha256-9RSfZL1TKYdGxZwgDxwtBtsKMGR4Zgn+DAnF9s71/lU=",
-        "owner": "NixOS",
+        "lastModified": 1712439257,
+        "narHash": "sha256-aSpiNepFOMk9932HOax0XwNxbA38GOUVOiXfUVPOrck=",
+        "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "b0dab7cc34ef4d8a1b2de36178da801090bcb271",
+        "rev": "ff0dbd94265ac470dda06a657d5fe49de93b4599",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
+        "owner": "nixos",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -55,8 +55,7 @@
     "root": {
       "inputs": {
         "fenix": "fenix",
-        "nixpkgs": "nixpkgs_2",
-        "systems": "systems"
+        "nixpkgs": "nixpkgs_2"
       }
     },
     "rust-analyzer-src": {
@@ -75,21 +74,6 @@
         "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,63 +1,39 @@
 {
-  description = "A basic flake";
+  description = "forcebot_rs flake";
 
   inputs = {
-    systems.url = "github:nix-systems/default-linux";
-    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     fenix.url = "github:nix-community/fenix/monthly";
   };
-
   outputs = {
-    self,
-    systems,
     nixpkgs,
     fenix,
+    ...
   } @ inputs: let
-    eachSystem = nixpkgs.lib.genAttrs (import systems);
-    pkgsFor = eachSystem (system:
-      import nixpkgs {
-        localSystem.system = system;
-        overlays = [fenix.overlays.default];
-      });
+    system = "x86_64-linux";
+    overlays = [fenix.overlays.default];
+    pkgs = import nixpkgs {
+      inherit system overlays;
+    };
   in {
-    packages = eachSystem (system: let
-      pkgs = nixpkgs.legacyPackages.${system};
-      version = (builtins.fromTOML (builtins.readFile ./Cargo.toml)).package.version;
-    in {
-      default = pkgsFor.${system}.rustPlatform.buildRustPackage {
-        pname = "forcebot_rs";
-        version = "${version}";
-
-        src = self;
-
-        cargoLock = {
-          lockFile = ./Cargo.lock;
-        };
-
-        nativeBuildInputs = with pkgs; [pkg-config];
-        buildInputs = with pkgs; [openssl];
-
-        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;};
+    devShells.${system}.default = pkgs.mkShell {
+      name = "forcebot_rs-devenv";
+      nativeBuildInputs = [pkgs.pkg-config];
+      buildInputs = with pkgs; [openssl libiconv];
+      packages = with pkgs; [
+        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";
+    };
   };
 }

nix/module.nix

@@ -1,30 +0,0 @@
-{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";
-    };
-  };
-}