diff --git a/home/programs/qutebrowser/default.nix b/home/programs/qutebrowser/default.nix
index 2327b54..b3df58b 100644
--- a/home/programs/qutebrowser/default.nix
+++ b/home/programs/qutebrowser/default.nix
@@ -16,6 +16,7 @@ let
           {
             "name": "Bookmarks",
             "links": [
+              {"title": "MyNixOs", "url": "https://mynixos.com", "icon": "󱄅"},
               {"title": "Github", "url": "https://github.com", "icon": ""},
               {"title": "Proton", "url": "https://mail.proton.me/u/0/inbox", "icon": ""},
               {"title": "Cloudflare One", "url": "https://one.dash.cloudflare.com/", "icon": ""},
diff --git a/home/scripts/brightness/default.nix b/home/scripts/brightness/default.nix
index dd05842..b077f71 100644
--- a/home/scripts/brightness/default.nix
+++ b/home/scripts/brightness/default.nix
@@ -26,10 +26,4 @@ let
     brightness-change down ${increments}
   '';
 
-in {
-  home.packages = with pkgs; [
-    brightness-change
-    brightness-up
-    brightness-down
-  ];
-}
+in { home.packages = [ brightness-change brightness-up brightness-down ]; }
diff --git a/home/scripts/caffeine/default.nix b/home/scripts/caffeine/default.nix
index 58fcdcc..579dfeb 100644
--- a/home/scripts/caffeine/default.nix
+++ b/home/scripts/caffeine/default.nix
@@ -1,7 +1,5 @@
-{ pkgs, config, ... }:
+{ pkgs, ... }:
 let
-  homedir = config.home.homeDirectory;
-
   caffeine-status = pkgs.writeShellScriptBin "caffeine-status" ''
     [[ -f /tmp/caffeine ]] && echo "active" || echo "inactive"
   '';
@@ -20,4 +18,4 @@ let
       --replace-id="$(cat "/tmp/nixy-notification" 2>/dev/null || echo 0)" --print-id > "/tmp/nixy-notification"
   '';
 
-in { home.packages = with pkgs; [ caffeine-status caffeine ]; }
+in { home.packages = [ caffeine-status caffeine ]; }
diff --git a/home/scripts/compress/default.nix b/home/scripts/compress/default.nix
index 0276187..5e666e7 100644
--- a/home/scripts/compress/default.nix
+++ b/home/scripts/compress/default.nix
@@ -11,6 +11,7 @@ let
         echo "Wrong number of arguments..."
     fi
   '';
+
   extract = pkgs.writeShellScriptBin "extract" ''
      for i in "$@" ; do
         tar -xvzf $i
@@ -18,4 +19,4 @@ let
     done 
   '';
 
-in { home.packages = with pkgs; [ compress extract ]; }
+in { home.packages = [ compress extract ]; }
diff --git a/home/scripts/misc/default.nix b/home/scripts/misc/default.nix
index f916af8..387cebd 100644
--- a/home/scripts/misc/default.nix
+++ b/home/scripts/misc/default.nix
@@ -1,8 +1,6 @@
-{ pkgs, config, ... }:
+{ pkgs, ... }:
 
 let
-  homedir = config.home.homeDirectory;
-
   menu = pkgs.writeShellScriptBin "menu" ''
     if pgrep wofi; then
     	pkill wofi
@@ -27,4 +25,4 @@ let
     nvim $HOME/Nextcloud/obsidian
   '';
 
-in { home.packages = with pkgs; [ menu wireguard-import powermenu vault ]; }
+in { home.packages = [ menu wireguard-import powermenu vault ]; }
diff --git a/home/scripts/nerdfont_fzf/default.nix b/home/scripts/nerdfont_fzf/default.nix
index 75b8db8..9b5da8c 100644
--- a/home/scripts/nerdfont_fzf/default.nix
+++ b/home/scripts/nerdfont_fzf/default.nix
@@ -26,10 +26,9 @@ let
   '';
 
 in {
-  home.packages = with pkgs; [ nerdfont-fzf nerdfont-fzf-fetch nerdfont-popup ];
+  home.packages = [ nerdfont-fzf nerdfont-fzf-fetch nerdfont-popup ];
 
   xdg.configFile."nerdfont_glyphnames.json" = {
     source = ./nerdfont_glyphnames.json;
   };
-
 }
diff --git a/home/scripts/night-shift/default.nix b/home/scripts/night-shift/default.nix
index 4843b97..c650689 100644
--- a/home/scripts/night-shift/default.nix
+++ b/home/scripts/night-shift/default.nix
@@ -17,4 +17,4 @@ let
       --replace-id="$(cat "/tmp/nixy-notification" 2>/dev/null || echo 0)" --print-id > "/tmp/nixy-notification"
   '';
 
-in { home.packages = with pkgs; [ night-shift-on night-shift-off ]; }
+in { home.packages = [ night-shift-on night-shift-off ]; }
diff --git a/home/scripts/nixy/default.nix b/home/scripts/nixy/default.nix
index 50a458e..4c18f91 100644
--- a/home/scripts/nixy/default.nix
+++ b/home/scripts/nixy/default.nix
@@ -71,12 +71,6 @@ let
   '';
 
 in {
-  home.packages = with pkgs; [
-    nixy
-    nixy-rebuild
-    nixy-upgrade
-    nixy-update
-    nixy-gc
-    nixy-cb
-  ];
+  home.packages =
+    [ nixy nixy-rebuild nixy-upgrade nixy-update nixy-gc nixy-cb ];
 }
diff --git a/home/scripts/remote-rebuild/default.nix b/home/scripts/remote-rebuild/default.nix
index 2f06140..24aeba7 100644
--- a/home/scripts/remote-rebuild/default.nix
+++ b/home/scripts/remote-rebuild/default.nix
@@ -6,4 +6,9 @@ let
     ssh jack -S -C "cd /home/hadi/.config/nixos && git pull && sudo -S nixos-rebuild switch --flake ~/.config/nixos#jack"
   '';
 
-in { home.packages = with pkgs; [ remote-rebuild ]; }
+  remote-push = pkgs.writeShellScriptBin "remote-push" ''
+    cd ~/.config/nixos && git add . && git commit -m "update" && git push
+    remote-rebuild
+  '';
+
+in { home.packages = [ remote-rebuild remote-push ]; }
diff --git a/home/scripts/screenshot/default.nix b/home/scripts/screenshot/default.nix
index c3c988a..86ddaf4 100644
--- a/home/scripts/screenshot/default.nix
+++ b/home/scripts/screenshot/default.nix
@@ -30,4 +30,4 @@ let
                 --icon="$folder/$filename" \
                 --replace-id="$(cat "/tmp/nixy-notification" 2>/dev/null || echo 0)" --print-id > "/tmp/nixy-notification"
   '';
-in { home.packages = with pkgs; [ hyprshot screenshot ]; }
+in { home.packages = [ pkgs.hyprshot screenshot ]; }
diff --git a/home/scripts/serverfetch/default.nix b/home/scripts/serverfetch/default.nix
deleted file mode 100644
index 6a41bd8..0000000
--- a/home/scripts/serverfetch/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-# _                          
-#| |_  ___ __ ___ _____ _ _  
-#| ' \/ -_) _` \ V / -_) ' \ 
-#|_||_\___\__,_|\_/\___|_||_|
-
-
-# Disk state
-# Raid state
-
-# Apps
-# Apps state
-
-# Is local network reachable (wireguard started)
-
-# uptime
-# Network speed
diff --git a/home/scripts/sounds/default.nix b/home/scripts/sounds/default.nix
index f87bf01..39fa66c 100644
--- a/home/scripts/sounds/default.nix
+++ b/home/scripts/sounds/default.nix
@@ -83,11 +83,6 @@ let
   '';
 
 in {
-  home.packages = with pkgs; [
-    sound-output
-    sound-change
-    sound-up
-    sound-down
-    sound-toggle
-  ];
+  home.packages =
+    [ sound-output sound-change sound-up sound-down sound-toggle ];
 }
diff --git a/home/scripts/startup/default.nix b/home/scripts/startup/default.nix
index 76741c3..70da0a1 100644
--- a/home/scripts/startup/default.nix
+++ b/home/scripts/startup/default.nix
@@ -13,4 +13,4 @@ let
     wlr-randr --output "Unknown-1" --off # FIX: REMOVE WEIRD GHOST MONITOR
   '';
 
-in { home.packages = with pkgs; [ startup ]; }
+in { home.packages = [ startup ]; }
diff --git a/home/scripts/system/default.nix b/home/scripts/system/default.nix
index 2574ec6..1787b0e 100644
--- a/home/scripts/system/default.nix
+++ b/home/scripts/system/default.nix
@@ -38,6 +38,4 @@ let
     fi
   '';
 
-in {
-  home.packages = with pkgs; [ notify-system battery-plugged battery-level ];
-}
+in { home.packages = [ notify-system battery-plugged battery-level ]; }
diff --git a/home/scripts/tofi/default.nix b/home/scripts/tofi/default.nix
index a0eda89..62a21a5 100644
--- a/home/scripts/tofi/default.nix
+++ b/home/scripts/tofi/default.nix
@@ -35,4 +35,4 @@ let
     ui
   '';
 
-in { home.packages = with pkgs; [ tofi ]; }
+in { home.packages = [ tofi ]; }
diff --git a/hosts/server/configuration.nix b/hosts/server/configuration.nix
index 041d834..c81d3cc 100644
--- a/hosts/server/configuration.nix
+++ b/hosts/server/configuration.nix
@@ -2,21 +2,27 @@
   imports = [
     ./hardware-configuration.nix
     ./variables.nix
-    ./modules/security.nix
-    ./modules/openssh.nix
-    ./modules/sops.nix
-    ./modules/cloudflare-dyndns.nix
-    ./modules/nginx.nix
-    ./modules/nextcloud.nix
-    ./modules/vaultwarden.nix
-    ./modules/www
-    ./modules/adguard.nix
-    ./modules/ntfy-sh.nix
-    ./modules/tailscale.nix
-    ./modules/kuma.nix
-    # ./modules/bitcoin-git.nix # FIXME: bitcoin-git is deprecated
-    # ./modules/unifi.nix # FIXME: unifi5 is deprecated
 
+    # internal
+    ./modules/internal/security.nix
+    ./modules/internal/openssh.nix
+    ./modules/internal/sops.nix
+    ./modules/internal/adguard.nix
+    # ./modules/internal/unifi.nix # FIXME: unifi5 is deprecated
+
+    # exposed
+    ./modules/exposed/ntfy-sh.nix
+    ./modules/exposed/tailscale.nix
+    ./modules/exposed/kuma.nix
+    ./modules/exposed/cloudflare-dyndns.nix
+    ./modules/exposed/nginx.nix
+    ./modules/exposed/nextcloud.nix
+    ./modules/exposed/vaultwarden.nix
+    # ./modules/exposed/bitcoin-git.nix # FIXME: bitcoin-git is deprecated
+    ./modules/www
+
+    # jackflix
+    ./modules/jackflix/jellyfin.nix
   ];
 
   # Bootloader.
diff --git a/hosts/server/modules/bitcoin-git.nix b/hosts/server/modules/exposed/bitcoin-git.nix
similarity index 100%
rename from hosts/server/modules/bitcoin-git.nix
rename to hosts/server/modules/exposed/bitcoin-git.nix
diff --git a/hosts/server/modules/cloudflare-dyndns.nix b/hosts/server/modules/exposed/cloudflare-dyndns.nix
similarity index 100%
rename from hosts/server/modules/cloudflare-dyndns.nix
rename to hosts/server/modules/exposed/cloudflare-dyndns.nix
diff --git a/hosts/server/modules/kuma.nix b/hosts/server/modules/exposed/kuma.nix
similarity index 100%
rename from hosts/server/modules/kuma.nix
rename to hosts/server/modules/exposed/kuma.nix
diff --git a/hosts/server/modules/nextcloud.nix b/hosts/server/modules/exposed/nextcloud.nix
similarity index 100%
rename from hosts/server/modules/nextcloud.nix
rename to hosts/server/modules/exposed/nextcloud.nix
diff --git a/hosts/server/modules/nginx.nix b/hosts/server/modules/exposed/nginx.nix
similarity index 100%
rename from hosts/server/modules/nginx.nix
rename to hosts/server/modules/exposed/nginx.nix
diff --git a/hosts/server/modules/ntfy-sh.nix b/hosts/server/modules/exposed/ntfy-sh.nix
similarity index 100%
rename from hosts/server/modules/ntfy-sh.nix
rename to hosts/server/modules/exposed/ntfy-sh.nix
diff --git a/hosts/server/modules/tailscale.nix b/hosts/server/modules/exposed/tailscale.nix
similarity index 100%
rename from hosts/server/modules/tailscale.nix
rename to hosts/server/modules/exposed/tailscale.nix
diff --git a/hosts/server/modules/vaultwarden.nix b/hosts/server/modules/exposed/vaultwarden.nix
similarity index 100%
rename from hosts/server/modules/vaultwarden.nix
rename to hosts/server/modules/exposed/vaultwarden.nix
diff --git a/hosts/server/modules/adguard.nix b/hosts/server/modules/internal/adguard.nix
similarity index 100%
rename from hosts/server/modules/adguard.nix
rename to hosts/server/modules/internal/adguard.nix
diff --git a/hosts/server/modules/openssh.nix b/hosts/server/modules/internal/openssh.nix
similarity index 100%
rename from hosts/server/modules/openssh.nix
rename to hosts/server/modules/internal/openssh.nix
diff --git a/hosts/server/modules/security.nix b/hosts/server/modules/internal/security.nix
similarity index 100%
rename from hosts/server/modules/security.nix
rename to hosts/server/modules/internal/security.nix
diff --git a/hosts/server/modules/sops.nix b/hosts/server/modules/internal/sops.nix
similarity index 100%
rename from hosts/server/modules/sops.nix
rename to hosts/server/modules/internal/sops.nix
diff --git a/hosts/server/modules/unifi.nix b/hosts/server/modules/internal/unifi.nix
similarity index 100%
rename from hosts/server/modules/unifi.nix
rename to hosts/server/modules/internal/unifi.nix
diff --git a/hosts/server/modules/jackflix/jellyfin.nix b/hosts/server/modules/jackflix/jellyfin.nix
new file mode 100644
index 0000000..8379831
--- /dev/null
+++ b/hosts/server/modules/jackflix/jellyfin.nix
@@ -0,0 +1,6 @@
+{
+  services.jellyfin = {
+    enable = true;
+    openFirewall = true;
+  };
+}