From 8bd11808e9add5fef508a5bc1af3aed896270d3a Mon Sep 17 00:00:00 2001 From: oqyude Date: Sun, 3 Aug 2025 11:44:03 +0000 Subject: [PATCH] zeroq migrate --- flake.lock | 632 ---------------------------------------- flake.nix | 2 +- modules/zeroq/flake.nix | 46 --- 3 files changed, 1 insertion(+), 679 deletions(-) delete mode 100644 flake.lock delete mode 100755 modules/zeroq/flake.nix diff --git a/flake.lock b/flake.lock deleted file mode 100644 index 9f89d0a..0000000 --- a/flake.lock +++ /dev/null @@ -1,632 +0,0 @@ -{ - "nodes": { - "aagl": { - "inputs": { - "flake-compat": [ - "flake-compat" - ], - "nixpkgs": [ - "nixpkgs" - ], - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1753980999, - "narHash": "sha256-ZRAHKUpth0uETeeoq9urCZgwvofHwxIuwsxqPWxvrpw=", - "owner": "ezKEa", - "repo": "aagl-gtk-on-nix", - "rev": "3699a592400f13aa5d9b025f120bc512b89d341f", - "type": "github" - }, - "original": { - "owner": "ezKEa", - "repo": "aagl-gtk-on-nix", - "type": "github" - } - }, - "disko": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1753140376, - "narHash": "sha256-7lrVrE0jSvZHrxEzvnfHFE/Wkk9DDqb+mYCodI5uuB8=", - "owner": "nix-community", - "repo": "disko", - "rev": "545aba02960caa78a31bd9a8709a0ad4b6320a5c", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "disko", - "type": "github" - } - }, - "flake-compat": { - "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-parts": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib" - }, - "locked": { - "lastModified": 1753121425, - "narHash": "sha256-TVcTNvOeWWk1DXljFxVRp+E0tzG1LhrVjOGGoMHuXio=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "644e0fc48951a860279da645ba77fe4a6e814c5e", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_2": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib_2" - }, - "locked": { - "lastModified": 1753121425, - "narHash": "sha256-TVcTNvOeWWk1DXljFxVRp+E0tzG1LhrVjOGGoMHuXio=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "644e0fc48951a860279da645ba77fe4a6e814c5e", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_3": { - "inputs": { - "nixpkgs-lib": [ - "nur", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "grub2-themes": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1753279958, - "narHash": "sha256-EJ1udnwKYgWeAJzncAccbLPtbSWiuIANryXTGI9nY6w=", - "owner": "vinceliuice", - "repo": "grub2-themes", - "rev": "6c26f99622cb1c705b3fe2dbe1eb88521096b25a", - "type": "github" - }, - "original": { - "owner": "vinceliuice", - "repo": "grub2-themes", - "type": "github" - } - }, - "home-manager": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1753983724, - "narHash": "sha256-2vlAOJv4lBrE+P1uOGhZ1symyjXTRdn/mz0tZ6faQcg=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "7035020a507ed616e2b20c61491ae3eaa8e5462c", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "musnix": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1741303672, - "narHash": "sha256-eRKbKccBu3PK/oJpmUuLo+0v45d0SEjosE8tVsHbpeA=", - "owner": "musnix", - "repo": "musnix", - "rev": "d56a15f30329f304151e4e05fa82264d127da934", - "type": "github" - }, - "original": { - "owner": "musnix", - "repo": "musnix", - "type": "github" - } - }, - "nix-gaming": { - "inputs": { - "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "lastModified": 1753841490, - "narHash": "sha256-rcaiQ9e/glv3s5aSYB3/y3T7cs9rY+G0TOixQZQVADA=", - "owner": "fufexan", - "repo": "nix-gaming", - "rev": "1b9569f6474bfc5b7257a8a4ba02d1f26e75f489", - "type": "github" - }, - "original": { - "owner": "fufexan", - "repo": "nix-gaming", - "type": "github" - } - }, - "nix-index-database": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1753589988, - "narHash": "sha256-y1JlcMB2dKFkrr6g+Ucmj8L//IY09BtSKTH/A7OU7mU=", - "owner": "nix-community", - "repo": "nix-index-database", - "rev": "f0736b09c43028fd726fb70c3eb3d1f0795454cf", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nix-index-database", - "type": "github" - } - }, - "nixos": { - "locked": { - "lastModified": 1753694789, - "narHash": "sha256-cKgvtz6fKuK1Xr5LQW/zOUiAC0oSQoA9nOISB0pJZqM=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "dc9637876d0dcc8c9e5e22986b857632effeb727", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixos-facter-modules": { - "locked": { - "lastModified": 1750412875, - "narHash": "sha256-uP9Xxw5XcFwjX9lNoYRpybOnIIe1BHfZu5vJnnPg3Jc=", - "owner": "numtide", - "repo": "nixos-facter-modules", - "rev": "14df13c84552a7d1f33c1cd18336128fbc43f920", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "nixos-facter-modules", - "type": "github" - } - }, - "nixos-hardware": { - "locked": { - "lastModified": 1753122741, - "narHash": "sha256-nFxE8lk9JvGelxClCmwuJYftbHqwnc01dRN4DVLUroM=", - "owner": "NixOS", - "repo": "nixos-hardware", - "rev": "cc66fddc6cb04ab479a1bb062f4d4da27c936a22", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "master", - "repo": "nixos-hardware", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1744536153, - "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-fingerprint": { - "locked": { - "lastModified": 1751274312, - "narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-last-unstable": { - "locked": { - "lastModified": 1752900028, - "narHash": "sha256-dPALCtmik9Wr14MGqVXm+OQcv7vhPBXcWNIOThGnB/Q=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "6b4955211758ba47fac850c040a27f23b9b4008f", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "6b4955211758ba47fac850c040a27f23b9b4008f", - "type": "github" - } - }, - "nixpkgs-lib": { - "locked": { - "lastModified": 1751159883, - "narHash": "sha256-urW/Ylk9FIfvXfliA1ywh75yszAbiTEVgpPeinFyVZo=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "14a40a1d7fb9afa4739275ac642ed7301a9ba1ab", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, - "nixpkgs-lib_2": { - "locked": { - "lastModified": 1751159883, - "narHash": "sha256-urW/Ylk9FIfvXfliA1ywh75yszAbiTEVgpPeinFyVZo=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "14a40a1d7fb9afa4739275ac642ed7301a9ba1ab", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, - "nixpkgs-master": { - "locked": { - "lastModified": 1754052933, - "narHash": "sha256-pCnkSQVLoFJy98pQ9Hn3c/SBDdn1KNQS7G0Jor92sR0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2a22aa335aa1dbaf9cf3565667fb2e798b265352", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "master", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1753749649, - "narHash": "sha256-+jkEZxs7bfOKfBIk430K+tK9IvXlwzqQQnppC2ZKFj4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1f08a4df998e21f4e8be8fb6fbf61d11a1a5076a", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-25.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1753934836, - "narHash": "sha256-G06FmIBj0I5bMW1Q8hAEIl5N7IHMK7+Ta4KA+BmneDA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "8679b16e11becd487b45d568358ddf9d5640d860", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1753432016, - "narHash": "sha256-cnL5WWn/xkZoyH/03NNUS7QgW5vI7D1i74g48qplCvg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "6027c30c8e9810896b92429f0092f624f7b1aace", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1753934836, - "narHash": "sha256-G06FmIBj0I5bMW1Q8hAEIl5N7IHMK7+Ta4KA+BmneDA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "8679b16e11becd487b45d568358ddf9d5640d860", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nur": { - "inputs": { - "flake-parts": "flake-parts_3", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1754038912, - "narHash": "sha256-b6BOg7d9lRDCrjy/OxAGwiHUBltxIP65hUjUebprBFY=", - "owner": "nix-community", - "repo": "NUR", - "rev": "dfb7cbaff97f38cf48b338cf621208a3d967deb2", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "NUR", - "type": "github" - } - }, - "nypkgs": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1752318989, - "narHash": "sha256-LGvFoDRGz3WXPk5pRkHjjy8Ibps875WnEY5UXBAOHKk=", - "owner": "yunfachi", - "repo": "nypkgs", - "rev": "b2ef58d561416baf0833482cf40e08300560185e", - "type": "github" - }, - "original": { - "owner": "yunfachi", - "repo": "nypkgs", - "type": "github" - } - }, - "plasma-manager": { - "inputs": { - "home-manager": [ - "home-manager" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1748196248, - "narHash": "sha256-1iHjsH6/5UOerJEoZKE+Gx1BgAoge/YcnUsOA4wQ/BU=", - "owner": "nix-community", - "repo": "plasma-manager", - "rev": "b7697abe89967839b273a863a3805345ea54ab56", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "plasma-manager", - "type": "github" - } - }, - "root": { - "inputs": { - "aagl": "aagl", - "disko": "disko", - "flake-compat": "flake-compat", - "flake-parts": "flake-parts", - "flake-utils": "flake-utils", - "grub2-themes": "grub2-themes", - "home-manager": "home-manager", - "musnix": "musnix", - "nix-gaming": "nix-gaming", - "nix-index-database": "nix-index-database", - "nixos": "nixos", - "nixos-facter-modules": "nixos-facter-modules", - "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_3", - "nixpkgs-fingerprint": "nixpkgs-fingerprint", - "nixpkgs-last-unstable": "nixpkgs-last-unstable", - "nixpkgs-master": "nixpkgs-master", - "nixpkgs-stable": "nixpkgs-stable", - "nixpkgs-unstable": "nixpkgs-unstable", - "nur": "nur", - "nypkgs": "nypkgs", - "plasma-manager": "plasma-manager", - "sops-nix": "sops-nix", - "zapret": "zapret", - "zeroq": "zeroq", - "zeroq-credentials": "zeroq-credentials" - } - }, - "rust-overlay": { - "inputs": { - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1753757591, - "narHash": "sha256-3okLvry8fRWZhJZP75pPC9P6U1dcu84VOCPhPLXYozI=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "b372cf71b4125d420d7648cbd898ab8f5c355be2", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "sops-nix": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1752544651, - "narHash": "sha256-GllP7cmQu7zLZTs9z0J2gIL42IZHa9CBEXwBY9szT0U=", - "owner": "Mic92", - "repo": "sops-nix", - "rev": "2c8def626f54708a9c38a5861866660395bb3461", - "type": "github" - }, - "original": { - "owner": "Mic92", - "repo": "sops-nix", - "type": "github" - } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "zapret": { - "locked": { - "lastModified": 1751371953, - "narHash": "sha256-akBIUsGMH4cOGPYfPbF77ZgZ0AmOHeIU0oG2TOKIecc=", - "owner": "oqyude", - "repo": "zapret-easyflake", - "rev": "c98995f2bfddcc369919b8984fd62faf4d48ab26", - "type": "github" - }, - "original": { - "owner": "oqyude", - "repo": "zapret-easyflake", - "type": "github" - } - }, - "zeroq": { - "locked": { - "path": "./modules/zeroq", - "type": "path" - }, - "original": { - "path": "./modules/zeroq", - "type": "path" - }, - "parent": [] - }, - "zeroq-credentials": { - "locked": { - "lastModified": 1753537856, - "narHash": "sha256-54AyySYrd9ZFL/RijcU0oqLvjAloJcwhkBOmyC78Jy0=", - "ref": "refs/heads/master", - "rev": "09c44ad915049ae4fb31869bf2539831e91ae148", - "revCount": 24, - "type": "git", - "url": "ssh://git@github.com/oqyude/zeroq-credentials.git" - }, - "original": { - "type": "git", - "url": "ssh://git@github.com/oqyude/zeroq-credentials.git" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/flake.nix b/flake.nix index e13ff10..1e01595 100755 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,7 @@ inputs = { # My - zeroq.url = "path:./modules/zeroq"; # flake of variables + zeroq.url = "git+ssh://git@github.com/oqyude/zeroq.git"; # flake of variables zeroq-credentials.url = "git+ssh://git@github.com/oqyude/zeroq-credentials.git"; # flake of creds zapret.url = "github:oqyude/zapret-easyflake"; # stupid flake of zapret diff --git a/modules/zeroq/flake.nix b/modules/zeroq/flake.nix deleted file mode 100755 index 44a9785..0000000 --- a/modules/zeroq/flake.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ - description = "zeroq structure flake"; - - outputs = - { self }: - - rec { - - nixos = "/etc/nixos"; - - devices = rec { - admin = "oqyude"; - laptop = { - hostname = "atoridu"; - }; - mini-laptop = { - hostname = "lamet"; - }; - server = { - username = "otreca"; - hostname = "sapphira"; - }; - vds.hostname = "otreca"; - wsl.hostname = "wsl"; - }; - - dirs = rec { - # User - user-home = "/home/${devices.admin}"; - user-storage = "${user-home}/Storage"; - therima-drive = "/mnt/therima"; - vetymae-drive = "/mnt/vetymae"; - - # Server - server-home = "/home/${devices.admin}/External"; - server-credentials = "${server-home}/Credentials/server"; - storage = "${server-home}/Storage"; - calibre-library = "${server-home}/Books-Library"; - music-library = "${dirs.user-home}/Music"; - immich-folder = "${server-home}/Services/immich"; - nextcloud-folder = "${server-home}/Services/nextcloud"; - postgresql-folder = "${server-home}/Services/postgresql"; - }; - }; - -}