change srht builds for hydra, refactor flake

.build.yml

@@ -1,16 +0,0 @@
-image: nixos/unstable
-packages:
-  - nixos.cachix
-environment:
-  NIX_CONFIG: "experimental-features = nix-command flakes"
-secrets:
-  - f2907d38-97b4-4e7d-9fb9-57b3fb0135af
-tasks:
-- setup_cachix: |
-    cat ~/.cachix_token | cachix authtoken --stdin
-    cachix use misterio
-- build: |
-    cd disconic
-    nix --quiet build
-- upload_cachix: |
-    nix path-info disconic/result/ -r | cachix push misterio

.hydra.json

@@ -0,0 +1,14 @@
+{
+   "main": {
+        "enabled": 1,
+        "type": 1,
+        "hidden": false,
+        "description": "Build main branch",
+        "flake": "github:misterio77/disconic/main",
+        "checkinterval": 60,
+        "schedulingshares": 10,
+        "enableemail": false,
+        "emailoverride": "",
+        "keepnr": 1
+    }
+}

flake.lock

@@ -18,41 +18,7 @@
     },
     "root": {
       "inputs": {
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs"
-        "utils": "utils"
-      }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "utils": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1685518550,
-        "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
       }
     }
   },

flake.nix

@@ -1,49 +1,35 @@
 {
   description = "Discord bot for interacting with subsonic music libraries";
 
-  inputs = {
+  nixConfig = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
+    extra-substituters = [ "https://cache.m7.rs" ];
-    utils.url = "github:numtide/flake-utils";
+    extra-trusted-public-keys =
+      [ "cache.m7.rs:kszZ/NSwE/TjhOcPPQ16IuUiuRSisdiIwhKZCxguaWg=" ];
   };
 
-  outputs = { self, nixpkgs, utils }:
+  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
+
+  outputs = { self, nixpkgs }:
     let
-      name = "disconic";
+      forAllSystems = nixpkgs.lib.genAttrs [ "x86_64-linux" "aarch64-linux" ];
-      overlay = final: prev: {
+      forAllPkgs = f: forAllSystems (sys: f pkgsFor.${sys});
-        ${name} = final.callPackage ./default.nix { };
+      pkgsFor = nixpkgs.legacyPackages;
+    in {
+      nixosModules.default = import ./module.nix;
+
+      overlays.default = final: _prev: {
+        disconic = final.callPackage ./default.nix { };
       };
-      overlays = [ overlay ];
-    in
-    rec {
-      inherit overlay overlays;
 
-      nixosModules."${name}" = import ./module.nix;
+      packages = forAllPkgs (pkgs: {
-      nixosModule = nixosModules."${name}";
+        default = pkgs.callPackage ./default.nix { };
-    } //
+      });
-    (utils.lib.eachDefaultSystem (system:
-      let
-        pkgs = (import nixpkgs { inherit system overlays; });
-      in
-      rec {
-        # nix build
-        packages.${name} = pkgs.${name};
-        defaultPackage = packages.${name};
 
-        # nix run
+      devShells = forAllPkgs (pkgs: {
-        apps.${name} = utils.lib.mkApp { drv = packages.${name}; };
+        inputsFrom = [( pkgs.callPackage ./default.nix { })];
-        defaultApp = apps.${name};
+        buildInputs = with pkgs; [ clippy rust-analyzer rustc rustfmt ];
+      });
 
-        # nix develop
+      hydraJobs = self.outputs.packages;
-        devShell = pkgs.mkShell {
+    };
-          inputsFrom = [ defaultPackage ];
-          buildInputs = with pkgs;
-            [
-              clippy
-              rust-analyzer
-              rustc
-              rustfmt
-            ];
-        };
-      }
-    ));
 }