formatting
This commit is contained in:
parent
29c782efb2
commit
dbb8efeec2
4 changed files with 105 additions and 94 deletions
46
flake.nix
46
flake.nix
|
|
@ -59,10 +59,12 @@
|
||||||
];
|
];
|
||||||
forAllSystems = f: nixpkgs.lib.genAttrs supportedSystems (system: f system);
|
forAllSystems = f: nixpkgs.lib.genAttrs supportedSystems (system: f system);
|
||||||
makePkgs = system: import nixpkgs { inherit system; };
|
makePkgs = system: import nixpkgs { inherit system; };
|
||||||
makeNixosConfig = configName: nixpkgs.lib.nixosSystem {
|
makeNixosConfig =
|
||||||
specialArgs = { inherit inputs outputs; };
|
configName:
|
||||||
modules = [ ./hosts/${configName}/configuration.nix ];
|
nixpkgs.lib.nixosSystem {
|
||||||
};
|
specialArgs = { inherit inputs outputs; };
|
||||||
|
modules = [ ./hosts/${configName}/configuration.nix ];
|
||||||
|
};
|
||||||
configNames = builtins.attrNames (builtins.readDir ./hosts);
|
configNames = builtins.attrNames (builtins.readDir ./hosts);
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
|
@ -82,21 +84,31 @@
|
||||||
path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.harmonica;
|
path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.harmonica;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
packages = forAllSystems (system:
|
packages = forAllSystems (
|
||||||
|
system:
|
||||||
let
|
let
|
||||||
makeNixosConfigWithSystemOverride = configName: nixpkgs.lib.nixosSystem {
|
makeNixosConfigWithSystemOverride =
|
||||||
specialArgs = { inherit inputs outputs; };
|
configName:
|
||||||
modules = [
|
nixpkgs.lib.nixosSystem {
|
||||||
./hosts/${configName}/configuration.nix
|
specialArgs = { inherit inputs outputs; };
|
||||||
{ nixpkgs.hostPlatform = nixpkgs.lib.mkForce system; }
|
modules = [
|
||||||
];
|
./hosts/${configName}/configuration.nix
|
||||||
};
|
{ nixpkgs.hostPlatform = nixpkgs.lib.mkForce system; }
|
||||||
dotfilesMachineNames = [ "ymir" "pochita" "tartarus" "wallfacer" ];
|
];
|
||||||
|
};
|
||||||
|
dotfilesMachineNames = [
|
||||||
|
"ymir"
|
||||||
|
"pochita"
|
||||||
|
"tartarus"
|
||||||
|
"wallfacer"
|
||||||
|
];
|
||||||
in
|
in
|
||||||
builtins.listToAttrs (map (name: {
|
builtins.listToAttrs (
|
||||||
name = "${name}-dotfiles";
|
map (name: {
|
||||||
value = (makeNixosConfigWithSystemOverride name).config.home-manager.users.osbm.home-files;
|
name = "${name}-dotfiles";
|
||||||
}) dotfilesMachineNames)
|
value = (makeNixosConfigWithSystemOverride name).config.home-manager.users.osbm.home-files;
|
||||||
|
}) dotfilesMachineNames
|
||||||
|
)
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -30,7 +30,6 @@
|
||||||
|
|
||||||
networking.hostName = "ymir"; # Define your hostname.
|
networking.hostName = "ymir"; # Define your hostname.
|
||||||
|
|
||||||
|
|
||||||
networking.firewall.allowedTCPPorts = [
|
networking.firewall.allowedTCPPorts = [
|
||||||
8889
|
8889
|
||||||
8000
|
8000
|
||||||
|
|
|
||||||
|
|
@ -14,90 +14,90 @@
|
||||||
|
|
||||||
config = lib.mkMerge [
|
config = lib.mkMerge [
|
||||||
(lib.mkIf config.myModules.enableGlance {
|
(lib.mkIf config.myModules.enableGlance {
|
||||||
services.glance = {
|
services.glance = {
|
||||||
enable = true;
|
enable = true;
|
||||||
openFirewall = true;
|
openFirewall = true;
|
||||||
settings = {
|
settings = {
|
||||||
server = {
|
server = {
|
||||||
port = 3838;
|
port = 3838;
|
||||||
host = "0.0.0.0";
|
host = "0.0.0.0";
|
||||||
};
|
};
|
||||||
pages = [
|
pages = [
|
||||||
{
|
|
||||||
columns = [
|
|
||||||
{
|
{
|
||||||
size = "small";
|
columns = [
|
||||||
widgets = [
|
|
||||||
{type = "calendar";}
|
|
||||||
{
|
{
|
||||||
type = "repository";
|
size = "small";
|
||||||
repository = "NixOS/nixpkgs";
|
widgets = [
|
||||||
}
|
{ type = "calendar"; }
|
||||||
];
|
|
||||||
}
|
|
||||||
{
|
|
||||||
size = "full";
|
|
||||||
widgets = [
|
|
||||||
{
|
|
||||||
type = "repository";
|
|
||||||
repository = "NixOS/nixpkgs";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
cache = "1m";
|
|
||||||
sites = [
|
|
||||||
{
|
{
|
||||||
icon = "sh:forgejo";
|
type = "repository";
|
||||||
title = "Forgejo git server";
|
repository = "NixOS/nixpkgs";
|
||||||
url = "https://git.osbm.dev";
|
}
|
||||||
}
|
];
|
||||||
{
|
}
|
||||||
icon = "si:ollama";
|
{
|
||||||
title = "Open Webui";
|
size = "full";
|
||||||
url = "http://ymir.curl-boga.ts.net:7070/";
|
widgets = [
|
||||||
}
|
{
|
||||||
{
|
type = "repository";
|
||||||
icon = "sh:jellyfin";
|
repository = "NixOS/nixpkgs";
|
||||||
title = "Jellyfin";
|
}
|
||||||
url = "http://ymir.curl-boga.ts.net:8096/";
|
{
|
||||||
}
|
cache = "1m";
|
||||||
{
|
sites = [
|
||||||
icon = "sh:nixos";
|
{
|
||||||
title = "Hydra";
|
icon = "sh:forgejo";
|
||||||
url = "http://wallfacer.curl-boga.ts.net:3000";
|
title = "Forgejo git server";
|
||||||
}
|
url = "https://git.osbm.dev";
|
||||||
{
|
}
|
||||||
icon = "sh:nixos";
|
{
|
||||||
title = "Attix Binary Cache";
|
icon = "si:ollama";
|
||||||
url = "https://cache.osbm.dev";
|
title = "Open Webui";
|
||||||
}
|
url = "http://ymir.curl-boga.ts.net:7070/";
|
||||||
{
|
}
|
||||||
icon = "sh:visual-studio-code";
|
{
|
||||||
title = "Ymir Remote VSCode";
|
icon = "sh:jellyfin";
|
||||||
url = "http://ymir.curl-boga.ts.net:4444/";
|
title = "Jellyfin";
|
||||||
}
|
url = "http://ymir.curl-boga.ts.net:8096/";
|
||||||
{
|
}
|
||||||
icon = "sh:visual-studio-code";
|
{
|
||||||
title = "Tartarus Remote VSCode";
|
icon = "sh:nixos";
|
||||||
url = "http://tartarus.curl-boga.ts.net:4444/";
|
title = "Hydra";
|
||||||
}
|
url = "http://wallfacer.curl-boga.ts.net:3000";
|
||||||
{
|
}
|
||||||
icon = "sh:visual-studio-code";
|
{
|
||||||
title = "Wallfacer Remote VSCode";
|
icon = "sh:nixos";
|
||||||
url = "http://wallfacer.curl-boga.ts.net:4444/";
|
title = "Attix Binary Cache";
|
||||||
|
url = "https://cache.osbm.dev";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
icon = "sh:visual-studio-code";
|
||||||
|
title = "Ymir Remote VSCode";
|
||||||
|
url = "http://ymir.curl-boga.ts.net:4444/";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
icon = "sh:visual-studio-code";
|
||||||
|
title = "Tartarus Remote VSCode";
|
||||||
|
url = "http://tartarus.curl-boga.ts.net:4444/";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
icon = "sh:visual-studio-code";
|
||||||
|
title = "Wallfacer Remote VSCode";
|
||||||
|
url = "http://wallfacer.curl-boga.ts.net:4444/";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
title = "Services";
|
||||||
|
type = "monitor";
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
title = "Services";
|
|
||||||
type = "monitor";
|
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
name = "Home";
|
||||||
|
content = "Welcome to Pochita's home page!";
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
name = "Home";
|
};
|
||||||
content = "Welcome to Pochita's home page!";
|
};
|
||||||
}
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
networking.firewall.allowedTCPPorts = [ config.services.glance.settings.server.port ];
|
networking.firewall.allowedTCPPorts = [ config.services.glance.settings.server.port ];
|
||||||
services.cloudflared.tunnels = {
|
services.cloudflared.tunnels = {
|
||||||
"91b13f9b-81be-46e1-bca0-db2640bf2d0a" = {
|
"91b13f9b-81be-46e1-bca0-db2640bf2d0a" = {
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,7 @@
|
||||||
port = 3000;
|
port = 3000;
|
||||||
hydraURL = "http://${config.networking.hostName}.curl-boga.ts.net/hydra/";
|
hydraURL = "http://${config.networking.hostName}.curl-boga.ts.net/hydra/";
|
||||||
notificationSender = "hydra@localhost";
|
notificationSender = "hydra@localhost";
|
||||||
buildMachinesFiles = [];
|
buildMachinesFiles = [ ];
|
||||||
useSubstitutes = true;
|
useSubstitutes = true;
|
||||||
};
|
};
|
||||||
networking.firewall.allowedTCPPorts = [
|
networking.firewall.allowedTCPPorts = [
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue