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

removing docker from lio, and other cleanup

Browse source
This commit is contained in:
RingOfStorms (Joshua Bell) 2025-08-27 12:44:54 -05:00
parent c007bb72d2
commit 405576ee63
10 changed files with 45 additions and 423 deletions
Download patch file Download diff file Expand all files Collapse all files

14
hosts/lio/containers.nix
View file

@ -13,15 +13,15 @@ in
options = { };
imports = [
common.nixosModules.containers.obsidian_sync
# common.nixosModules.containers.obsidian_sync
];
config = {
# Obsidian Sync settings
services.obsidian_sync = {
serverUrl = "https://obsidiansync.joshuabell.xyz";
dockerEnvFiles = [ config.age.secrets.obsidian_sync_env.path ];
};
# services.obsidian_sync = {
# serverUrl = "https://obsidiansync.joshuabell.xyz";
# dockerEnvFiles = [ config.age.secrets.obsidian_sync_env.path ];
# };
## Give internet access
networking = {
@ -62,7 +62,7 @@ in
# };
# };
virtualisation.oci-containers.backend = "docker";
# virtualisation.oci-containers.backend = "docker";
services.nginx = {
enable = true;
@ -74,7 +74,7 @@ in
"_" = {
default = true;
locations."/" = {
return = "444"; # or 444 for drop
return = "404"; # or 444 for drop
};
};
};

13
hosts/lio/flake.nix
View file

@ -54,7 +54,6 @@
}:
{
programs = {
steam.enable = true;
nix-ld = {
enable = true;
libraries = with pkgs; [
@ -66,6 +65,10 @@
];
};
};
environment.shellAliases = {
"oc" =
"all_proxy='' http_proxy='' https_proxy='' /home/josh/other/opencode/node_modules/opencode-linux-x64/bin/opencode";
};
environment.systemPackages = with pkgs; [
lua
@ -75,12 +78,6 @@
appimage-run
nodejs_24
];
environment.shellAliases = {
"oc" =
"all_proxy='' http_proxy='' https_proxy='' /home/josh/other/opencode/node_modules/opencode-linux-x64/bin/opencode";
};
# Also allow this key to work for root user, this will let us use this as a remote builder easier
users.users.root.openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJN2nsLmAlF6zj5dEBkNSJaqcCya+aB6I0imY8Q5Ew0S nix2lio"
@ -113,7 +110,7 @@
tailnet.enable = true;
tailnet.enableExitNode = true;
ssh.enable = true;
docker.enable = true;
# docker.enable = true;
virt-manager.enable = true;
flatpaks = {
enable = true;

16
hosts/lio/hyprland_customizations.nix
View file

@ -12,13 +12,13 @@ let
"${mainMonitor},3840x2160@97.98,0x0,1,transform,0"
"${secondaryMonitor},3440x1440@99.98,-1440x-640,1,transform,1"
];
workspace =
let
inherit (builtins) map toString;
inherit (lib) range;
mkWs = monitor: i: "${toString i},monitor:${monitor},persistent:true";
in
(map (mkWs mainMonitor) (range 1 6)) ++ (map (mkWs secondaryMonitor) (range 7 10));
# workspace =
# let
# inherit (builtins) map toString;
# inherit (lib) range;
# mkWs = monitor: i: "${toString i},persistent:true";
# in
# (map (mkWs mainMonitor) (range 1 6)) ++ (map (mkWs secondaryMonitor) (range 7 10));
};
moveScript = pkgs.writeShellScriptBin "hyprland-move-workspaces" ''
@ -91,7 +91,7 @@ let
# Subscribe to Hyprland events and react to monitor changes
''${SOCAT} - "UNIX-CONNECT:${"$"}sock" | while IFS= read -r line; do
case "${"$"}line" in
monitoradded*|monitorremoved*|activemonitor*|layoutchange*)
monitoradded*|monitorremoved*|activemonitor*|layoutchange*|createworkspace*)
place_workspaces
;;
esac

28
hosts/oracle/o001/nginx.nix
View file

@ -172,20 +172,20 @@
'';
};
};
"obsidiansync.joshuabell.xyz" = {
enableACME = true;
forceSSL = true;
locations."/" = {
proxyPass = "http://100.64.0.1:5984";
};
extraConfig = ''
client_max_body_size 100M;
proxy_redirect off;
proxy_buffering off;
proxy_set_header Host $host;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
'';
};
# "obsidiansync.joshuabell.xyz" = {
# enableACME = true;
# forceSSL = true;
# locations."/" = {
# proxyPass = "http://100.64.0.1:5984";
# };
# extraConfig = ''
# client_max_body_size 100M;
# proxy_redirect off;
# proxy_buffering off;
# proxy_set_header Host $host;
# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
# '';
# };
"jellyfin.joshuabell.xyz" = {
enableACME = true;
forceSSL = true;