remove xeserv namespacing

Signed-off-by: Xe <me@christine.website>

2 files changed, 20 insertions, 42 deletions

diff --git a/flake.lock b/flake.lock
index a9fb8a3..0cf7cea 100644
--- a/flake.lock
+++ b/flake.lock
@@ -18,8 +18,12 @@
     },
     "gomod2nix": {
       "inputs": {
-        "nixpkgs": "nixpkgs",
-        "utils": "utils"
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "utils": [
+          "utils"
+        ]
       },
       "locked": {
         "lastModified": 1641803356,
@@ -37,22 +41,6 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1625191069,
-        "narHash": "sha256-M8/UH9pMgQEtuzY9bFwklYw8hx0pOKtUTyQC8E2UTHY=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "d8079260a3028ae3221d7a5467443ee3a9edd2b8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
         "lastModified": 1651007983,
         "narHash": "sha256-GNay7yDPtLcRcKCNHldug85AhAvBpTtPEJWSSDYBw8U=",
         "owner": "NixOS",
@@ -66,7 +54,7 @@
         "type": "indirect"
       }
     },
-    "nixpkgs_3": {
+    "nixpkgs_2": {
       "locked": {
         "lastModified": 1650161686,
         "narHash": "sha256-70ZWAlOQ9nAZ08OU6WY7n4Ij2kOO199dLfNlvO/+pf8=",
@@ -83,7 +71,7 @@
     },
     "portable-svc": {
       "inputs": {
-        "nixpkgs": "nixpkgs_3"
+        "nixpkgs": "nixpkgs_2"
       },
       "locked": {
         "lastModified": 1650586426,
@@ -104,28 +92,13 @@
       "inputs": {
         "ckiee": "ckiee",
         "gomod2nix": "gomod2nix",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs",
         "portable-svc": "portable-svc",
-        "utils": "utils_2"
+        "utils": "utils"
       }
     },
     "utils": {
       "locked": {
-        "lastModified": 1623875721,
-        "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "f7e004a55b120c02ecb6219596820fcd32ca8772",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "utils_2": {
-      "locked": {
         "lastModified": 1649676176,
         "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=",
         "owner": "numtide",
diff --git a/flake.nix b/flake.nix
index 077c765..9aa9f59 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,9 +4,14 @@
   inputs = {
     nixpkgs.url = "nixpkgs/nixos-unstable";
     utils.url = "github:numtide/flake-utils";
-    gomod2nix.url = "github:tweag/gomod2nix";
     portable-svc.url = "git+https://tulpa.dev/cadey/portable-svc.git?ref=main";
     ckiee.url = "github:ckiee/nixpkgs?ref=gpt2simple-py-init";
+
+    gomod2nix = {
+      url = "github:tweag/gomod2nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.utils.follows = "utils";
+      };
   };
 
   outputs = { self, nixpkgs, utils, gomod2nix, portable-svc, ckiee }@attrs:
@@ -127,7 +132,7 @@
                 options = "ro,relatime,errors=continue";
               }];
               systemd.services = {
-                "xeserv.robocadey" = {
+                "robocadey" = {
                   wantedBy = [ "multi-user.target" ];
                   description = "RoboCadey";
 
@@ -139,7 +144,7 @@
                     CacheDirectory = "xeserv.robocadey";
                   };
                 };
-                "xeserv.robocadey-gpt2" = {
+                "robocadey-gpt2" = {
                   wantedBy = [ "multi-user.target" ];
                   description = "RoboCadey GPT2 sidecar";
 
@@ -152,9 +157,9 @@
                   };
                 };
               };
-              systemd.sockets."xeserv.robocadey-gpt2" = {
+              systemd.sockets."robocadey-gpt2" = {
                 description = "RoboCadey GPT-2 activation socket";
-                partOf = "xeserv.robocadey-gpt2.service";
+                partOf = "robocadey-gpt2.service";
                 listenStreams = [ "/run/robocadey-gpt2.sock" ];
               };
             };