diff --git a/machines/artemis/modules.nix b/machines/artemis/modules.nix index bf9e65f..40208c2 100644 --- a/machines/artemis/modules.nix +++ b/machines/artemis/modules.nix @@ -27,12 +27,6 @@ accent = "blue"; }; - containers = { - enable = true; - jellyfin.enable = true; - interface = "wlp192s0"; - }; - users.default.enable = true; base = { diff --git a/machines/solis/modules.nix b/machines/solis/modules.nix index 7d3520a..2eef00c 100644 --- a/machines/solis/modules.nix +++ b/machines/solis/modules.nix @@ -11,7 +11,6 @@ in { containers = { enable = true; backupDir = "/home/${username}/backups"; - interface = "enp2s0"; nginx.enable = true; vaultwarden.enable = true; diff --git a/modules/apps/dev/default.nix b/modules/apps/dev/default.nix index 1628d1b..f19e21f 100644 --- a/modules/apps/dev/default.nix +++ b/modules/apps/dev/default.nix @@ -38,7 +38,6 @@ in { sqlitebrowser typst xclip - unityhub uv zed-editor diff --git a/modules/containers/default.nix b/modules/containers/default.nix index 04c8b5e..4bc2f02 100644 --- a/modules/containers/default.nix +++ b/modules/containers/default.nix @@ -10,15 +10,11 @@ in { ./nginx.nix ./forgejo.nix ./vaultwarden.nix - ./jellyfin.nix ]; options = { horseman.containers = { enable = mkEnableOption "Containers"; - interface = mkOption { - type = types.str; - }; backupDir = mkOption { type = types.str; }; @@ -30,7 +26,7 @@ in { enable = true; # Use "ve-*" when using nftables instead of iptables internalInterfaces = ["ve-+"]; - externalInterface = cfg.interface; + externalInterface = "enp2s0"; # Lazy IPv6 connectivity for the container enableIPv6 = true; }; diff --git a/modules/network/syncthing.nix b/modules/network/syncthing.nix index a70d23a..fb30c75 100644 --- a/modules/network/syncthing.nix +++ b/modules/network/syncthing.nix @@ -52,13 +52,6 @@ in { id = "documentFolder"; path = "/home/${username}/Documents"; devices = ["artemis" "terra" "solis"]; - ignorePatterns = [ - "node_modules" - ".venv" - "venv" - "dist-newstyle" - "constipated-koala/storage" - ]; }; "Programming" = { id = "programmingFolder"; diff --git a/modules/wm/hyprland/waybar.nix b/modules/wm/hyprland/waybar.nix index 4a822ea..a5db4ac 100644 --- a/modules/wm/hyprland/waybar.nix +++ b/modules/wm/hyprland/waybar.nix @@ -88,12 +88,12 @@ in { }; "cpu" = { - interval = 3; + interval = 1; on-click = "kitty btop &"; }; "memory" = { - interval = 3; + interval = 1; on-click = "kitty btop &"; }; @@ -102,7 +102,7 @@ in { }; "network" = { - interval = 3; + interval = 1; tooltip-format = " {bandwidthDownBits} , {bandwidthDownBits} "; tooltip-format-wifi = "{essid}:  {bandwidthDownBits} , {bandwidthDownBits} "; @@ -110,7 +110,7 @@ in { }; "battery" = { - interval = 3; + interval = 1; format-icons = ["󰁻" "󰁽" "󰁿" "󰂁" "󰁹"]; states = { critical = 15;