noe/nixos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

se: add tachikoma patches

Browse source
This commit is contained in:
41666 2024-04-06 15:00:54 -04:00
parent 17cb653103
commit f64d462497
3 changed files with 55 additions and 114 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

135
flake.lock generated
View file

@ -7,11 +7,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1711325419, "lastModified": 1712279577,
"narHash": "sha256-dKZUWMB4py9rhefu1lsrCrwksK4WX/dtW8Ma807KyPA=", "narHash": "sha256-Bwn4rmQi2L2iX6g3ycQMA4baE3zgPHAO0xPBpr2T4/k=",
"owner": "tpwrules", "owner": "tpwrules",
"repo": "nixos-apple-silicon", "repo": "nixos-apple-silicon",
"rev": "93e85575f63b32b9996676513d95288fc1c87ca9", "rev": "d47afc3f0f8b3078c818da8609c41340af61a2ec",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -185,24 +185,6 @@
"type": "github" "type": "github"
} }
}, },
"flake-parts_4": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib_3"
},
"locked": {
"lastModified": 1709336216,
"narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-utils": { "flake-utils": {
"inputs": { "inputs": {
"systems": "systems" "systems": "systems"
@ -268,11 +250,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1711625603, "lastModified": 1712390667,
"narHash": "sha256-W+9dfqA9bqUIBV5u7jaIARAzMe3kTq/Hp2SpSVXKRQw=", "narHash": "sha256-ebq+fJZfobqpsAdGDGpxNWSySbQejRwW9cdiil6krCo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "c0ef0dab55611c676ad7539bf4e41b3ec6fa87d2", "rev": "b787726a8413e11b074cde42704b4af32d95545c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -368,11 +350,11 @@
}, },
"nixlib": { "nixlib": {
"locked": { "locked": {
"lastModified": 1711241261, "lastModified": 1711846064,
"narHash": "sha256-knrTvpl81yGFHIpm1SsLDApe0thFkw1cl3ISAMPmP/0=", "narHash": "sha256-cqfX0QJNEnge3a77VnytM0Q6QZZ0DziFXt6tSCV8ZSc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "b2a1eeef8c185f6bd27432b053ff09d773244cbc", "rev": "90b1a963ff84dc532db92f678296ff2499a60a87",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -387,11 +369,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1711626141, "lastModified": 1712191720,
"narHash": "sha256-0qV1pHeIyUZ18cp8ijQnMf7uV+Uk4+UqTCC6yGSGWvk=", "narHash": "sha256-xXtSSnVHURHsxLQO30dzCKW5NJVGV/umdQPmFjPFMVA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixos-generators", "repo": "nixos-generators",
"rev": "63194fceafbfe583a9eb7d16ab499adc0a6c0bc2", "rev": "0c15e76bed5432d7775a22e8d22059511f59d23a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -402,17 +384,17 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1711163522, "lastModified": 1712163089,
"narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=", "narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4", "rev": "fd281bd6b7d3e32ddfa399853946f782553163b5",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4", "rev": "fd281bd6b7d3e32ddfa399853946f782553163b5",
"type": "github" "type": "github"
} }
}, },
@ -452,31 +434,13 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-lib_3": {
"locked": {
"dir": "lib",
"lastModified": 1709237383,
"narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8",
"type": "github"
},
"original": {
"dir": "lib",
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1711668574, "lastModified": 1712310679,
"narHash": "sha256-u1dfs0ASQIEr1icTVrsKwg2xToIpn7ZXxW3RHfHxshg=", "narHash": "sha256-XgC/a/giEeNkhme/AV1ToipoZ/IVm1MV2ntiK4Tm+pw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "219951b495fc2eac67b1456824cc1ec1fd2ee659", "rev": "72da83d9515b43550436891f538ff41d68eecc7f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -488,11 +452,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1711233294, "lastModified": 1711819797,
"narHash": "sha256-eEu5y4J145BYDw9o/YEmeJyqh8blgnZwuz9k234zuWc=", "narHash": "sha256-tNeB6emxj74Y6ctwmsjtMlzUMn458sBmwnD35U5KIM4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ac6bdf6181666ebb4f90dd20f31e2fa66ede6b68", "rev": "2b4e3ca0091049c6fbb4908c66b05b77eaef9f0c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -504,11 +468,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1711703276, "lastModified": 1712163089,
"narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", "narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", "rev": "fd281bd6b7d3e32ddfa399853946f782553163b5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -520,11 +484,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1711401922, "lastModified": 1712090461,
"narHash": "sha256-QoQqXoj8ClGo0sqD/qWKFWezgEwUL0SUh37/vY2jNhc=", "narHash": "sha256-PAfFp+YEKpkzwz6ruXQMvTa1puO4ySSu2G4Sp/jkCc8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "07262b18b97000d16a4bdb003418bd2fb067a932", "rev": "e976fa8f49c35cf28496301a1ef2aa23ad576b56",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -536,11 +500,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1711703276, "lastModified": 1712163089,
"narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", "narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", "rev": "fd281bd6b7d3e32ddfa399853946f782553163b5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -552,11 +516,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1711200738, "lastModified": 1711715736,
"narHash": "sha256-dkJmk/ET/tRV4007O6kU101UEg1svUwiyk/zEEX9Tdg=", "narHash": "sha256-9slQ609YqT9bT/MNX9+5k5jltL9zgpn36DpFB7TkttM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "20bc93ca7b2158ebc99b8cef987a2173a81cde35", "rev": "807c549feabce7eddbf259dbdcec9e0600a0660d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -579,11 +543,11 @@
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1711809391, "lastModified": 1712299511,
"narHash": "sha256-/nGV6P8nB/R/ysbl1KQIKIwp1mQPXxtnoEd+pf3X+nw=", "narHash": "sha256-yrBK6Jq0UuJjP+nc01OFNoKRRJgPNkbmwPpE4mD2Bis=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "0c16f59202c5062d12ef9cd4560cc9fca9d99f9a", "rev": "f285a958c089ccbca9c5710d4a075683fa1af654",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -656,7 +620,7 @@
"nixvim": "nixvim", "nixvim": "nixvim",
"noe-sh": "noe-sh", "noe-sh": "noe-sh",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"tachikoma-fe": "tachikoma-fe" "tachikoma": "tachikoma"
} }
}, },
"rust-overlay": { "rust-overlay": {
@ -681,11 +645,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1711249319, "lastModified": 1711855048,
"narHash": "sha256-N+Pp3/8H+rd7cO71VNV/ovV/Kwt+XNeUHNhsmyTabdM=", "narHash": "sha256-HxegAPnQJSC4cbEbF4Iq3YTlFHZKLiNTk8147EbLdGg=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "405987a66cce9a4a82f321f11b205982a7127c88", "rev": "99b1e37f9fc0960d064a7862eb7adfb92e64fa10",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -724,25 +688,24 @@
"type": "github" "type": "github"
} }
}, },
"tachikoma-fe": { "tachikoma": {
"inputs": { "inputs": {
"flake-parts": "flake-parts_4",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1711243270, "lastModified": 1712429997,
"narHash": "sha256-D34Qy1Bk+DEQtib6x+xTFaVzy0sFSRFLqIi3TLHxJ08=", "narHash": "sha256-MdDtEZ0I7bakh4eZK84newwztzPSijFNnRndgB9DAAs=",
"ref": "refs/heads/develop", "ref": "refs/heads/main",
"rev": "652a2737d720be024924e5cc8b77fe2d1da3093e", "rev": "bcace9cdb9b47cc56e1a53b80ce2c249a416a735",
"revCount": 7024, "revCount": 4,
"type": "git", "type": "git",
"url": "https://codeberg.org/tachikoma/tachikoma-fe" "url": "https://git.sapphic.engineer/noe/tachikoma"
}, },
"original": { "original": {
"type": "git", "type": "git",
"url": "https://codeberg.org/tachikoma/tachikoma-fe" "url": "https://git.sapphic.engineer/noe/tachikoma"
} }
} }
}, },

