feat: get my repos via flake

configs/packages.nix

@@ -49,12 +49,7 @@ let
     '';
   });
 
-  recht = pkgs.callPackage (pkgs.fetchFromGitHub {
+  recht = pkgs.callPackage <recht> {};
-    owner = "kmein";
-    repo = "recht";
-    rev = "0.6.2";
-    sha256 = "08gnrnz3lwh8h6fyga56yfy9qryzm89xbshm7wpxfyxf2pmp1qfx";
-  }) {};
 
 in {
   home-manager.users.me.home.file = {

configs/telegram-bots/default.nix

@@ -1,13 +1,6 @@
 { config, pkgs, lib, ... }:
 let
-  telebots = let
+  telebots = pkgs.callPackage <telebots> {};
-    telebots-package = pkgs.fetchFromGitHub {
-      owner = "kmein";
-      repo = "telebots";
-      rev = "22931c9457e092c4e413555dbe61819d77844246";
-      sha256 = "0byp3w6li3fin7ry0ki4rmgkaajdil424y5pc1j7ci9mpws0s5ik";
-    };
-  in pkgs.callPackage telebots-package {};
   reverseDirectory = "/run/telegram-reverse";
   proverbDirectory = "/run/telegram-proverb";
   inherit (import <niveum/lib>) tmpfilesConfig;

flake.lock

@@ -123,22 +123,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-mozilla": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1638887313,
-        "narHash": "sha256-FMYV6rVtvSIfthgC1sK1xugh3y7muoQcvduMdriz4ag=",
-        "owner": "mozilla",
-        "repo": "nixpkgs-mozilla",
-        "rev": "7c1e8b1dd6ed0043fb4ee0b12b815256b0b9de6f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "mozilla",
-        "repo": "nixpkgs-mozilla",
-        "type": "github"
-      }
-    },
     "nixpkgs-unstable": {
       "locked": {
         "lastModified": 1640874390,
@@ -155,6 +139,22 @@
         "type": "github"
       }
     },
+    "recht": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1619583518,
+        "narHash": "sha256-3eFw6xWue9cvPxXq1ROq32ecvPOmqOedgQhyOr7N9iE=",
+        "owner": "kmein",
+        "repo": "recht",
+        "rev": "d551afed23122bb3106e59eb2274394ec5555048",
+        "type": "github"
+      },
+      "original": {
+        "owner": "kmein",
+        "repo": "recht",
+        "type": "github"
+      }
+    },
     "retiolum": {
       "flake": false,
       "locked": {
@@ -180,10 +180,31 @@
         "menstruation-telegram": "menstruation-telegram",
         "nix-writers": "nix-writers",
         "nixpkgs": "nixpkgs",
-        "nixpkgs-mozilla": "nixpkgs-mozilla",
         "nixpkgs-unstable": "nixpkgs-unstable",
+        "recht": "recht",
         "retiolum": "retiolum",
-        "stockholm": "stockholm"
+        "scripts": "scripts",
+        "stockholm": "stockholm",
+        "telebots": "telebots",
+        "tinc-graph": "tinc-graph",
+        "traadfri": "traadfri",
+        "tuna": "tuna"
+      }
+    },
+    "scripts": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1639436812,
+        "narHash": "sha256-6CajvfDo7t4ANgjc7DxqH7lI3WRE4MK8q3mBKAjk80k=",
+        "owner": "kmein",
+        "repo": "scripts",
+        "rev": "d34a8161ba11135a45d3141dc9af482db945d63c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "kmein",
+        "repo": "scripts",
+        "type": "github"
       }
     },
     "stockholm": {
@@ -201,6 +222,70 @@
         "type": "git",
         "url": "https://cgit.lassul.us/stockholm"
       }
