my nixos config
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

add new new website

chfour 13c8573b 36d17080

+79 -22
+57 -1
flake.lock
··· 1 1 { 2 2 "nodes": { 3 + "flake-utils": { 4 + "inputs": { 5 + "systems": "systems" 6 + }, 7 + "locked": { 8 + "lastModified": 1731533236, 9 + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", 10 + "owner": "numtide", 11 + "repo": "flake-utils", 12 + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", 13 + "type": "github" 14 + }, 15 + "original": { 16 + "owner": "numtide", 17 + "repo": "flake-utils", 18 + "type": "github" 19 + } 20 + }, 3 21 "home-manager": { 4 22 "inputs": { 5 23 "nixpkgs": [ ··· 73 91 "home-manager": "home-manager", 74 92 "nixos-hardware": "nixos-hardware", 75 93 "nixpkgs": "nixpkgs", 76 - "nixpkgs-master": "nixpkgs-master" 94 + "nixpkgs-master": "nixpkgs-master", 95 + "website": "website" 96 + } 97 + }, 98 + "systems": { 99 + "locked": { 100 + "lastModified": 1681028828, 101 + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", 102 + "owner": "nix-systems", 103 + "repo": "default", 104 + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", 105 + "type": "github" 106 + }, 107 + "original": { 108 + "owner": "nix-systems", 109 + "repo": "default", 110 + "type": "github" 111 + } 112 + }, 113 + "website": { 114 + "inputs": { 115 + "flake-utils": "flake-utils", 116 + "nixpkgs": [ 117 + "nixpkgs" 118 + ] 119 + }, 120 + "locked": { 121 + "lastModified": 1738309502, 122 + "narHash": "sha256-36Y9BvEqHBRQ4oJDWe0iXXWvEkb4MUeX8aZ2EDAYe6k=", 123 + "owner": "chfour", 124 + "repo": "website3", 125 + "rev": "124ff3a3cbf5a95c905d538283ea3b3bbdd0e548", 126 + "type": "github" 127 + }, 128 + "original": { 129 + "owner": "chfour", 130 + "ref": "main", 131 + "repo": "website3", 132 + "type": "github" 77 133 } 78 134 } 79 135 },
+14 -7
flake.nix
··· 3 3 nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; 4 4 5 5 nixpkgs-master.url = "github:NixOS/nixpkgs/master"; 6 - 6 + 7 7 nixos-hardware.url = "github:NixOS/nixos-hardware/master"; 8 - 8 + 9 9 home-manager = { 10 10 url = "github:nix-community/home-manager"; 11 11 inputs.nixpkgs.follows = "nixpkgs"; 12 12 }; 13 + 14 + website = { 15 + url = "github:chfour/website3/main"; 16 + inputs.nixpkgs.follows = "nixpkgs"; 17 + }; 13 18 }; 14 - 15 - outputs = { self, nixpkgs, nixpkgs-master, nixos-hardware, home-manager, ... }: { 19 + 20 + outputs = { self, nixpkgs, nixpkgs-master, nixos-hardware, home-manager, website, ... }: { 16 21 nixosModules = { 17 22 minecraft = ./modules/minecraft.nix; 18 - 23 + 19 24 declarativeHome = { ... }: { 20 - # big thank you to https://determinate.systems/posts/declarative-gnome-configuration-with-nixos !!! 21 25 imports = [ home-manager.nixosModules.home-manager ]; 22 26 config = { 23 27 home-manager.useGlobalPkgs = true; ··· 48 52 declarativeHome ./users/chfour 49 53 ]; 50 54 }; 51 - "fovps" = nixpkgs.lib.nixosSystem { 55 + "fovps" = nixpkgs.lib.nixosSystem rec { 52 56 system = "x86_64-linux"; 57 + specialArgs = { 58 + website = website.packages.${system}; 59 + }; 53 60 modules = with self.nixosModules; [ 54 61 overlays defaults 55 62 ./machines/fovps
+8 -14
machines/fovps/services/caddy/default.nix
··· 1 - { pkgs, ... }: 1 + { pkgs, website, ... }: 2 2 3 - let 4 - websiteSource = pkgs.fetchFromGitHub { 5 - owner = "chfour"; 6 - repo = "website-static"; 7 - rev = "c27c5fc110cae32a143d021e54506a71843007af"; 8 - hash = "sha256-1k+KOZDEi3J81HUYx0kY9V2QyRyZylk5kYwW3extM9I="; 9 - }; 10 - in 11 3 { 12 4 services.caddy.enable = true; 13 5 services.caddy.extraConfig = '' ··· 24 16 } 25 17 ''; 26 18 services.caddy.virtualHosts = { 27 - "eeep.ee".extraConfig = '' 19 + "eeep.ee".extraConfig = let 20 + websitePath = builtins.toString website.website.out; 21 + in '' 28 22 import errors 29 - 23 + 30 24 # lol 31 25 redir /nixos /nixos/ permanent 32 26 handle_path /nixos/* { ··· 34 28 } 35 29 36 30 # the usual 37 - root * ${websiteSource} 31 + root * ${websitePath} 38 32 encode zstd gzip 39 33 file_server 40 34 ''; 41 - 35 + 42 36 "files.eeep.ee".extraConfig = '' 43 37 import errors 44 - 38 + 45 39 root * /srv/pub 46 40 encode zstd gzip 47 41 file_server {