diff --git a/akkoma-static/favicon.png b/akkoma-static/favicon.png deleted file mode 100644 index da055e9..0000000 Binary files a/akkoma-static/favicon.png and /dev/null differ diff --git a/akkoma-static/instance/panel.html b/akkoma-static/instance/panel.html deleted file mode 100644 index 2f67c1d..0000000 --- a/akkoma-static/instance/panel.html +++ /dev/null @@ -1,8 +0,0 @@ -
- This is the kemonomimi.pet akkoma instance!!

- Im am leinna, the admin and only user of this instance

- Hosted on a not very powerful nixos machine, if you have any problem with how it is configured pls let me know

- If you want to go back to the homepage here is a link: kemonomimi.pet

- The background image is an edited version of the triangulum galaxy captured by the VLT Survey Telescope in chile. Here is the source

- Have a good day! >~< -
diff --git a/akkoma-static/static/bg.png b/akkoma-static/static/bg.png deleted file mode 100644 index 27a7437..0000000 Binary files a/akkoma-static/static/bg.png and /dev/null differ diff --git a/akkoma-static/static/logo.png b/akkoma-static/static/logo.png deleted file mode 100644 index da055e9..0000000 Binary files a/akkoma-static/static/logo.png and /dev/null differ diff --git a/akkoma-static/static/styles.json b/akkoma-static/static/styles.json deleted file mode 100644 index 94a111f..0000000 --- a/akkoma-static/static/styles.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "pleroma-dark": [ "Pleroma Dark", "#121a24", "#182230", "#b9b9ba", "#d8a070", "#d31014", "#0fa00f", "#0095ff", "#ffa500" ], - "pleroma-light": [ "Pleroma Light", "#f2f4f6", "#dbe0e8", "#304055", "#f86f0f", "#d31014", "#0fa00f", "#0095ff", "#ffa500" ], - "classic-dark": [ "Classic Dark", "#161c20", "#282e32", "#b9b9b9", "#baaa9c", "#d31014", "#0fa00f", "#0095ff", "#ffa500" ], - "bird": [ "Bird", "#f8fafd", "#e6ecf0", "#14171a", "#0084b8", "#e0245e", "#17bf63", "#1b95e0", "#fab81e"], - "ir-black": [ "Ir Black", "#000000", "#242422", "#b5b3aa", "#ff6c60", "#FF6C60", "#A8FF60", "#96CBFE", "#FFFFB6" ], - "monokai": [ "Monokai", "#272822", "#383830", "#f8f8f2", "#f92672", "#F92672", "#a6e22e", "#66d9ef", "#f4bf75" ], - - "redmond-xx": "/static/themes/redmond-xx.json", - "redmond-xx-se": "/static/themes/redmond-xx-se.json", - "redmond-xxi": "/static/themes/redmond-xxi.json", - "breezy-dark": "/static/themes/breezy-dark.json", - "breezy-light": "/static/themes/breezy-light.json", - "mammal": "/static/themes/mammal.json", - "kemonomimi-theme": "/static/themes/kemonomimi-theme.json" -} diff --git a/akkoma-static/static/terms-of-service.html b/akkoma-static/static/terms-of-service.html deleted file mode 100644 index 6ab5f0c..0000000 --- a/akkoma-static/static/terms-of-service.html +++ /dev/null @@ -1,3 +0,0 @@ -TOS: - -I am not a lawyer, dont do anything illegal and be nice plss diff --git a/akkoma-static/static/themes/kemonomimi-theme.json b/akkoma-static/static/themes/kemonomimi-theme.json deleted file mode 100644 index 259d3d8..0000000 --- a/akkoma-static/static/themes/kemonomimi-theme.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "_pleroma_theme_version": 2, - "name": "Kemonomimi Theme", - "theme": { - "fonts": { - "interface": {"family": "sans-serif"}, - "input": {"family": "monospace"}, - "post": {"family": "sans-serif"}, - "postCode": {"family": "monospace"} - }, - "opacity": { - "bg": "1", - "panel": "1", - "border": "1", - "btn": "1", - "input": "1" - }, - "radii": { - "btn": "0", - "input": "0", - "checkbox": "0", - "panel": "0", - "avatar": "0", - "avatarAlt": "0", - "tooltip": "0", - "attachment": "0" - }, - "colors": { - "bg": "#161616", - "fg": "#1E1E1E", - "text": "#B8B8B8", - "link": "#9141AC", - "fgText": "#B8B8B8", - "fgLink": "#9141AC", - "topBar": "#161616", - "topBarText": "#9141AC", - "btnText": "#9141AC", - "border": "#2E2E2E", - "cRed": "#FF5C5C", - "cBlue": "#5C9AFF", - "cGreen": "#5CFF8A", - "cOrange": "#FFAD5C" - }, - "shadows": { - "panel": [{"x": 0, "y": 0, "blur": 0, "spread": 0, "color": "#000000", "alpha": 0}], - "button": [{"x": 0, "y": 0, "blur": 0, "spread": 1, "color": "#9141AC", "alpha": 0.7, "inset": false}], - "buttonHover": [{"x": 0, "y": 0, "blur": 0, "spread": 1, "color": "#AB5BC6", "alpha": 1}], - "buttonPressed": [{"x": 0, "y": 0, "blur": 0, "spread": 1, "color": "#9141AC", "alpha": 1, "inset": true}], - "avatar": [{"x": 0, "y": 0, "blur": 0, "spread": 0, "color": "#000000", "alpha": 0}], - "avatarStatus": [{"x": 0, "y": 0, "blur": 0, "spread": 0, "color": "#000000", "alpha": 0}], - "input": [{"x": 0, "y": 0, "blur": 0, "spread": 1, "color": "#9141AC", "alpha": 0.4, "inset": false}], - "panelHeader": [{"x": 0, "y": 0, "blur": 0, "spread": 0, "color": "#000000", "alpha": 0}], - "topBar": [{"x": 0, "y": 0, "blur": 0, "spread": 0, "color": "#000000", "alpha": 0}] - } - } -} diff --git a/configuration.nix b/configuration.nix index 19efedf..c8ab358 100644 --- a/configuration.nix +++ b/configuration.nix @@ -7,6 +7,7 @@ ./power.nix ./services/caddy.nix + ./services/cloudflare.nix ./services/status.nix ./services/wireguard.nix diff --git a/flake.lock b/flake.lock index f202a89..6df7e41 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,21 @@ { "nodes": { + "akkoma-static": { + "flake": false, + "locked": { + "lastModified": 1783092892, + "narHash": "sha256-FNaVfpirQ0t4pJbXunWR0HGGNRzDUEmhz6xrl0sJuWE=", + "ref": "refs/heads/main", + "rev": "aa2c1dff2310880205121bc7500fd5b05c0835c7", + "revCount": 3, + "type": "git", + "url": "https://git.danielk.me/daniel_kauss/akkoma-static.git" + }, + "original": { + "type": "git", + "url": "https://git.danielk.me/daniel_kauss/akkoma-static.git" + } + }, "nixpkgs": { "locked": { "lastModified": 1778737229, @@ -18,6 +34,7 @@ }, "root": { "inputs": { + "akkoma-static": "akkoma-static", "nixpkgs": "nixpkgs" } } diff --git a/flake.nix b/flake.nix index ac61326..686546f 100644 --- a/flake.nix +++ b/flake.nix @@ -3,14 +3,21 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; + akkoma-static = { + url = "git+https://git.danielk.me/daniel_kauss/akkoma-static.git"; + flake = false; + }; }; - outputs = { self, nixpkgs, ... }: + outputs = inputs@{ self, nixpkgs, ... }: let system = "x86_64-linux"; in { nixosConfigurations.server = nixpkgs.lib.nixosSystem { inherit system; + specialArgs = { + inherit inputs; + }; modules = [ ./configuration.nix ]; diff --git a/power.nix b/power.nix index 6d25505..13e7304 100644 --- a/power.nix +++ b/power.nix @@ -1,10 +1,6 @@ { config, pkgs, ... }: { - powerManagement.enable = true; - - powerManagement.cpuFreqGovernor = "powersave"; - services.tlp = { enable = true; settings = { @@ -13,9 +9,9 @@ RUNTIME_PM_ON_AC = "auto"; - DISK_DEVICES = "sda"; - DISK_SPINDOWN_TIMEOUT_ON_AC = "120 120"; - DISK_APM_LEVEL_ON_AC="128 128"; + DISK_DEVICES = "ata-APPLE_HDD_ST1000LM024_S35RJ9BG703977"; + DISK_SPINDOWN_TIMEOUT_ON_AC = "120"; + DISK_APM_LEVEL_ON_AC="128"; }; }; } diff --git a/services/cloudflare.nix b/services/cloudflare.nix new file mode 100644 index 0000000..97ff3ce --- /dev/null +++ b/services/cloudflare.nix @@ -0,0 +1,26 @@ +{ config, pkgs, ... }: + +{ + services.cloudflared.enable = true; + services.cloudflared.tunnels."65c093ce-a3ac-4369-b240-2169514be106" = { + credentialsFile = "/etc/secrets/65c093ce-a3ac-4369-b240-2169514be106.json"; + ingress = { + "kemonomimi.pet" = "http://localhost:8679"; + "fedi.kemonomimi.pet" = "http://localhost:8678"; + "media.kemonomimi.pet" = "http://localhost:8678"; + }; + default = "http_status:404"; + }; + + services.cloudflare-dyndns = { + enable = true; + + domains = [ "danielk.me" ]; + + apiTokenFile = "/etc/secrets/cloudflare-api-token"; + + proxied = false; + ipv4 = true; + ipv6 = false; + }; +} diff --git a/services/fedi.nix b/services/fedi.nix index e43d228..a41d51e 100644 --- a/services/fedi.nix +++ b/services/fedi.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ config, pkgs, inputs, ... }: let frontendConfig = { alwaysShowSubjectInput = true; @@ -30,18 +30,6 @@ let }; in { - # probably move them out? atm they stay since they only serve kemonomimi - services.cloudflared.enable = true; - services.cloudflared.tunnels."65c093ce-a3ac-4369-b240-2169514be106" = { - credentialsFile = "/etc/secrets/65c093ce-a3ac-4369-b240-2169514be106.json"; - ingress = { - "kemonomimi.pet" = "http://localhost:8679"; - "fedi.kemonomimi.pet" = "http://localhost:8678"; - "media.kemonomimi.pet" = "http://localhost:8678"; - }; - default = "http_status:404"; - }; - services.akkoma.enable = true; # ill have to enable this # services.akkoma.config.":pleroma".":media_proxy" = { @@ -59,7 +47,7 @@ in registrations_open = false; healthcheck = true; allow_relay = true; - upload_limit = "10G"; + upload_limit = 10737418240; max_pinned_statuses = 20; public = true; }; @@ -110,9 +98,10 @@ in cp -r ${src} $out ''; in { - "favicon.png" = mkPackage ../akkoma-static/favicon.png; - "static" = mkPackage ../akkoma-static/static; - "instance" = mkPackage ../akkoma-static/instance; + "favicon.png" = mkPackage (inputs.akkoma-static + "/favicon.png"); + "static" = mkPackage (inputs.akkoma-static + "/static"); + "instance" = mkPackage (inputs.akkoma-static + "/instance"); + "emoji" = mkPackage (inputs.akkoma-static + "/emoji"); }; systemd.services.local-static-http = { diff --git a/services/qbittorrent.nix b/services/qbittorrent.nix index 769523d..ea0523e 100644 --- a/services/qbittorrent.nix +++ b/services/qbittorrent.nix @@ -25,7 +25,7 @@ in BitTorrent = { Session = { Port = torrentPort; - GlobalMaxRatio = 5; + # GlobalMaxRatio = 5; ShareLimitAction = "RemoveWithContent"; QueueingSystemEnabled = false; DefaultSavePath = "/var/lib/torrents";