+    },
+    "telebots": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1623510321,
+        "narHash": "sha256-MxYNNL81RXZkYLd4IgiNTSo1X80kTuDzsdGNSA0f1y8=",
+        "owner": "kmein",
+        "repo": "telebots",
+        "rev": "22931c9457e092c4e413555dbe61819d77844246",
+        "type": "github"
+      },
+      "original": {
+        "owner": "kmein",
+        "repo": "telebots",
+        "type": "github"
+      }
+    },
+    "tinc-graph": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1639820904,
+        "narHash": "sha256-d4s2PulBGIIQXtX7blZz+Wnmij5dK/IrBcilNGjqZC4=",
+        "owner": "kmein",
+        "repo": "tinc-graph",
+        "rev": "1b9c69ffdbdab82d30a23e44f739feea63d94163",
+        "type": "github"
+      },
+      "original": {
+        "owner": "kmein",
+        "repo": "tinc-graph",
+        "type": "github"
+      }
+    },
+    "traadfri": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1640451803,
+        "narHash": "sha256-zS/b93uFpPM9basNP7ngmm+YjYV0IUQAmNghetHA6Ss=",
+        "owner": "kmein",
+        "repo": "traadfri",
+        "rev": "cf46bd09cd3263b90a09b0ca979aa705a4c3671c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "kmein",
+        "repo": "traadfri",
+        "type": "github"
+      }
+    },
+    "tuna": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1627117248,
+        "narHash": "sha256-OfqbWLblJY4BJlrCpn8EkHoP3baNJSDTbw45SPaX+0Q=",
+        "owner": "kmein",
+        "repo": "tuna",
+        "rev": "1cbed44069a3009738afdafecefe0a05316039a6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "kmein",
+        "repo": "tuna",
+        "type": "github"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -26,18 +26,15 @@
       url = "github:krebs/retiolum";
       flake = false;
     };
-    nixpkgs-mozilla = {
+
-      url = "github:mozilla/nixpkgs-mozilla";
+    menstruation-telegram = { url = "github:kmein/menstruation-telegram"; flake = false; };
-      flake = false;
+    traadfri = { url = "github:kmein/traadfri"; flake = false; };
-    };
+    menstruation-backend = { url = "github:kmein/menstruation.rs"; flake = false; };
-    menstruation-telegram = {
+    telebots = { url = "github:kmein/telebots"; flake = false; };
-      url = "github:kmein/menstruation-telegram";
+    recht = { url = "github:kmein/recht"; flake = false; };
-      flake = false;
+    tuna = { url = "github:kmein/tuna"; flake = false; };
-    };
+    scripts = { url = "github:kmein/scripts"; flake = false; };
-    menstruation-backend = {
+    tinc-graph = { url = "github:kmein/tinc-graph"; flake = false; };
-      url = "github:kmein/menstruation.rs";
-      flake = false;
-    };
   };
 
   outputs =
@@ -47,9 +44,14 @@
   , krops
   , menstruation-backend
   , menstruation-telegram
+  , telebots
+  , traadfri
+  , recht
+  , tuna
+  , scripts
+  , tinc-graph
   , nix-writers
   , nixpkgs
-  , nixpkgs-mozilla
   , nixpkgs-unstable
   , retiolum
   , stockholm
@@ -67,9 +69,15 @@
       stockholm.git = { url = "https://cgit.lassul.us/stockholm"; ref = stockholm.rev; };
       nix-writers.git = { url = "https://cgit.krebsco.de/nix-writers"; ref = nix-writers.rev; };
       retiolum.git = { url = "https://github.com/krebs/retiolum"; ref = retiolum.rev; };
-      nixpkgs-mozilla.git = { url = "https://github.com/mozilla/nixpkgs-mozilla"; ref = nixpkgs-mozilla.rev; };
+
+      traadfri.git = { url = "https://github.com/kmein/traadfri"; ref = tuna.rev; };
+      tuna.git = { url = "https://github.com/kmein/tuna"; ref = tuna.rev; };
+      telebots.git = { url = "https://github.com/kmein/telebots"; ref = telebots.rev; };
+      recht.git = { url = "https://github.com/kmein/recht"; ref = recht.rev; };
       menstruation-telegram.git = { url = "https://github.com/kmein/menstruation-telegram"; ref = menstruation-telegram.rev; };
       menstruation-backend.git = { url = "https://github.com/kmein/menstruation.rs"; ref = menstruation-backend.rev; };
