ringofstorms/dotfiles
ringofstorms/dotfiles
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

migrated forgejo to h001, removed from lio

Browse source
This commit is contained in:
RingOfStorms (Joshua Bell) 2025-04-29 20:54:19 -05:00
parent 38fde325ab
commit 43e095513b
5 changed files with 52 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

53
hosts/linode/l002/flake.lock generated
View file

@ -32,17 +32,17 @@
"ragenix": "ragenix" "ragenix": "ragenix"
}, },
"locked": { "locked": {
"lastModified": 1742406125, "lastModified": 1745965414,
"narHash": "sha256-+NQNj2IMJuEiymB+YrcZkxeZt7QlC+Bwe5rWgRRHKrU=", "narHash": "sha256-Vn/sXOtIj5y09jGKw3iaLIrpqW5h37vW1vFBmFehRx8=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "138565efadeed6baf2a632c5dcc95a2031c77f86", "rev": "3d4d7d88290dd1f55542691d3ac45b2a5f021709",
"revCount": 371, "revCount": 430,
"type": "git", "type": "git",
"url": "https://git.joshuabell.xyz/dotfiles" "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
}, },
"original": { "original": {
"type": "git", "type": "git",
"url": "https://git.joshuabell.xyz/dotfiles" "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
} }
}, },
"crane": { "crane": {
@ -143,11 +143,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1742234739, "lastModified": 1744743431,
"narHash": "sha256-zFL6zsf/5OztR1NSNQF33dvS1fL/BzVUjabZq4qrtY4=", "narHash": "sha256-iyn/WBYDc7OtjSawbegINDe/gIkok888kQxk3aVnkgg=",
"owner": "rycee", "owner": "rycee",
"repo": "home-manager", "repo": "home-manager",
"rev": "f6af7280a3390e65c2ad8fd059cdc303426cbd59", "rev": "c61bfe3ae692f42ce688b5865fac9e0de58e1387",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -198,11 +198,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1742069588, "lastModified": 1744463964,
"narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=", "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5", "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -675,22 +675,6 @@
"type": "github" "type": "github"
} }
}, },
"nvim_plugin-lvimuser/lsp-inlayhints.nvim": {
"flake": false,
"locked": {
"lastModified": 1686236485,
"narHash": "sha256-06CiJ+xeMO4+OJkckcslqwloJyt2gwg514JuxV6KOfQ=",
"owner": "lvimuser",
"repo": "lsp-inlayhints.nvim",
"rev": "d981f65c9ae0b6062176f0accb9c151daeda6f16",
"type": "github"
},
"original": {
"owner": "lvimuser",
"repo": "lsp-inlayhints.nvim",
"type": "github"
}
},
"nvim_plugin-m4xshen/hardtime.nvim": { "nvim_plugin-m4xshen/hardtime.nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -1245,7 +1229,6 @@
"nvim_plugin-lewis6991/gitsigns.nvim": "nvim_plugin-lewis6991/gitsigns.nvim", "nvim_plugin-lewis6991/gitsigns.nvim": "nvim_plugin-lewis6991/gitsigns.nvim",
"nvim_plugin-lnc3l0t/glow.nvim": "nvim_plugin-lnc3l0t/glow.nvim", "nvim_plugin-lnc3l0t/glow.nvim": "nvim_plugin-lnc3l0t/glow.nvim",
"nvim_plugin-lukas-reineke/indent-blankline.nvim": "nvim_plugin-lukas-reineke/indent-blankline.nvim", "nvim_plugin-lukas-reineke/indent-blankline.nvim": "nvim_plugin-lukas-reineke/indent-blankline.nvim",
"nvim_plugin-lvimuser/lsp-inlayhints.nvim": "nvim_plugin-lvimuser/lsp-inlayhints.nvim",
"nvim_plugin-m4xshen/hardtime.nvim": "nvim_plugin-m4xshen/hardtime.nvim", "nvim_plugin-m4xshen/hardtime.nvim": "nvim_plugin-m4xshen/hardtime.nvim",
"nvim_plugin-mbbill/undotree": "nvim_plugin-mbbill/undotree", "nvim_plugin-mbbill/undotree": "nvim_plugin-mbbill/undotree",
"nvim_plugin-mfussenegger/nvim-lint": "nvim_plugin-mfussenegger/nvim-lint", "nvim_plugin-mfussenegger/nvim-lint": "nvim_plugin-mfussenegger/nvim-lint",
@ -1280,17 +1263,17 @@
"rust-overlay": "rust-overlay_2" "rust-overlay": "rust-overlay_2"
}, },
"locked": { "locked": {
"lastModified": 1742226527, "lastModified": 1745585761,
"narHash": "sha256-CT9227XXn1t8H1ivNBBkBcf+npB7tWk5yzEQoJvbGVU=", "narHash": "sha256-xS3068xhndFrZh9GcTTNTmeebGq1A3uVykRRdzJOj3Y=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "e8bafafc36fb2227dab8f0ddb67a2439d9077091", "rev": "e5523910a0c07c88d026d006f5962434bfa53548",
"revCount": 268, "revCount": 277,
"type": "git", "type": "git",
"url": "https://git.joshuabell.xyz/nvim" "url": "https://git.joshuabell.xyz/ringofstorms/nvim"
}, },
"original": { "original": {
"type": "git", "type": "git",
"url": "https://git.joshuabell.xyz/nvim" "url": "https://git.joshuabell.xyz/ringofstorms/nvim"
} }
}, },
"rust-overlay": { "rust-overlay": {

1
hosts/linode/l002/flake.nix
View file

@ -63,7 +63,6 @@
}; };
programs = { programs = {
tailnet.enable = true; tailnet.enable = true;
tailnet.useSecretsAuth = false;
ssh.enable = true; ssh.enable = true;
}; };
users = { users = {

4
hosts/linode/l002/nginx.nix
View file

@ -72,7 +72,7 @@
enableACME = true; enableACME = true;
forceSSL = true; forceSSL = true;
locations."/" = { locations."/" = {
proxyPass = "http://100.64.0.1"; proxyPass = "http://100.64.0.13";
}; };
}; };
@ -145,7 +145,7 @@
streamConfig = '' streamConfig = ''
server { server {
listen 3032; listen 3032;
proxy_pass 100.64.0.1:3032; proxy_pass 100.64.0.13:3032;
} }
''; '';
}; };