4
flake.nix
View file

@ -54,8 +54,8 @@
url = "git+https://codeberg.org/noe/doll.repair"; url = "git+https://codeberg.org/noe/doll.repair";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
tachikoma-fe = { tachikoma = {
url = "git+https://codeberg.org/tachikoma/tachikoma-fe"; url = "git+https://git.sapphic.engineer/noe/tachikoma";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
}; };

30
nixos/hosts/sapphic-engineer/akkoma.nix
View file

@ -6,9 +6,9 @@
secrets = keys: builtins.listToAttrs (map (name: nameValuePair name defaultSecret) keys); secrets = keys: builtins.listToAttrs (map (name: nameValuePair name defaultSecret) keys);
secretRef = key: { _secret = config.sops.secrets.${key}.path; }; secretRef = key: { _secret = config.sops.secrets.${key}.path; };
in { in {
# imports = [ imports = [
# inputs.tachikoma-fe.nixosModules.default inputs.tachikoma.nixosModules.default
# ]; ];
sops.secrets = secrets [ sops.secrets = secrets [
"s3--access_key_id" "s3--access_key_id"
@ -51,7 +51,7 @@ in {
":media_proxy" = { ":media_proxy" = {
enabled = true; enabled = true;
proxy_opts.redirect_on_failure = true; proxy_opts.redirect_on_failure = true;
# proxy_url = ""; proxy_url = "https://sapphic.engineer/proxy";
}; };
":media_preview_proxy" = { ":media_preview_proxy" = {
enabled = true; enabled = true;
@ -197,26 +197,4 @@ in {
services.postgresql.enable = true; services.postgresql.enable = true;
services.postgresql.package = pkgs.postgresql_15; services.postgresql.package = pkgs.postgresql_15;
# services.nginx = {
# enable = true;
# package = pkgs.tengine;
# clientMaxBodySize = "150m";
# recommendedTlsSettings = true;
# recommendedOptimisation = true;
# recommendedGzipSettings = true;
# recommendedZstdSettings = true;
# recommendedBrotliSettings = true;
# recommendedProxySettings = true;
# commonHttpConfig = ''
# proxy_request_buffering off;
# proxy_cache_path /var/cache/nginx/cache/akkoma-media-cache
# levels= keys_zone=akkoma_media_cache:16m max_size=16g
# inactive=1y use_temp_path=off;
# log_format combined2 "$server_name: $remote_addr - $remote_user [$time_local] \"$request\" $status $body_bytes_sent \"$http_referer\" \"$http_user_agent\" \"$http_x_forwarded_for\"";
# access_log /var/log/nginx/access.log combined2;
# '';
# };
} }