+      scripts.git = { url = "https://github.com/kmein/scripts"; ref = scripts.rev; };
+      tinc-graph.git = { url = "https://github.com/kmein/tinc-graph"; ref = tinc-graph.rev; };
 
       system-secrets.pass = {
         dir = toString ~/.password-store;

modules/traadfri.nix

@@ -2,14 +2,7 @@
 with lib;
 let
   cfg = config.niveum.traadfri;
-  traadfri = let
+  traadfri = pkgs.callPackage <traadfri> {
-    traadfri-package = pkgs.fetchFromGitHub {
-      owner = "kmein";
-      repo = "traadfri";
-      rev = "cf46bd09cd3263b90a09b0ca979aa705a4c3671c";
-      sha256 = "0az9q38pl8fqk00488blhn6rhvwsw2wky3dbdlyz7945ggvxnbyd";
-    };
-  in pkgs.callPackage traadfri-package {
     libcoap = pkgs.callPackage <niveum/packages/libcoap.nix> { tls = true; };
   };
 in {

modules/tuna.nix

@@ -1,13 +1,7 @@
 { config, lib, pkgs, ... }:
 with lib;
 let
-  tuna-src = pkgs.fetchFromGitHub {
+  tuna = pkgs.callPackage <tuna> {};
-    owner = "kmein";
-    repo = "tuna";
-    rev = "1cbed44069a3009738afdafecefe0a05316039a6";
-    sha256 = "0i7vjzv4hf8fdz9j09cdnvfhyylh0izsdhjs4q0qw9g5nrc9pyir";
-  };
-  tuna = pkgs.callPackage tuna-src {};
   cfg = config.services.tuna;
 in {
   imports = [];

overlays/rust.nix

@@ -1 +0,0 @@
-import <nixpkgs-mozilla>

systems/makanek/names.nix

@@ -1,13 +1,7 @@
 { pkgs, lib, ... }:
 let
   port = 5703;
-  geogen = (pkgs.fetchFromGitHub {
+  geogen = pkgs.callPackage "${<scripts>}/onomastics" {};
-    owner = "kmein";
-    repo = "scripts";
-    rev = "8945430f27a8c6fd632dd35382cb094abe3543ff";
-    sha256 = "1djyxkynypxsrmdf6idgjszqpcgqyq607rrsvl58p2bpymmwibzb";
-  }) + "/onomastics";
-  inherit (pkgs.callPackage geogen {}) dependencyEnv;
 in
 {
   systemd.services.names = {
@@ -20,7 +14,7 @@ in
     script = ''
       cd $(mktemp -d)
       ln -s "${geogen}/wsgi.py" wsgi.py
-      ${dependencyEnv}/bin/gunicorn wsgi:app -b :${toString port}
+      ${geogen.dependencyEnv}/bin/gunicorn wsgi:app -b :${toString port}
     '';
   };
 

systems/makanek/retiolum-map.nix

@@ -7,13 +7,7 @@ let
   geo-ip-database = "${lib.head config.services.geoipupdate.settings.EditionIDs}.mmdb";
   geo-ip-database-path = "${config.services.geoipupdate.settings.DatabaseDirectory}/${geo-ip-database}";
 
-  tinc-graph-source = pkgs.fetchFromGitHub {
+  tinc-graph = pkgs.callPackage <tinc-graph> {};
-    owner = "kmein";
-    repo = "tinc-graph";
-    rev = "1b9c69ffdbdab82d30a23e44f739feea63d94163";
-    sha256 = "0bk4x9l399f80lmz4asx7s5fcsgrfdb6xyymbq884621x4z3d2vp";
-  };
-  tinc-graph = pkgs.callPackage tinc-graph-source {};
 in
 {
   systemd.services.retiolum-index = {