Working pushes from plato

fudo-home

@@ -1 +1 @@
-Subproject commit 15306957073a2f049b4f4d930def25678bedb75f
+Subproject commit 330d0a014f14b2cf65aeb853729f779ce4edb0a7

fudo-nixos

@@ -1 +1 @@
-Subproject commit 5a48c78b48a85761638e7653da549aa70989d3f1
+Subproject commit 9c024fd9ee08d518889da6bdf3f8cc301c027e79

fudo-pkgs

@@ -1 +1 @@
-Subproject commit 3304caa8ee5891d05320375b5dc825871e53172d
+Subproject commit 160807215cf9158605b072c54a9b682522d62989

seattle/flake.lock

@@ -220,14 +220,17 @@
       "inputs": {
         "doom-emacs": "doom-emacs",
         "home-manager": "home-manager",
-        "niten-doom-config": "niten-doom-config"
+        "niten-doom-config": "niten-doom-config",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
-        "lastModified": 1633928169,
+        "lastModified": 1634065164,
-        "narHash": "sha256-0QkeChztxULh/gSpwsWrALEHvPad3mN/VZZDNb7iTCQ=",
+        "narHash": "sha256-r32yoecnAuM1aDLtOIW89IYD9gve+HF8PEtA1s0SA5g=",
         "ref": "flake",
-        "rev": "583d19499094c8dd9acf0c636418e1eeff5b674b",
+        "rev": "330d0a014f14b2cf65aeb853729f779ce4edb0a7",
-        "revCount": 33,
+        "revCount": 34,
         "type": "git",
         "url": "https://git.fudo.org/niten/nix-home.git"
       },
@@ -240,13 +243,18 @@
     "fudo-nixos": {
       "flake": false,
       "locked": {
-        "narHash": "sha256-VhhiCLopW4wu7g2VlmlPfhsWlW1ONaJ3DCCvh6VTJuY=",
+        "lastModified": 1634085263,
-        "path": "/state/nixops/fudo-nixos",
+        "narHash": "sha256-GLqlf0rgdHEmLhXIrJsQF9uEl+1kB8BTXasCxo0Vglo=",
-        "type": "path"
+        "ref": "nixops-flake",
+        "rev": "9c024fd9ee08d518889da6bdf3f8cc301c027e79",
+        "revCount": 287,
+        "type": "git",
+        "url": "ssh://fudo_git@git.fudo.org:2222/fudosys/NixOS.git"
       },
       "original": {
-        "path": "/state/nixops/fudo-nixos",
+        "ref": "nixops-flake",
-        "type": "path"
+        "type": "git",
+        "url": "ssh://fudo_git@git.fudo.org:2222/fudosys/NixOS.git"
       }
     },
     "fudo-pkgs": {
@@ -274,18 +282,21 @@
         "ssh-keypairs": "ssh-keypairs"
       },
       "locked": {
-        "narHash": "sha256-bkhdakhqENnGRUJwEShOwtgRep/gn8UN2oDoeLkJ0bo=",
+        "narHash": "sha256-nUKoSR+Xpl+pm/iVu8vOL0MmgKDb2bBdA86P+2d8g6U=",
-        "path": "/state/secrets",
+        "path": "/home/niten/secrets",
         "type": "path"
       },
       "original": {
-        "path": "/state/secrets",
+        "path": "/home/niten/secrets",
         "type": "path"
       }
     },
     "home-manager": {
       "inputs": {
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": [
+          "fudo-home",
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1633291410,
@@ -363,20 +374,6 @@
       }
     },
     "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1633381874,
-        "narHash": "sha256-RkoVeo4K1IKqQzCI9W28UOyw4ic3Lhb3XoMDFDp7X74=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "35b808214a1ca158a04d6980cb95cc1a77ce1f94",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs_3": {
       "locked": {
         "lastModified": 1633853057,
         "narHash": "sha256-TUf/NYJlIw7wVMLFt5G4TRwtrnbz+uuXtTEbulxxI8Y=",
@@ -509,7 +506,7 @@
         "fudo-nixos": "fudo-nixos",
         "fudo-pkgs": "fudo-pkgs",
         "fudo-secrets": "fudo-secrets",
-        "nixpkgs": "nixpkgs_3"
+        "nixpkgs": "nixpkgs_2"
       }
     },
     "rotate-text": {

seattle/flake.nix

@@ -9,7 +9,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    fudo-secrets.url = "path:/state/secrets";
+    fudo-secrets.url = "path:/home/niten/secrets";
 
     #fudo-pkgs.url = "path:/state/nixops/fudo-pkgs";
 
@@ -17,7 +17,7 @@
 
     fudo-nixos = {
       #url = "path:/state/nixops/fudo-nixos";
-      url = "git+ssh://git.fudo.org/fudosys/NixOS.git?ref=nixops-flake";
+      url = "git+ssh://fudo_git@git.fudo.org:2222/fudosys/NixOS.git?ref=nixops-flake";
       # Don't import it as a flake
       flake = false;
     };