From 69536225591511c2a6e7cb0f7c3b4d5588bf2b27 Mon Sep 17 00:00:00 2001 From: Hadi Date: Mon, 17 Aug 2026 15:06:33 +0200 Subject: [PATCH] update server conf Signed-off-by: Hadi --- flake.lock | 296 +++----------------------- flake.nix | 4 +- hosts/server/configuration.nix | 6 +- hosts/server/home.nix | 15 +- hosts/server/secrets/default.nix | 2 +- server-modules/awesome-wallpapers.nix | 41 ---- server-modules/iknowyou.nix | 64 ------ server-modules/mealie.nix | 26 --- server-modules/umami.nix | 39 ---- 9 files changed, 40 insertions(+), 453 deletions(-) delete mode 100644 server-modules/awesome-wallpapers.nix delete mode 100644 server-modules/iknowyou.nix delete mode 100644 server-modules/mealie.nix delete mode 100644 server-modules/umami.nix diff --git a/flake.lock b/flake.lock index 64ff9255..ade6bf3e 100644 --- a/flake.lock +++ b/flake.lock @@ -1,24 +1,5 @@ { "nodes": { - "awesome-wallpapers": { - "inputs": { - "git-hooks": "git-hooks", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1786698894, - "narHash": "sha256-yZHP8Tqn/ClxwGCTsZnyT5HRFGRY0eeMWtlK43qJbtc=", - "owner": "anotherhadi", - "repo": "awesome-wallpapers", - "rev": "deda1a9868be6f516405115068f3ed5038395340", - "type": "github" - }, - "original": { - "owner": "anotherhadi", - "repo": "awesome-wallpapers", - "type": "github" - } - }, "base16": { "inputs": { "fromYaml": "fromYaml" @@ -90,7 +71,7 @@ "blog": { "inputs": { "bun2nix": "bun2nix", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1780522780, @@ -156,35 +137,10 @@ "type": "github" } }, - "bun2nix_3": { - "inputs": { - "flake-parts": "flake-parts_3", - "import-tree": "import-tree_3", - "nixpkgs": [ - "iknowyou", - "nixpkgs" - ], - "systems": "systems_3", - "treefmt-nix": "treefmt-nix_3" - }, - "locked": { - "lastModified": 1770895533, - "narHash": "sha256-v3QaK9ugy9bN9RXDnjw0i2OifKmz2NnKM82agtqm/UY=", - "owner": "nix-community", - "repo": "bun2nix", - "rev": "c843f477b15f51151f8c6bcc886954699440a6e1", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "bun2nix", - "type": "github" - } - }, "default-creds": { "inputs": { "bun2nix": "bun2nix_2", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1780323652, @@ -253,22 +209,6 @@ } }, "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1767039857, - "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", - "owner": "NixOS", - "repo": "flake-compat", - "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_3": { "flake": false, "locked": { "lastModified": 1777699697, @@ -321,24 +261,6 @@ } }, "flake-parts_3": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib_3" - }, - "locked": { - "lastModified": 1769996383, - "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_4": { "inputs": { "nixpkgs-lib": [ "nur", @@ -359,7 +281,7 @@ "type": "github" } }, - "flake-parts_5": { + "flake-parts_4": { "inputs": { "nixpkgs-lib": [ "stylix", @@ -399,28 +321,6 @@ "git-hooks": { "inputs": { "flake-compat": "flake-compat", - "nixpkgs": [ - "awesome-wallpapers", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1784288435, - "narHash": "sha256-ReRHaLgr/uVqdD8afFSn+myXIfpHeOhP0yYe0TJqAA8=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "43b3c1ab9d40fb1dbb008f451988a91e375825e9", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, - "git-hooks_2": { - "inputs": { - "flake-compat": "flake-compat_2", "nixpkgs": [ "nixpkgs" ] @@ -518,30 +418,10 @@ "type": "github" } }, - "iknowyou": { - "inputs": { - "bun2nix": "bun2nix_3", - "nixpkgs": "nixpkgs_4", - "nur-osint": "nur-osint" - }, - "locked": { - "lastModified": 1779949739, - "narHash": "sha256-axo7EprQSm8yYL4P6Ye9EZGEz/bdh8HHkmBlRIQzzvM=", - "owner": "anotherhadi", - "repo": "iknowyou", - "rev": "bb778b43747b7e703e2c311a898198c4a89ac12a", - "type": "github" - }, - "original": { - "owner": "anotherhadi", - "repo": "iknowyou", - "type": "github" - } - }, "impermanence": { "inputs": { "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1769548169, @@ -587,21 +467,6 @@ "type": "github" } }, - "import-tree_3": { - "locked": { - "lastModified": 1763762820, - "narHash": "sha256-ZvYKbFib3AEwiNMLsejb/CWs/OL/srFQ8AogkebEPF0=", - "owner": "vic", - "repo": "import-tree", - "rev": "3c23749d8013ec6daa1d7255057590e9ca726646", - "type": "github" - }, - "original": { - "owner": "vic", - "repo": "import-tree", - "type": "github" - } - }, "mnw": { "locked": { "lastModified": 1780772958, @@ -639,28 +504,28 @@ }, "nixarr": { "inputs": { - "nixpkgs": "nixpkgs_6", - "treefmt-nix": "treefmt-nix_4", + "nixpkgs": "nixpkgs_4", + "treefmt-nix": "treefmt-nix_3", "vpnconfinement": "vpnconfinement", "website-builder": "website-builder" }, "locked": { "lastModified": 1784997863, "narHash": "sha256-oTMag4I9MW3bstuOKqzc0F1OqxO49lLa9jkSkRe3EqA=", - "owner": "rasmus-kirk", + "owner": "nix-media-server", "repo": "nixarr", "rev": "282ce99b31d52d72cca281e3d26d3dd267946800", "type": "github" }, "original": { - "owner": "rasmus-kirk", + "owner": "nix-media-server", "repo": "nixarr", "type": "github" } }, "nixos-hardware": { "inputs": { - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1786528975, @@ -678,16 +543,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1786535285, - "narHash": "sha256-rG5HKMAgAhMgydvKGtco6rqTxRq4EDZQCx9USLvVqYw=", - "owner": "nixos", + "lastModified": 1776548001, + "narHash": "sha256-ZSK0NL4a1BwVbbTBoSnWgbJy9HeZFXLYQizjb2DPF24=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "9f78f44a87948854445dae0b6bf82b2e87e4efb5", + "rev": "b12141ef619e0a9c1c84dc8c684040326f27cdcc", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-26.05", + "owner": "NixOS", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -722,21 +587,6 @@ "type": "github" } }, - "nixpkgs-lib_3": { - "locked": { - "lastModified": 1769909678, - "narHash": "sha256-cBEymOf4/o3FD5AZnzC3J9hLbiZ+QDT/KDuyHXVJOpM=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "72716169fe93074c333e8d0173151350670b824c", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, "nixpkgs-unstable": { "locked": { "lastModified": 1786599213, @@ -754,22 +604,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1776548001, - "narHash": "sha256-ZSK0NL4a1BwVbbTBoSnWgbJy9HeZFXLYQizjb2DPF24=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "b12141ef619e0a9c1c84dc8c684040326f27cdcc", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1772773019, "narHash": "sha256-E1bxHxNKfDoQUuvriG71+f+s/NT0qWkImXsYZNFFfCs=", @@ -785,23 +619,7 @@ "type": "github" } }, - "nixpkgs_4": { - "locked": { - "lastModified": 1775710090, - "narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "4c1018dae018162ec878d42fec712642d214fdfa", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { + "nixpkgs_3": { "locked": { "lastModified": 1768564909, "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=", @@ -817,7 +635,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_4": { "locked": { "lastModified": 1775595990, "narHash": "sha256-OEf7YqhF9IjJFYZJyuhAypgU+VsRB5lD4DuiMws5Ltc=", @@ -833,7 +651,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_5": { "locked": { "lastModified": 1767892417, "narHash": "sha256-8bW3q88CEg2u4hSP66Vf4lpbLonHz7hqDNBMcCY7E9U=", @@ -846,7 +664,7 @@ "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" } }, - "nixpkgs_8": { + "nixpkgs_6": { "locked": { "lastModified": 1786535285, "narHash": "sha256-rG5HKMAgAhMgydvKGtco6rqTxRq4EDZQCx9USLvVqYw=", @@ -862,7 +680,7 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_7": { "locked": { "lastModified": 1784796856, "narHash": "sha256-vwxWgF+Gj276WznzGb1LxGsK/39HaQwgQXiU3EkC844=", @@ -877,7 +695,7 @@ }, "nur": { "inputs": { - "flake-parts": "flake-parts_4", + "flake-parts": "flake-parts_3", "nixpkgs": [ "nixpkgs" ] @@ -896,27 +714,6 @@ "type": "github" } }, - "nur-osint": { - "inputs": { - "nixpkgs": [ - "iknowyou", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1775935554, - "narHash": "sha256-7StMiQf3HSBruAxZ2/ZYJhhNEp1KbglGVijQBrurqiM=", - "owner": "anotherhadi", - "repo": "nur-osint", - "rev": "460e377522a43d3d968be20bec2cf40a72013904", - "type": "github" - }, - "original": { - "owner": "anotherhadi", - "repo": "nur-osint", - "type": "github" - } - }, "nur_2": { "inputs": { "flake-parts": [ @@ -944,9 +741,9 @@ }, "nvf": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_2", "mnw": "mnw", - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1786433999, @@ -983,19 +780,17 @@ }, "root": { "inputs": { - "awesome-wallpapers": "awesome-wallpapers", "blog": "blog", "default-creds": "default-creds", "disko": "disko", - "git-hooks": "git-hooks_2", + "git-hooks": "git-hooks", "helium-browser": "helium-browser", "home-manager": "home-manager", - "iknowyou": "iknowyou", "impermanence": "impermanence", "nix-index-database": "nix-index-database", "nixarr": "nixarr", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_6", "nixpkgs-unstable": "nixpkgs-unstable", "nur": "nur", "nvf": "nvf", @@ -1031,13 +826,13 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-parts": "flake-parts_5", + "flake-parts": "flake-parts_4", "gnome-shell": "gnome-shell", "nixpkgs": [ "nixpkgs" ], "nur": "nur_2", - "systems": "systems_4", + "systems": "systems_3", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", "tinted-tmux": "tinted-tmux", @@ -1103,21 +898,6 @@ "type": "github" } }, - "systems_4": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "tinted-kitty": { "flake": false, "locked": { @@ -1227,28 +1007,6 @@ } }, "treefmt-nix_3": { - "inputs": { - "nixpkgs": [ - "iknowyou", - "bun2nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1770228511, - "narHash": "sha256-wQ6NJSuFqAEmIg2VMnLdCnUc0b7vslUohqqGGD+Fyxk=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "337a4fe074be1042a35086f15481d763b8ddc0e7", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, - "treefmt-nix_4": { "inputs": { "nixpkgs": [ "nixarr", diff --git a/flake.nix b/flake.nix index 215e1b6b..769e21c2 100644 --- a/flake.nix +++ b/flake.nix @@ -50,11 +50,9 @@ }; # Server - nixarr.url = "github:rasmus-kirk/nixarr"; + nixarr.url = "github:nix-media-server/nixarr"; default-creds.url = "github:anotherhadi/default-creds"; blog.url = "github:anotherhadi/blog"; - awesome-wallpapers.url = "github:anotherhadi/awesome-wallpapers"; - iknowyou.url = "github:anotherhadi/iknowyou"; }; outputs = inputs @ { diff --git a/hosts/server/configuration.nix b/hosts/server/configuration.nix index 4f2be5c8..6fa4e748 100644 --- a/hosts/server/configuration.nix +++ b/hosts/server/configuration.nix @@ -16,17 +16,13 @@ ../../server-modules/adguardhome.nix ../../server-modules/arr.nix ../../server-modules/blog.nix - ../../server-modules/awesome-wallpapers.nix - ../../server-modules/iknowyou.nix ../../server-modules/stirling-pdf.nix ../../server-modules/cyberchef.nix ../../server-modules/mazanoke.nix ../../server-modules/kernel-hardening.nix ../../server-modules/fail2ban.nix ../../server-modules/default-creds.nix - ../../server-modules/umami.nix ../../server-modules/gitea.nix - ../../server-modules/mealie.nix # You should let those lines as is ./hardware-configuration.nix @@ -38,5 +34,5 @@ home-manager.users."${config.var.username}" = import ./home.nix; # Don't touch this - system.stateVersion = "24.05"; + system.stateVersion = "26.05"; } diff --git a/hosts/server/home.nix b/hosts/server/home.nix index 11adcab2..37913d17 100644 --- a/hosts/server/home.nix +++ b/hosts/server/home.nix @@ -4,18 +4,23 @@ ... }: { imports = [ - # Mostly user-specific configuration - ./variables.nix - - # Programs + ## TUI inputs.nvf-config.homeManagerModules.default + ../../home/programs/tui/ilovetui ../../home/programs/tui/shell ../../home/programs/tui/git ../../home/programs/tui/git/lazygit.nix + ../../home/programs/tui/git/signing.nix # CHANGEME: Change the key or remove this file ../../home/programs/tui/nixy ../../home/programs/tui/nix-utils + ../../home/programs/tui/elio + ../../home/programs/tui/wikiman + ../../home/programs/tui/pkgs.nix ../../home/programs/group/dev.nix + + # Mostly user-specific configuration + ./variables.nix ]; home = { @@ -23,7 +28,7 @@ homeDirectory = "/home/" + config.var.username; # Don't touch this - stateVersion = "24.05"; + stateVersion = "26.05"; }; programs.home-manager.enable = true; diff --git a/hosts/server/secrets/default.nix b/hosts/server/secrets/default.nix index 19b23216..4d220f97 100644 --- a/hosts/server/secrets/default.nix +++ b/hosts/server/secrets/default.nix @@ -8,7 +8,7 @@ path = "/home/hadi/.ssh/config"; mode = "0600"; }; - github-key = { + ssh-github-key = { owner = "hadi"; path = "/home/hadi/.ssh/github"; mode = "0600"; diff --git a/server-modules/awesome-wallpapers.nix b/server-modules/awesome-wallpapers.nix deleted file mode 100644 index 979bba02..00000000 --- a/server-modules/awesome-wallpapers.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - config, - inputs, - lib, - ... -}: let - inherit (import ./mk-container.nix {inherit lib config;}) mkContainer; -in { - imports = [ - (mkContainer { - name = "wallpapers"; - hostIp = "10.233.4.1"; - containerIp = "10.233.4.2"; - nixosConfig = {pkgs-unstable, ...}: { - services.nginx = { - enable = true; - virtualHosts."wallpapers" = { - root = "${inputs.awesome-wallpapers.packages.${pkgs-unstable.stdenv.hostPlatform.system}.default}/share/awesome-wallpapers"; - listen = [ - { - addr = "0.0.0.0"; - port = 8080; - } - ]; - locations."/" = { - tryFiles = "$uri $uri/ /index.html"; - }; - extraConfig = '' - port_in_redirect off; - absolute_redirect off; - ''; - }; - }; - networking.firewall.allowedTCPPorts = [8080]; - system.stateVersion = "24.05"; - }; - }) - ]; - - services.cloudflared.tunnels."${config.var.tunnelId}".ingress."wallpapers.${config.var.domain}" = "http://10.233.4.2:8080"; -} diff --git a/server-modules/iknowyou.nix b/server-modules/iknowyou.nix deleted file mode 100644 index 65ddd958..00000000 --- a/server-modules/iknowyou.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ - config, - inputs, - lib, - ... -}: let - inherit (import ./mk-container.nix {inherit lib config;}) mkContainer; -in { - imports = [ - (mkContainer { - name = "iky-prod"; - hostIp = "10.233.1.1"; - containerIp = "10.233.1.2"; - internet = true; - bindMounts."/etc/iky/config.yaml" = { - hostPath = "/var/lib/iknowyou-prod/config.yaml"; - isReadOnly = false; - }; - nixosConfig = {...}: { - imports = [inputs.iknowyou.nixosModules.default]; - users.users.iknowyou.uid = 999; - users.groups.iknowyou.gid = 999; - services.iknowyou = { - enable = true; - port = 8080; - openFirewall = true; - }; - system.stateVersion = "24.05"; - }; - }) - - (mkContainer { - name = "iky-demo"; - hostIp = "10.233.2.1"; - containerIp = "10.233.2.2"; - nixosConfig = {...}: { - imports = [inputs.iknowyou.nixosModules.default]; - services.iknowyou = { - enable = true; - port = 8080; - openFirewall = true; - }; - systemd.services.iknowyou.environment.IKY_DEMO = "true"; - system.stateVersion = "24.05"; - }; - }) - ]; - - users.users.iknowyou = { - isSystemUser = true; - group = "iknowyou"; - uid = 999; - }; - users.groups.iknowyou.gid = 999; - - systemd.tmpfiles.rules = [ - "f /var/lib/iknowyou-prod/config.yaml 0600 iknowyou iknowyou -" - ]; - - services.cloudflared.tunnels."${config.var.tunnelId}".ingress = { - "iknowyou-prod.${config.var.domain}" = "http://10.233.1.2:8080"; - "iknowyou.${config.var.domain}" = "http://10.233.2.2:8080"; - }; -} diff --git a/server-modules/mealie.nix b/server-modules/mealie.nix deleted file mode 100644 index 6a724de7..00000000 --- a/server-modules/mealie.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ - config, - lib, - ... -}: let - inherit (import ./mk-container.nix {inherit lib config;}) mkContainer; -in { - imports = [ - (mkContainer { - name = "mealie"; - hostIp = "10.233.8.1"; - containerIp = "10.233.8.2"; - internet = true; - nixosConfig = {...}: { - services.mealie = { - enable = true; - port = 8080; - }; - networking.firewall.allowedTCPPorts = [8080]; - system.stateVersion = "24.05"; - }; - }) - ]; - - services.cloudflared.tunnels."${config.var.tunnelId}".ingress."mealie.${config.var.domain}" = "http://10.233.8.2:8080"; -} diff --git a/server-modules/umami.nix b/server-modules/umami.nix deleted file mode 100644 index 26b0ac00..00000000 --- a/server-modules/umami.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ - config, - lib, - ... -}: let - inherit (import ./mk-container.nix {inherit lib config;}) mkContainer; -in { - sops.secrets.umami-secret.mode = "0400"; - - imports = [ - (mkContainer { - name = "umami"; - hostIp = "10.233.10.1"; - containerIp = "10.233.10.2"; - bindMounts."/run/secrets/umami-secret" = { - hostPath = config.sops.secrets.umami-secret.path; - isReadOnly = true; - }; - nixosConfig = {...}: { - services.umami = { - enable = true; - settings = { - PORT = 8080; - HOSTNAME = "0.0.0.0"; - APP_SECRET_FILE = "/run/secrets/umami-secret"; - DISABLE_TELEMETRY = true; - DISABLE_BOT_CHECK = true; - }; - }; - # PrivateUsers breaks systemd-creds inside nspawn containers (nested user namespaces) - systemd.services.umami.serviceConfig.PrivateUsers = lib.mkForce false; - networking.firewall.allowedTCPPorts = [8080]; - system.stateVersion = "24.05"; - }; - }) - ]; - - services.cloudflared.tunnels."${config.var.tunnelId}".ingress."umami.${config.var.domain}" = "http://10.233.10.2:8080"; -}