From 64305b10ddae8c68ffcdc49809545d8ed8acb959 Mon Sep 17 00:00:00 2001
From: 4o1x5 <4o1x5@4o1x5.dev>
Date: Tue, 28 May 2024 23:42:05 +0200
Subject: [PATCH] flake done?

---
 .gitignore          |  2 ++
 .hydra/project.json | 29 -----------------------------
 flake.nix           | 17 +++++++++--------
 readme.md           | 23 +++++++++++++++++++++++
 result              |  2 +-
 test.hjson          |  0
 6 files changed, 35 insertions(+), 38 deletions(-)
 create mode 100644 .gitignore
 delete mode 100644 .hydra/project.json
 create mode 100644 readme.md
 delete mode 100644 test.hjson

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..7141f51
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+result/*
+result
\ No newline at end of file
diff --git a/.hydra/project.json b/.hydra/project.json
deleted file mode 100644
index bf2c214..0000000
--- a/.hydra/project.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "enabled": 1,
-    "hidden": false,
-    "description": "Server",
-    "nixexprinput": "generator",
-    "nixexprpath": "flake.nix",
-    "checkinterval": 300,
-    "schedulingshares": 100,
-    "enableemail": false,
-    "emailoverride": "",
-    "keepnr": 3,
-    "inputs": {
-        "main": {
-            "type": "git",
-            "value": "https://git.4o1x5.dev/learningpulse/server.git dev",
-            "emailresponsible": false,
-
-            "gitea_repo_name": "server",
-            "gitea_repo_owner": "learningpulse",
-            "gitea_status_repo": "dev",
-            "gite_http_url": "https://git.4o1x5.dev"
-        },
-        "nixpkgs": {
-            "type": "git",
-            "value": "https://github.com/NixOS/nixpkgs.git nixos-unstable",
-            "emailresponsible": false
-        }
-    }
-}
\ No newline at end of file
diff --git a/flake.nix b/flake.nix
index b5ef539..7a86d72 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,7 +5,6 @@
   };
   outputs = { self, nixpkgs, ... }:
     let
-
       # TODO add more systems
       system = "x86_64-linux";
       pkgs = import nixpkgs { inherit system; };
@@ -30,12 +29,13 @@
 
             installPhase = ''
               mkdir -p $out/bin $out/share/${pname}
-              install -Dm644 ${pname}/target/${pname}-${version}.jar $out/share/${pname}-${version}
+              install -Dm644 ${pname}/target/${pname}-${version}.jar $out/share/${pname}
 
-              makeWrapper ${pkgs.jre8}/bin/java $out/bin/${pname}- \
+              makeWrapper ${pkgs.jre8}/bin/java $out/bin/${pname} \
                 --add-flags "-jar $out/share/${pname}/${pname}-${version}.jar"
             '';
           };
+
           learningpulse-eureka = pkgs.maven.buildMavenPackage rec {
             pname = "eureka";
             version = "0.0.1";
@@ -48,9 +48,9 @@
 
             installPhase = ''
               mkdir -p $out/bin $out/share/${pname}
-              install -Dm644 ${pname}/target/${pname}-${version}.jar $out/share/${pname}-${version}
+              install -Dm644 ${pname}/target/${pname}-${version}.jar $out/share/${pname}
 
-              makeWrapper ${pkgs.jre8}/bin/java $out/bin/${pname}- \
+              makeWrapper ${pkgs.jre8}/bin/java $out/bin/${pname} \
                 --add-flags "-jar $out/share/${pname}/${pname}-${version}.jar"
             '';
           };
@@ -64,17 +64,18 @@
             mvnHash = "sha256-YCK1Qujgx73cZdEx2mRip+y+66px5TxL247fBIMyoy4=";
 
             nativeBuildInputs = buildPackages;
-
             installPhase = ''
               mkdir -p $out/bin $out/share/${pname}
-              install -Dm644 ${pname}/target/${pname}-${version}.jar $out/share/${pname}-${version}
+              install -Dm644 ${pname}/target/${pname}-${version}.jar $out/share/${pname}
 
-              makeWrapper ${pkgs.jre8}/bin/java $out/bin/${pname}- \
+              makeWrapper ${pkgs.jre8}/bin/java $out/bin/${pname} \
                 --add-flags "-jar $out/share/${pname}/${pname}-${version}.jar"
             '';
+
           };
         };
 
+
       hydraJobs = {
         inherit (self)
           packages;
diff --git a/readme.md b/readme.md
new file mode 100644
index 0000000..a6fde47
--- /dev/null
+++ b/readme.md
@@ -0,0 +1,23 @@
+# LearningPulse server
+
+## CI/CD
+
+To check up on builds head to [the hydra server](https://hydra.4o1x5.dev/project/learningpulse)
+
+### Enter developer shell
+
+```bash
+nix develop
+```
+
+### Build services
+
+```bash
+nix build .#learningpulse-dummy
+```
+
+### Run service
+
+```bash
+nix develop && cd dummy && mvn run spring-boot:run
+```
diff --git a/result b/result
index 6be4ed6..9053ccf 120000
--- a/result
+++ b/result
@@ -1 +1 @@
-/nix/store/v6lrgj18jgvwli3irsdabgj5nc712gfc-gateway-0.0.1
\ No newline at end of file
+/nix/store/zmnh05nkqyynsmshiqfhq28bj9iiww0i-gateway-0.0.1
\ No newline at end of file
diff --git a/test.hjson b/test.hjson
deleted file mode 100644
index e69de29..0000000