89
hosts/lio/containers.nix
View file

@ -3,7 +3,6 @@
... ...
}: }:
{ {
# NOTE some useful links # NOTE some useful links
# nixos containers: https://blog.beardhatcode.be/2020/12/Declarative-Nixos-Containers.html # nixos containers: https://blog.beardhatcode.be/2020/12/Declarative-Nixos-Containers.html
# https://nixos.wiki/wiki/NixOS_Containers # https://nixos.wiki/wiki/NixOS_Containers
@ -11,7 +10,7 @@
imports = [ imports = [
common.nixosModules.containers.librechat common.nixosModules.containers.librechat
common.nixosModules.containers.forgejo # common.nixosModules.containers.forgejo
]; ];
config = { config = {
@ -26,33 +25,33 @@
firewall.trustedInterfaces = [ "ve-*" ]; firewall.trustedInterfaces = [ "ve-*" ];
}; };
containers.wasabi = { # containers.wasabi = {
ephemeral = true; # ephemeral = true;
autoStart = true; # autoStart = true;
privateNetwork = true; # privateNetwork = true;
hostAddress = "10.0.0.1"; # hostAddress = "10.0.0.1";
localAddress = "10.0.0.111"; # localAddress = "10.0.0.111";
config = # config =
{ config, pkgs, ... }: # { config, pkgs, ... }:
{ # {
system.stateVersion = "24.11"; # system.stateVersion = "24.11";
services.httpd.enable = true; # services.httpd.enable = true;
services.httpd.adminAddr = "foo@example.org"; # services.httpd.adminAddr = "foo@example.org";
networking.firewall = { # networking.firewall = {
enable = true; # enable = true;
allowedTCPPorts = [ 80 ]; # allowedTCPPorts = [ 80 ];
}; # };
}; # };
}; # };
virtualisation.oci-containers.containers = { # virtualisation.oci-containers.containers = {
ntest = { # ntest = {
image = "nginx:alpine"; # image = "nginx:alpine";
ports = [ # ports = [
"127.0.0.1:8085:80" # "127.0.0.1:8085:80"
]; # ];
}; # };
}; # };
virtualisation.oci-containers.backend = "docker"; virtualisation.oci-containers.backend = "docker";
@ -63,45 +62,13 @@
recommendedProxySettings = true; recommendedProxySettings = true;
recommendedTlsSettings = true; recommendedTlsSettings = true;
virtualHosts = { virtualHosts = {
# "local.belljm.com" = {
# # enableACME = true;
# # forceSSL = true;
# locations."/".proxyPass = "http://${config.containers.wasabi.localAddress}:80";
# };
# "127.0.0.1" = {
# locations."/wasabi/" = {
# extraConfig = ''
# rewrite ^/wasabi/(.*) /$1 break;
# '';
# proxyPass = "http://${config.containers.wasabi.localAddress}:80/";
# };
# locations."/" = {
# return = "404"; # or 444 for drop
# };
# };
"git.joshuabell.xyz" = {
# GIT passthrough
locations."/" = {
proxyPass = "http://10.0.0.2:3000";
};
};
"_" = { "_" = {
default = true; default = true;
locations."/" = { locations."/" = {
return = "404"; # or 444 for drop return = "444"; # or 444 for drop
}; };
}; };
}; };
# STREAMS
streamConfig = ''
server {
listen 3032;
proxy_pass 10.0.0.2:3032;
}
'';
}; };
networking.firewall.allowedTCPPorts = [ networking.firewall.allowedTCPPorts = [

8
hosts/lio/flake.lock generated
View file

@ -32,11 +32,11 @@
"ragenix": "ragenix" "ragenix": "ragenix"
}, },
"locked": { "locked": {
"lastModified": 1745957989, "lastModified": 1745977922,
"narHash": "sha256-mLYJXPri4DVRa6exEPtzlkje5FZVSYAteObHOxcAvfA=", "narHash": "sha256-Rufv1nlw2OlAzpN+Iz2wf+3RKWRkGVHWaXP+PCtyug0=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "6277d06b4dcaa6665e92aaf5f20eee49a8362556", "rev": "38fde325abbec819b876998ff006fe31a8f4e228",
"revCount": 426, "revCount": 431,
"type": "git", "type": "git",
"url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
}, },