diff --git a/flake.nix b/flake.nix index 1a0134d..c704f22 100644 --- a/flake.nix +++ b/flake.nix @@ -155,7 +155,6 @@ { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; - home-manager.backupFileExtension = "backup"; home-manager.users.${username} = { imports = [ ./home-manager/home.nix diff --git a/home-manager/home.nix b/home-manager/home.nix index 4f6e053..53df2cb 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -9,6 +9,7 @@ # manage. home.username = "misschloe777"; home.homeDirectory = "/home/misschloe777"; + # This value determines the Home Manager release that your configuration is # compatible with. This helps avoid breakage when a new Home Manager release # introduces backwards incompatible changes. @@ -349,12 +350,6 @@ network.startWhenNeeded = true; }; - programs.atuin = { - enable = true; - settings = { - search_mode = "fuzzy"; - }; - }; # programs.moonlight = { # enable = true; # configs.stable = { diff --git a/hosts/sisyphe/features/services/akkoma.nix b/hosts/sisyphe/features/services/akkoma.nix index b1df32f..44a777a 100644 --- a/hosts/sisyphe/features/services/akkoma.nix +++ b/hosts/sisyphe/features/services/akkoma.nix @@ -1,87 +1,51 @@ -{ pkgs, ... }: -let - pleromaUrl = "eepy.rougebordeaux.xyz"; - pleromaMediaUrl = "blurb.rougebordeaux.xyz"; - theme = "fantasy-scroll-blossom"; - themeUrl = "https://plthemes.vulpes.one/themes/${theme}/${theme}.json"; - background = ""; - emojis = [ ]; - styles = '' - { - "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", - "${theme}": "/static/themes/${theme}.json" - } - ''; - akkoma-overlay = self: super: { - akkoma = super.akkkoma.overrideAttrs (old: { - postPatch = '' - cp ${pkgs.writeText "styles.json" styles} $out/priv/static/themes - cp ${./akkoma/terms-of-services.html} $out/priv/static/terms-of-service.html - ''; - }); - }; -in -{ - nixpkgs.overlays = [ akkoma-overlay ]; +{pkgs, ...}:{ services.akkoma.enable = true; services.akkoma.initDb.enable = true; services.akkoma.config = { ":pleroma" = { ":instance" = { name = "e^akkoma + 1 = 0"; - description = "the cuntiest french akkoma instance<3. on aime la mode, les sciences, et la musique. mais ça ne vous empêche pas de parler de n'importe quoi! join us ! par contre c'est 161 ici donc nofaf ou vs serez ban"; + description = "the cuntiest french akkoma instance<3. centres d'intérêts : la mode, les sciences, la musique. mais ça ne vous empêche pas de parler de n'importe quoi! join us !"; email = "admin@babychou.me"; registration_open = false; - max_pinned_statuses = 1; + max_pinned_statuses = 1; }; "Pleroma.Web.Endpoint" = { - http.ip = "127.0.0.1"; - http.port = 4000; - url.host = "${pleromaUrl}"; + http.ip = "127.0.0.1"; + http.port = 4000; + url.host = "eepy.rougebordeaux.xyz"; }; "Pleroma.Captcha.Kocaptcha" = { - endpoint = "https://captcha.kotobank.ch"; + endpoint = "https://captcha.kotobank.ch"; }; - "Pleroma.Upload" = { + "Pleroma.Upload" = { base_url = "https://blurb.rougebordeaux.xyz/media"; - link_name = true; - filters = map (pkgs.formats.elixirConf { }).lib.mkRaw [ - "Pleroma.Upload.Filter.Exiftool" - "Pleroma.Upload.Filter.Dedupe" - "Pleroma.Upload.Filter.AnonymizeFilename" + link_name = true; + filters = map (pkgs.formats.elixirConf { }).lib.mkRaw [ + "Pleroma.Upload.Filter.Exiftool" + "Pleroma.Upload.Filter.Dedupe" + "Pleroma.Upload.Filter.AnonymizeFilename" ]; }; - ":configurable_from_database" = false; + ":configurable_from_database" = true; }; }; - services.caddy.virtualHosts."${pleromaUrl}".extraConfig = '' + services.caddy.virtualHosts."http://eepy.rougebordeaux.xyz".extraConfig = '' log { output file /var/log/caddy/akkoma.log } - encode zstd gzip + encode gzip reverse_proxy 127.0.0.1:4000 ''; - services.caddy.virtualHosts."${pleromaMediaUrl}".extraConfig = '' + services.caddy.virtualHosts."http://blurb.rougebordeaux.xyz".extraConfig = '' log { output file /var/log/caddy/akkoma_media.log } - encode zstd gzip + encode gzip reverse_proxy 127.0.0.1:4000 ''; diff --git a/hosts/sisyphe/features/services/akkoma/terms-of-services.html b/hosts/sisyphe/features/services/akkoma/terms-of-services.html deleted file mode 100644 index 3d411fe..0000000 --- a/hosts/sisyphe/features/services/akkoma/terms-of-services.html +++ /dev/null @@ -1,6 +0,0 @@ -

Cette instance est hébergée en France. Tout contenu doit se conformer aux lois locales.

-
    -
  1. Tout contenu raciste/sexiste/xenophobe/transphobe est banni. La première fois, vous êtes averti. La deuxième, vous dégagez!
    2. -
  2. -
  3. Le nsfw est autorisé, cependant j'attends que vous mettiez les spoilers.
    4. -
diff --git a/shared/client/default.nix b/shared/client/default.nix index 911deba..8b6b2cb 100644 --- a/shared/client/default.nix +++ b/shared/client/default.nix @@ -1,7 +1,6 @@ { config, pkgs, ... }: { imports = [ - ./nh.nix ./tailscale.nix ]; } diff --git a/shared/client/nh.nix b/shared/client/nh.nix deleted file mode 100644 index 6340123..0000000 --- a/shared/client/nh.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ - programs.nh = { - enable = true; - clean.enable = true; - clean.extraArgs = "--keep-since 14d --keep 3"; - }; -}