bill
/
deployed-nixos-server-and-apps
1
1
Fork 0
Code

Major updates

main
Bill Ewanick 2024-01-14 18:24:23 -05:00
parent dd117c5f6e
commit 4a40dc8802
3 changed files with 258 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

247
flake.lock
View File

@ -1,24 +1,261 @@
{ {
"nodes": { "nodes": {
"commonmark-simple": {
"flake": false,
"locked": {
"lastModified": 1705078713,
"narHash": "sha256-YgDHJG8M47ZXGLWu8o7MhXbIrgQ0Ai32Gr8nKvZGGw8=",
"owner": "srid",
"repo": "commonmark-simple",
"rev": "fc106c94f781f6a35ef66900880edc08cbe3b034",
"type": "github"
},
"original": {
"owner": "srid",
"repo": "commonmark-simple",
"type": "github"
}
},
"ema": {
"inputs": {
"flake-parts": [
"emanote",
"flake-parts"
],
"flake-root": [
"emanote",
"flake-root"
],
"haskell-flake": [
"emanote",
"haskell-flake"
],
"nixpkgs": [
"emanote",
"nixpkgs"
],
"treefmt-nix": [
"emanote",
"treefmt-nix"
]
},
"locked": {
"lastModified": 1702334080,
"narHash": "sha256-zrtzyLrSORxtocLMji5U9p4pDicMulOqgsuiB4LCu1o=",
"owner": "srid",
"repo": "ema",
"rev": "33f4cf31ace7e612e78ad25f5fc45089745ab644",
"type": "github"
},
"original": {
"owner": "srid",
"ref": "no-ws",
"repo": "ema",
"type": "github"
}
},
"emanote": {
"inputs": {
"commonmark-simple": "commonmark-simple",
"ema": "ema",
"emanote-template": [],
"flake-parts": "flake-parts",
"flake-root": "flake-root",
"haskell-flake": "haskell-flake",
"heist-extra": "heist-extra",
"nixpkgs": "nixpkgs",
"systems": "systems",
"treefmt-nix": "treefmt-nix",
"unionmount": "unionmount"
},
"locked": {
"lastModified": 1705141168,
"narHash": "sha256-uz6LGgOPuAGrVtPOlcEpgiSMA0Cp5G/uK3UwPhGP/AE=",
"owner": "srid",
"repo": "emanote",
"rev": "7e4b27223d299ad325f685c63fa0f267fe2d8a00",
"type": "github"
},
"original": {
"owner": "srid",
"repo": "emanote",
"type": "github"
}
},
"flake-parts": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1704982712,
"narHash": "sha256-2Ptt+9h8dczgle2Oo6z5ni5rt/uLMG47UFTR1ry/wgg=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "07f6395285469419cf9d078f59b5b49993198c00",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-root": {
"locked": {
"lastModified": 1692742795,
"narHash": "sha256-f+Y0YhVCIJ06LemO+3Xx00lIcqQxSKJHXT/yk1RTKxw=",
"owner": "srid",
"repo": "flake-root",
"rev": "d9a70d9c7a5fd7f3258ccf48da9335e9b47c3937",
"type": "github"
},
"original": {
"owner": "srid",
"repo": "flake-root",
"type": "github"
}
},
"haskell-flake": {
"locked": {
"lastModified": 1705067885,
"narHash": "sha256-al2JqNIkXfLiVreqSJWly64Z6YVNphWBh4m3IxGIdYI=",
"owner": "srid",
"repo": "haskell-flake",
"rev": "8a526aaf98cde6af6b2d1d368e9acb460ee34547",
"type": "github"
},
"original": {
"owner": "srid",
"repo": "haskell-flake",
"type": "github"
}
},
"heist-extra": {
"flake": false,
"locked": {
"lastModified": 1691619499,
"narHash": "sha256-4e8v5t4FM99pdcPhohP3dAeGtsFnirbfYGpbr2+qWxI=",
"owner": "srid",
"repo": "heist-extra",
"rev": "54ff970f733dd45b5509d1c4c298927b6241041b",
"type": "github"
},
"original": {
"owner": "srid",
"repo": "heist-extra",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1695272228, "lastModified": 1704842529,
"narHash": "sha256-4uw2OdJPVyjdB+xcDst9SecrNIpxKXJ2usN3M5HVa7o=", "narHash": "sha256-OTeQA+F8d/Evad33JMfuXC89VMetQbsU4qcaePchGr4=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "eabe8d3eface69f5bb16c18f8662a702f50c20d5",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-lib": {
"locked": {
"dir": "lib",
"lastModified": 1703961334,
"narHash": "sha256-M1mV/Cq+pgjk0rt6VxoyyD+O8cOUiai8t9Q6Yyq4noY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "55ac2a9d2024f15c56adf20da505b29659911da8", "rev": "b0d36bd0a420ecee3bc916c91886caca87c894e9",
"type": "github"
},
"original": {
"dir": "lib",
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1705183652,
"narHash": "sha256-rnfkyUH0x72oHfiSDhuCHDHg3gFgF+lF8zkkg5Zihsw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "428544ae95eec077c7f823b422afae5f174dee4b",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-23.05", "ref": "nixos-23.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"root": { "root": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs" "emanote": "emanote",
"flake-parts": [
"emanote",
"flake-parts"
],
"nixpkgs": "nixpkgs_2"
}
},
"systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"treefmt-nix": {
"inputs": {
"nixpkgs": [
"emanote",
"nixpkgs"
]
},
"locked": {
"lastModified": 1693468138,
"narHash": "sha256-DddblCahuTW8K0ncPOheTlG3igE8b15LJjafF1PWhOo=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "6930a5ba0a722385baf273885a03f561dcb1af67",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
},
"unionmount": {
"flake": false,
"locked": {
"lastModified": 1691619410,
"narHash": "sha256-V9/OcGu9cy4kV9jta12A6w5BEj8awSEVYrXPpg8YckQ=",
"owner": "srid",
"repo": "unionmount",
"rev": "ed73b627f88c8f021f41ba4b518ba41beff9df42",
"type": "github"
},
"original": {
"owner": "srid",
"repo": "unionmount",
"type": "github"
} }
} }
}, },

18
flake.nix
View File

@ -1,15 +1,25 @@
{ {
description = "System flake for Linode NixOS server"; description = "System flake for Linode NixOS server";
inputs = { nixConfig = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05"; extra-substituters = "https://srid.cachix.org";
extra-trusted-public-keys = "srid.cachix.org-1:3clnql5gjbJNEvhA/WQp7nrZlBptwpXnUk6JAv8aB2M=";
}; };
outputs = inputs@{ self, nixpkgs, ... }: inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
emanote.url = "github:srid/emanote";
emanote.inputs.emanote-template.follows = "";
flake-parts.follows = "emanote/flake-parts";
# nixpkgs.follows = "emanote/nixpkgs";
};
outputs = inputs@{ self, nixpkgs, emanote, ... }:
{ {
nixosConfigurations.linode-nixos = nixosConfigurations.linode-nixos =
nixpkgs.lib.nixosSystem { nixpkgs.lib.nixosSystem {
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs emanote; };
modules = [ modules = [
./server-config/configuration.nix ./server-config/configuration.nix

4
nixos-apps/ewanick.com.nix
View File

@ -1,4 +1,4 @@
{ pkgs, ... }: { emanote, ... }:
let let
PROJECT_ROOT = "/workspace/deployed-nixos-server-and-apps/nixos-apps/ewanick.com"; PROJECT_ROOT = "/workspace/deployed-nixos-server-and-apps/nixos-apps/ewanick.com";
@ -22,7 +22,7 @@ in
ewanick-site = { ewanick-site = {
enable = true; enable = true;
description = "A blog powered by Emanote running solely on Markdown files."; description = "A blog powered by Emanote running solely on Markdown files.";
path = with pkgs; [ emanote ]; path = [ emanote ];
script = '' script = ''
cd ${PROJECT_ROOT} cd ${PROJECT_ROOT}
emanote run \ emanote run \