nix machine / user configurations

refactor(wolumonde): dont use flake for website

ptr.pet 870e7116 d78f744c

verified
Changed files
+48 -128
hosts
wolumonde
modules
+41 -125
flake.lock
···
}
},
"blog": {
-
"inputs": {
-
"naked-shell": "naked-shell",
-
"nixpkgs": "nixpkgs",
-
"parts": "parts",
-
"systems": "systems_2"
-
},
"locked": {
-
"lastModified": 1751972122,
-
"narHash": "sha256-Vd6nHL7IkTRPOHRvwmyYTxa02swJRBCUj0wLX/lFoZM=",
"ref": "refs/heads/svelte",
-
"rev": "7621b84386032e8cc6726ef1fd5f2c28f245000e",
-
"revCount": 513,
"type": "git",
"url": "https://git.gaze.systems/90008/website.git"
},
···
},
"flake-utils": {
"inputs": {
-
"systems": "systems_3"
},
"locked": {
"lastModified": 1710146030,
···
},
"flake-utils_2": {
"inputs": {
-
"systems": "systems_4"
},
"locked": {
"lastModified": 1705309234,
···
},
"flake-utils_3": {
"inputs": {
-
"systems": "systems_5"
},
"locked": {
"lastModified": 1731533236,
···
"inputs": {
"crane": "crane",
"flake-utils": "flake-utils",
-
"nixpkgs": "nixpkgs_2",
"rust-overlay": "rust-overlay"
},
"locked": {
···
}
},
"naked-shell": {
-
"locked": {
-
"lastModified": 1681286841,
-
"narHash": "sha256-3XlJrwlR0nBiREnuogoa5i1b4+w/XPe0z8bbrJASw0g=",
-
"owner": "90-008",
-
"repo": "mk-naked-shell",
-
"rev": "7612f828dd6f22b7fb332cc69440e839d7ffe6bd",
-
"type": "github"
-
},
-
"original": {
-
"owner": "90-008",
-
"repo": "mk-naked-shell",
-
"type": "github"
-
}
-
},
-
"naked-shell_2": {
"flake": false,
"locked": {
"lastModified": 1681286841,
···
"type": "github"
}
},
-
"naked-shell_3": {
"locked": {
"lastModified": 1681286841,
"narHash": "sha256-3XlJrwlR0nBiREnuogoa5i1b4+w/XPe0z8bbrJASw0g=",
···
"nsid-tracker",
"nixpkgs"
],
-
"parts": "parts_2",
"rust-overlay": "rust-overlay_2",
"treefmt": "treefmt"
},
···
},
"nixpkgs": {
"locked": {
-
"lastModified": 1744932701,
-
"narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=",
-
"owner": "nixos",
"repo": "nixpkgs",
-
"rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef",
"type": "github"
},
"original": {
-
"owner": "nixos",
-
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-lib": {
"locked": {
-
"lastModified": 1743296961,
-
"narHash": "sha256-b1EdN3cULCqtorQ4QeWgLMrd5ZGOjLSLemfa00heasc=",
-
"owner": "nix-community",
-
"repo": "nixpkgs.lib",
-
"rev": "e4822aea2a6d1cdd36653c134cacfd64c97ff4fa",
-
"type": "github"
-
},
-
"original": {
-
"owner": "nix-community",
-
"repo": "nixpkgs.lib",
-
"type": "github"
-
}
-
},
-
"nixpkgs-lib_2": {
-
"locked": {
"lastModified": 1751159883,
"narHash": "sha256-urW/Ylk9FIfvXfliA1ywh75yszAbiTEVgpPeinFyVZo=",
"owner": "nix-community",
···
},
"nixpkgs_2": {
"locked": {
-
"lastModified": 1716715802,
-
"narHash": "sha256-usk0vE7VlxPX8jOavrtpOqphdfqEQpf9lgedlY/r66c=",
-
"owner": "NixOS",
-
"repo": "nixpkgs",
-
"rev": "e2dd4e18cc1c7314e24154331bae07df76eb582f",
-
"type": "github"
-
},
-
"original": {
-
"owner": "NixOS",
-
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
···
"type": "github"
}
},
-
"nixpkgs_4": {
-
"locked": {
-
"lastModified": 1751984180,
-
"narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=",
-
"owner": "nixos",
-
"repo": "nixpkgs",
-
"rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0",
-
"type": "github"
-
},
-
"original": {
-
"owner": "nixos",
-
"ref": "nixos-unstable",
-
"repo": "nixpkgs",
-
"type": "github"
-
}
-
},
"nsid-tracker": {
"inputs": {
-
"naked-shell": "naked-shell_3",
"nci": "nci",
"nixpkgs": [
"nixpkgs"
],
-
"parts": "parts_3",
-
"systems": "systems_6"
},
"locked": {
"lastModified": 1752990833,
···
"nur": {
"inputs": {
"flake-parts": "flake-parts",
-
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1752516337,
···
},
"parts": {
"inputs": {
-
"nixpkgs-lib": "nixpkgs-lib"
-
},
-
"locked": {
-
"lastModified": 1743550720,
-
"narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=",
-
"owner": "hercules-ci",
-
"repo": "flake-parts",
-
"rev": "c621e8422220273271f52058f618c94e405bb0f5",
-
"type": "github"
-
},
-
"original": {
-
"owner": "hercules-ci",
-
"repo": "flake-parts",
-
"type": "github"
-
}
-
},
-
"parts_2": {
-
"inputs": {
"nixpkgs-lib": [
"nsid-tracker",
"nci",
···
"type": "github"
}
},
-
"parts_3": {
"inputs": {
-
"nixpkgs-lib": "nixpkgs-lib_2"
},
"locked": {
"lastModified": 1751413152,
···
"home": "home",
"limbusart": "limbusart",
"lix-module": "lix-module",
-
"naked-shell": "naked-shell_2",
"ncr": "ncr",
"nixos-hardware": "nixos-hardware",
"nixos-persistence": "nixos-persistence",
"nixos-wsl": "nixos-wsl",
-
"nixpkgs": "nixpkgs_3",
"nixpkgs-wayland": "nixpkgs-wayland",
"nsid-tracker": "nsid-tracker",
"nur": "nur",
···
},
"systems_2": {
"locked": {
-
"lastModified": 1680978846,
-
"narHash": "sha256-Gtqg8b/v49BFDpDetjclCYXm8mAnTrUzR0JnE2nv5aw=",
-
"owner": "nix-systems",
-
"repo": "x86_64-linux",
-
"rev": "2ecfcac5e15790ba6ce360ceccddb15ad16d08a8",
"type": "github"
},
"original": {
"owner": "nix-systems",
-
"repo": "x86_64-linux",
"type": "github"
}
},
···
}
},
"systems_5": {
-
"locked": {
-
"lastModified": 1681028828,
-
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-
"owner": "nix-systems",
-
"repo": "default",
-
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-
"type": "github"
-
},
-
"original": {
-
"owner": "nix-systems",
-
"repo": "default",
-
"type": "github"
-
}
-
},
-
"systems_6": {
"locked": {
"lastModified": 1680978846,
"narHash": "sha256-Gtqg8b/v49BFDpDetjclCYXm8mAnTrUzR0JnE2nv5aw=",
···
}
},
"blog": {
+
"flake": false,
"locked": {
+
"lastModified": 1753200278,
+
"narHash": "sha256-MxamnEYU/CeMq98GNzliN+vwBYE9+Jq8FUD2cRH0x7U=",
"ref": "refs/heads/svelte",
+
"rev": "420c26e68b1aebe29a880be60ead8b00954c9ace",
+
"revCount": 516,
"type": "git",
"url": "https://git.gaze.systems/90008/website.git"
},
···
},
"flake-utils": {
"inputs": {
+
"systems": "systems_2"
},
"locked": {
"lastModified": 1710146030,
···
},
"flake-utils_2": {
"inputs": {
+
"systems": "systems_3"
},
"locked": {
"lastModified": 1705309234,
···
},
"flake-utils_3": {
"inputs": {
+
"systems": "systems_4"
},
"locked": {
"lastModified": 1731533236,
···
"inputs": {
"crane": "crane",
"flake-utils": "flake-utils",
+
"nixpkgs": "nixpkgs",
"rust-overlay": "rust-overlay"
},
"locked": {
···
}
},
"naked-shell": {
"flake": false,
"locked": {
"lastModified": 1681286841,
···
"type": "github"
}
},
+
"naked-shell_2": {
"locked": {
"lastModified": 1681286841,
"narHash": "sha256-3XlJrwlR0nBiREnuogoa5i1b4+w/XPe0z8bbrJASw0g=",
···
"nsid-tracker",
"nixpkgs"
],
+
"parts": "parts",
"rust-overlay": "rust-overlay_2",
"treefmt": "treefmt"
},
···
},
"nixpkgs": {
"locked": {
+
"lastModified": 1716715802,
+
"narHash": "sha256-usk0vE7VlxPX8jOavrtpOqphdfqEQpf9lgedlY/r66c=",
+
"owner": "NixOS",
"repo": "nixpkgs",
+
"rev": "e2dd4e18cc1c7314e24154331bae07df76eb582f",
"type": "github"
},
"original": {
+
"owner": "NixOS",
+
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-lib": {
"locked": {
"lastModified": 1751159883,
"narHash": "sha256-urW/Ylk9FIfvXfliA1ywh75yszAbiTEVgpPeinFyVZo=",
"owner": "nix-community",
···
},
"nixpkgs_2": {
"locked": {
+
"lastModified": 1751984180,
+
"narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=",
+
"owner": "nixos",
+
"repo": "nixpkgs",
+
"rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0",
+
"type": "github"
+
},
+
"original": {
+
"owner": "nixos",
+
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
···
"type": "github"
}
},
"nsid-tracker": {
"inputs": {
+
"naked-shell": "naked-shell_2",
"nci": "nci",
"nixpkgs": [
"nixpkgs"
],
+
"parts": "parts_2",
+
"systems": "systems_5"
},
"locked": {
"lastModified": 1752990833,
···
"nur": {
"inputs": {
"flake-parts": "flake-parts",
+
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1752516337,
···
},
"parts": {
"inputs": {
"nixpkgs-lib": [
"nsid-tracker",
"nci",
···
"type": "github"
}
},
+
"parts_2": {
"inputs": {
+
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1751413152,
···
"home": "home",
"limbusart": "limbusart",
"lix-module": "lix-module",
+
"naked-shell": "naked-shell",
"ncr": "ncr",
"nixos-hardware": "nixos-hardware",
"nixos-persistence": "nixos-persistence",
"nixos-wsl": "nixos-wsl",
+
"nixpkgs": "nixpkgs_2",
"nixpkgs-wayland": "nixpkgs-wayland",
"nsid-tracker": "nsid-tracker",
"nur": "nur",
···
},
"systems_2": {
"locked": {
+
"lastModified": 1681028828,
+
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+
"owner": "nix-systems",
+
"repo": "default",
+
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
+
"repo": "default",
"type": "github"
}
},
···
}
},
"systems_5": {
"locked": {
"lastModified": 1680978846,
"narHash": "sha256-Gtqg8b/v49BFDpDetjclCYXm8mAnTrUzR0JnE2nv5aw=",
+1 -1
flake.nix
···
nixpkgs-wayland.flake = false;
blog.url = "git+https://git.gaze.systems/90008/website.git";
-
# blog.inputs.nixpkgs.follows = "nixpkgs";
agenix.url = "github:ryantm/agenix";
agenix.inputs.nixpkgs.follows = "nixpkgs";
···
nixpkgs-wayland.flake = false;
blog.url = "git+https://git.gaze.systems/90008/website.git";
+
blog.flake = false;
agenix.url = "github:ryantm/agenix";
agenix.inputs.nixpkgs.follows = "nixpkgs";
+6 -2
hosts/wolumonde/modules/blog.nix
···
}:
let
PUBLIC_BASE_URL = "https://gaze.systems";
-
pkg = inputs.blog.packages.${pkgs.system}.default.overrideAttrs (old: {
-
inherit PUBLIC_BASE_URL;
});
port = 3003;
in
{
···
}:
let
PUBLIC_BASE_URL = "https://gaze.systems";
+
modules = (pkgs.callPackage "${inputs.blog}/nix/modules.nix" {}).overrideAttrs (_: {
+
outputHash = "sha256-CO0bFv5WbNBSgucHCb+I9kIZEkh6QqWngRra0luMtSI=";
});
+
pkg = pkgs.callPackage "${inputs.blog}/nix" {
+
inherit PUBLIC_BASE_URL;
+
gazesys-modules = modules;
+
};
port = 3003;
in
{