Compare commits
1 Commits
testing/mu
...
wip/arm-fl
| Author | SHA1 | Date | |
|---|---|---|---|
| a17ad5fbf2 |
83
flake.lock
generated
83
flake.lock
generated
@@ -1,20 +1,5 @@
|
|||||||
{
|
{
|
||||||
"nodes": {
|
"nodes": {
|
||||||
"flake-utils": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1659877975,
|
|
||||||
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "flake-utils",
|
|
||||||
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "flake-utils",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"home-manager": {
|
"home-manager": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
@@ -22,11 +7,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1665475263,
|
"lastModified": 1656169755,
|
||||||
"narHash": "sha256-T4at7d+KsQNWh5rfjvOtQCaIMWjSDlSgQZKvxb+LcEY=",
|
"narHash": "sha256-Nlnm4jeQWEGjYrE6hxi/7HYHjBSZ/E0RtjCYifnNsWk=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "17208be516fc36e2ab0ceb064d931e90eb88b2a3",
|
"rev": "4a3d01fb53f52ac83194081272795aa4612c2381",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -54,11 +39,11 @@
|
|||||||
"mobile-nixos": {
|
"mobile-nixos": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1665711470,
|
"lastModified": 1664852186,
|
||||||
"narHash": "sha256-9cjKbTkxyWjswVExtIpglpvlR+iDY9/DWmXpZyzk5cY=",
|
"narHash": "sha256-t0FhmTf3qRs8ScR8H9Rq7FAxptNELLSpxZG2ALL1HnE=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "mobile-nixos",
|
"repo": "mobile-nixos",
|
||||||
"rev": "e4b6f680b2a4f29f087a7c1299c11499d1a367b6",
|
"rev": "ca872f1a617674c4045e880aab8a45037e73700b",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -69,11 +54,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1665732960,
|
"lastModified": 1665081174,
|
||||||
"narHash": "sha256-WBZ+uSHKFyjvd0w4inbm0cNExYTn8lpYFcHEes8tmec=",
|
"narHash": "sha256-6hsmzdhdy8Kbvl5e0xZNE83pW3fKQvNiobJkM6KQrgA=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "4428e23312933a196724da2df7ab78eb5e67a88e",
|
"rev": "598f83ebeb2235435189cf84d844b8b73e858e0f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -100,11 +85,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs-stable": {
|
"nixpkgs-stable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1665613119,
|
"lastModified": 1665132027,
|
||||||
"narHash": "sha256-VTutbv5YKeBGWou6ladtgfx11h6et+Wlkdyh4jPJ3p0=",
|
"narHash": "sha256-zoHPqSQSENt96zTk6Mt1AP+dMNqQDshXKQ4I6MfjP80=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "e06bd4b64bbfda91d74f13cb5eca89485d47528f",
|
"rev": "9ecc270f02b09b2f6a76b98488554dd842797357",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -113,6 +98,22 @@
|
|||||||
"type": "indirect"
|
"type": "indirect"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"nixpkgs_2": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1665197809,
|
||||||
|
"narHash": "sha256-dRUzv/zNYV2EYtnxFG31pPBk0nErT+MBTu6ZJHm1o2A=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "7b06206fa24198912cea58de690aa4943f238fbf",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "NixOS",
|
||||||
|
"ref": "nixpkgs-unstable",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager",
|
||||||
@@ -120,15 +121,12 @@
|
|||||||
"mobile-nixos": "mobile-nixos",
|
"mobile-nixos": "mobile-nixos",
|
||||||
"nixpkgs": "nixpkgs",
|
"nixpkgs": "nixpkgs",
|
||||||
"nixpkgs-stable": "nixpkgs-stable",
|
"nixpkgs-stable": "nixpkgs-stable",
|
||||||
"sops-nix": "sops-nix",
|
"sops-nix": "sops-nix"
|
||||||
"uninsane": "uninsane"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"sops-nix": {
|
"sops-nix": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": "nixpkgs_2",
|
||||||
"nixpkgs"
|
|
||||||
],
|
|
||||||
"nixpkgs-22_05": "nixpkgs-22_05"
|
"nixpkgs-22_05": "nixpkgs-22_05"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
@@ -144,27 +142,6 @@
|
|||||||
"repo": "sops-nix",
|
"repo": "sops-nix",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
|
||||||
"uninsane": {
|
|
||||||
"inputs": {
|
|
||||||
"flake-utils": "flake-utils",
|
|
||||||
"nixpkgs": [
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1665758541,
|
|
||||||
"narHash": "sha256-ibR8bPwHlDjavri5cNVnoo5FmFk1IfNMmQXxat5biqs=",
|
|
||||||
"ref": "refs/heads/master",
|
|
||||||
"rev": "4ad1801f6cecd678bbeae5dfe5933448dd7b3360",
|
|
||||||
"revCount": 163,
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://git.uninsane.org/colin/uninsane"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://git.uninsane.org/colin/uninsane"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"root": "root",
|
"root": "root",
|
||||||
|
|||||||
33
flake.nix
33
flake.nix
@@ -14,18 +14,12 @@
|
|||||||
url = "github:nix-community/home-manager/release-22.05";
|
url = "github:nix-community/home-manager/release-22.05";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
sops-nix = {
|
# TODO: set these up to follow our nixpkgs?
|
||||||
url = "github:Mic92/sops-nix";
|
sops-nix.url = "github:Mic92/sops-nix";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
};
|
|
||||||
impermanence.url = "github:nix-community/impermanence";
|
impermanence.url = "github:nix-community/impermanence";
|
||||||
uninsane = {
|
|
||||||
url = "git+https://git.uninsane.org/colin/uninsane";
|
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = { self, nixpkgs, nixpkgs-stable, mobile-nixos, home-manager, sops-nix, impermanence, uninsane }:
|
outputs = { self, nixpkgs, nixpkgs-stable, mobile-nixos, home-manager, sops-nix, impermanence }:
|
||||||
let
|
let
|
||||||
patchedPkgs = system: nixpkgs.legacyPackages.${system}.applyPatches {
|
patchedPkgs = system: nixpkgs.legacyPackages.${system}.applyPatches {
|
||||||
name = "nixpkgs-patched-uninsane";
|
name = "nixpkgs-patched-uninsane";
|
||||||
@@ -55,7 +49,6 @@
|
|||||||
nixpkgs.config.allowUnfree = true;
|
nixpkgs.config.allowUnfree = true;
|
||||||
nixpkgs.overlays = [
|
nixpkgs.overlays = [
|
||||||
(import "${mobile-nixos}/overlay/overlay.nix")
|
(import "${mobile-nixos}/overlay/overlay.nix")
|
||||||
uninsane.overlay
|
|
||||||
(import ./pkgs/overlay.nix)
|
(import ./pkgs/overlay.nix)
|
||||||
(next: prev: rec {
|
(next: prev: rec {
|
||||||
# non-emulated packages build *from* local *for* target.
|
# non-emulated packages build *from* local *for* target.
|
||||||
@@ -64,8 +57,7 @@
|
|||||||
cross = (nixpkgsFor local target) // (customPackagesFor local target);
|
cross = (nixpkgsFor local target) // (customPackagesFor local target);
|
||||||
stable = import nixpkgs-stable { system = target; };
|
stable = import nixpkgs-stable { system = target; };
|
||||||
# pinned packages:
|
# pinned packages:
|
||||||
electrum = stable.electrum; # 2022-10-10: build break
|
electrum = stable.electrum;
|
||||||
sequoia = stable.sequoia; # 2022-10-13: build break
|
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
@@ -102,21 +94,8 @@
|
|||||||
in {
|
in {
|
||||||
nixosConfigurations = builtins.mapAttrs (name: value: value.nixosConfiguration) machines;
|
nixosConfigurations = builtins.mapAttrs (name: value: value.nixosConfiguration) machines;
|
||||||
imgs = builtins.mapAttrs (name: value: value.img) machines;
|
imgs = builtins.mapAttrs (name: value: value.img) machines;
|
||||||
packages = let
|
packages.x86_64-linux = customPackagesFor "x86_64-linux" "x86_64-linux";
|
||||||
custom-x86_64 = customPackagesFor "x86_64-linux" "x86_64-linux";
|
packages.aarch64-linux = customPackagesFor "aarch64-linux" "aarch64-linux";
|
||||||
custom-aarch64 = customPackagesFor "aarch64-linux" "aarch64-linux";
|
|
||||||
nixpkgs-x86_64 = nixpkgsFor "x86_64-linux" "x86_64-linux";
|
|
||||||
nixpkgs-aarch64 = nixpkgsFor "aarch64-linux" "aarch64-linux";
|
|
||||||
in {
|
|
||||||
x86_64-linux = custom-x86_64 // {
|
|
||||||
nixpkgs = nixpkgs-x86_64;
|
|
||||||
uninsane = uninsane.packages.x86_64-linux;
|
|
||||||
};
|
|
||||||
aarch64-linux = custom-aarch64 // {
|
|
||||||
nixpkgs = nixpkgs-aarch64;
|
|
||||||
uninsane = uninsane.packages.aarch64-linux;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -11,8 +11,6 @@
|
|||||||
boot.loader.efi.canTouchEfiVariables = false;
|
boot.loader.efi.canTouchEfiVariables = false;
|
||||||
sane.image.extraBootFiles = [ pkgs.bootpart-uefi-x86_64 ];
|
sane.image.extraBootFiles = [ pkgs.bootpart-uefi-x86_64 ];
|
||||||
|
|
||||||
users.users.colin.initialPassword = "147147";
|
|
||||||
|
|
||||||
# default config: https://man.archlinux.org/man/snapper-configs.5
|
# default config: https://man.archlinux.org/man/snapper-configs.5
|
||||||
# defaults to something like:
|
# defaults to something like:
|
||||||
# - hourly snapshots
|
# - hourly snapshots
|
||||||
|
|||||||
@@ -75,5 +75,7 @@
|
|||||||
environment.variables.ALSA_CONFIG_UCM2 = "${./ucm2}";
|
environment.variables.ALSA_CONFIG_UCM2 = "${./ucm2}";
|
||||||
systemd.services.pulseaudio.environment.ALSA_CONFIG_UCM2 = "${./ucm2}";
|
systemd.services.pulseaudio.environment.ALSA_CONFIG_UCM2 = "${./ucm2}";
|
||||||
|
|
||||||
|
users.groups.feedbackd.gid = config.sane.allocations.feedbackd-gid;
|
||||||
|
|
||||||
hardware.opengl.driSupport = true;
|
hardware.opengl.driSupport = true;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,9 +11,8 @@
|
|||||||
|
|
||||||
sane.home-manager.enable = true;
|
sane.home-manager.enable = true;
|
||||||
sane.home-manager.extraPackages = [
|
sane.home-manager.extraPackages = [
|
||||||
# for administering services
|
# for administering matrix
|
||||||
pkgs.matrix-synapse
|
pkgs.matrix-synapse
|
||||||
pkgs.freshrss
|
|
||||||
];
|
];
|
||||||
sane.impermanence.enable = true;
|
sane.impermanence.enable = true;
|
||||||
sane.services.duplicity.enable = true;
|
sane.services.duplicity.enable = true;
|
||||||
|
|||||||
@@ -2,13 +2,11 @@
|
|||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./ddns-he.nix
|
./ddns-he.nix
|
||||||
./freshrss.nix
|
|
||||||
./gitea.nix
|
./gitea.nix
|
||||||
./ipfs.nix
|
./ipfs.nix
|
||||||
./jackett.nix
|
./jackett.nix
|
||||||
./jellyfin.nix
|
./jellyfin.nix
|
||||||
./matrix
|
./matrix
|
||||||
./munin.nix
|
|
||||||
./navidrome.nix
|
./navidrome.nix
|
||||||
./nginx.nix
|
./nginx.nix
|
||||||
./pleroma.nix
|
./pleroma.nix
|
||||||
|
|||||||
@@ -1,48 +0,0 @@
|
|||||||
# import feeds with e.g.
|
|
||||||
# ```console
|
|
||||||
# $ nix build '.#nixpkgs.freshrss'
|
|
||||||
# $ sudo -u freshrss -g freshrss FRESHRSS_DATA_PATH=/var/lib/freshrss ./result/cli/import-for-user.php --user admin --filename /home/colin/.config/newsflashFeeds.opml
|
|
||||||
# ```
|
|
||||||
#
|
|
||||||
# export feeds with
|
|
||||||
# ```console
|
|
||||||
# $ sudo -u freshrss -g freshrss FRESHRSS_DATA_PATH=/var/lib/freshrss ./result/cli/export-opml-for-user.php --user admin
|
|
||||||
# ```
|
|
||||||
|
|
||||||
{ config, lib, pkgs, ... }:
|
|
||||||
{
|
|
||||||
sops.secrets.freshrss_passwd = {
|
|
||||||
sopsFile = ../../../secrets/servo.yaml;
|
|
||||||
owner = config.users.users.freshrss.name;
|
|
||||||
mode = "400";
|
|
||||||
};
|
|
||||||
sane.impermanence.service-dirs = [
|
|
||||||
{ user = "freshrss"; group = "freshrss"; directory = "/var/lib/freshrss"; }
|
|
||||||
];
|
|
||||||
|
|
||||||
users.users.freshrss.uid = config.sane.allocations.freshrss-uid;
|
|
||||||
users.groups.freshrss.gid = config.sane.allocations.freshrss-gid;
|
|
||||||
services.freshrss.enable = true;
|
|
||||||
services.freshrss.baseUrl = "https://rss.uninsane.org";
|
|
||||||
services.freshrss.virtualHost = "rss.uninsane.org";
|
|
||||||
services.freshrss.passwordFile = config.sops.secrets.freshrss_passwd.path;
|
|
||||||
|
|
||||||
systemd.services.freshrss-import-feeds =
|
|
||||||
let
|
|
||||||
fresh = config.systemd.services.freshrss-config;
|
|
||||||
feeds = import ../../../modules/universal/env/feeds.nix { inherit lib; };
|
|
||||||
opml = pkgs.writeText "sane-freshrss.opml" (feeds.feedsToOpml feeds.all);
|
|
||||||
in {
|
|
||||||
inherit (fresh) wantedBy environment;
|
|
||||||
serviceConfig = {
|
|
||||||
inherit (fresh.serviceConfig) Type User Group StateDirectory WorkingDirectory
|
|
||||||
# hardening options
|
|
||||||
CapabilityBoundingSet DeviceAllow LockPersonality NoNewPrivileges PrivateDevices PrivateTmp PrivateUsers ProcSubset ProtectClock ProtectControlGroups ProtectHome ProtectHostname ProtectKernelLogs ProtectKernelModules ProtectKernelTunables ProtectProc ProtectSystem RemoveIPC RestrictNamespaces RestrictRealtime RestrictSUIDSGID SystemCallArchitectures SystemCallFilter UMask;
|
|
||||||
};
|
|
||||||
description = "import sane RSS feed list";
|
|
||||||
after = [ "freshrss-config.service" ];
|
|
||||||
script = ''
|
|
||||||
${pkgs.freshrss}/cli/import-for-user.php --user admin --filename ${opml}
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -4,6 +4,7 @@
|
|||||||
|
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
|
# ./discord-appservice.nix
|
||||||
./discord-puppet.nix
|
./discord-puppet.nix
|
||||||
# ./irc.nix
|
# ./irc.nix
|
||||||
];
|
];
|
||||||
|
|||||||
69
machines/servo/services/matrix/discord-appservice.nix
Normal file
69
machines/servo/services/matrix/discord-appservice.nix
Normal file
@@ -0,0 +1,69 @@
|
|||||||
|
{ config, lib, ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
sane.impermanence.service-dirs = [
|
||||||
|
{ user = "matrix-appservice-discord"; group = "matrix-appservice-discord"; directory = "/var/lib/matrix-appservice-discord"; }
|
||||||
|
];
|
||||||
|
|
||||||
|
sops.secrets.matrix_appservice_discord_env = {
|
||||||
|
sopsFile = ../../../../secrets/servo/matrix_appservice_discord_env.bin;
|
||||||
|
owner = config.users.users.matrix-appservice-discord.name;
|
||||||
|
format = "binary";
|
||||||
|
};
|
||||||
|
|
||||||
|
services.matrix-synapse.settings.app_service_config_files = [
|
||||||
|
# auto-created by discord appservice
|
||||||
|
"/var/lib/matrix-appservice-discord/discord-registration.yaml"
|
||||||
|
];
|
||||||
|
|
||||||
|
# Discord bridging
|
||||||
|
# docs: https://github.com/matrix-org/matrix-appservice-discord
|
||||||
|
services.matrix-appservice-discord.enable = true;
|
||||||
|
services.matrix-appservice-discord.settings = {
|
||||||
|
bridge = {
|
||||||
|
homeserverUrl = "http://127.0.0.1:8008";
|
||||||
|
domain = "uninsane.org";
|
||||||
|
adminMxid = "admin.matrix@uninsane.org";
|
||||||
|
# self-service bridging is when a Matrix user bridges by DMing @_discord_bot:<HS>
|
||||||
|
# i don't know what the alternative is :?
|
||||||
|
enableSelfServiceBridging = true;
|
||||||
|
presenceInterval = 30000; # milliseconds
|
||||||
|
# allows matrix users to search for Discord channels (somehow?)
|
||||||
|
disablePortalBridging = false;
|
||||||
|
# disableReadReceipts = true;
|
||||||
|
# these are Matrix -> Discord
|
||||||
|
disableJoinLeaveNotifications = true;
|
||||||
|
disableInviteNotifications = true;
|
||||||
|
disableRoomTopicNotifications = true;
|
||||||
|
};
|
||||||
|
# these are marked as required in the yaml schema
|
||||||
|
auth = {
|
||||||
|
# apparently not needed if you provide them as env vars (below).
|
||||||
|
# clientId = "FILLME";
|
||||||
|
# botToken = "FILLME";
|
||||||
|
usePrivilegedIntents = false;
|
||||||
|
};
|
||||||
|
logging = {
|
||||||
|
# silly, verbose, info, http, warn, error, silent
|
||||||
|
console = "verbose";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
# contains what's ordinarily put into auth.clientId, auth.botToken
|
||||||
|
# i.e. `APPSERVICE_DISCORD_AUTH_CLIENT_I_D=...` and `APPSERVICE_DISCORD_AUTH_BOT_TOKEN=...`
|
||||||
|
services.matrix-appservice-discord.environmentFile = config.sops.secrets.matrix_appservice_discord_env.path;
|
||||||
|
|
||||||
|
systemd.services.matrix-appservice-discord.serviceConfig = {
|
||||||
|
# fix up to not use /var/lib/private, but just /var/lib
|
||||||
|
DynamicUser = lib.mkForce false;
|
||||||
|
User = "matrix-appservice-discord";
|
||||||
|
Group = "matrix-appservice-discord";
|
||||||
|
};
|
||||||
|
users.groups.matrix-appservice-discord = {};
|
||||||
|
users.users.matrix-appservice-discord = {
|
||||||
|
description = "User for the Matrix-Discord bridge";
|
||||||
|
group = "matrix-appservice-discord";
|
||||||
|
isSystemUser = true;
|
||||||
|
};
|
||||||
|
users.users.matrix-appservice-discord.uid = 2134; # TODO: move to allocations
|
||||||
|
users.groups.matrix-appservice-discord.gid = 2134; # TODO
|
||||||
|
}
|
||||||
@@ -1,12 +0,0 @@
|
|||||||
{ config, ... }:
|
|
||||||
{
|
|
||||||
services.munin-node.enable = true;
|
|
||||||
services.munin-cron = {
|
|
||||||
enable = true;
|
|
||||||
# collect data from the localhost
|
|
||||||
hosts = ''
|
|
||||||
[${config.networking.hostName}]
|
|
||||||
address localhost
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -6,17 +6,13 @@
|
|||||||
|
|
||||||
# web blog/personal site
|
# web blog/personal site
|
||||||
services.nginx.virtualHosts."uninsane.org" = {
|
services.nginx.virtualHosts."uninsane.org" = {
|
||||||
root = "${pkgs.uninsane-dot-org}/share/uninsane-dot-org";
|
root = "/var/lib/uninsane/root";
|
||||||
# a lot of places hardcode https://uninsane.org,
|
# a lot of places hardcode https://uninsane.org,
|
||||||
# and then when we mix http + non-https, we get CORS violations
|
# and then when we mix http + non-https, we get CORS violations
|
||||||
# and things don't look right. so force SSL.
|
# and things don't look right. so force SSL.
|
||||||
forceSSL = true;
|
forceSSL = true;
|
||||||
enableACME = true;
|
enableACME = true;
|
||||||
|
|
||||||
# uninsane.org/share/foo => /var/lib/uninsane/root/share/foo.
|
|
||||||
# yes, nginx does not strip the prefix when evaluating against the root.
|
|
||||||
locations."/share".root = "/var/lib/uninsane/root";
|
|
||||||
|
|
||||||
# allow matrix users to discover that @user:uninsane.org is reachable via matrix.uninsane.org
|
# allow matrix users to discover that @user:uninsane.org is reachable via matrix.uninsane.org
|
||||||
locations."= /.well-known/matrix/server".extraConfig =
|
locations."= /.well-known/matrix/server".extraConfig =
|
||||||
let
|
let
|
||||||
@@ -57,13 +53,6 @@
|
|||||||
# };
|
# };
|
||||||
};
|
};
|
||||||
|
|
||||||
# server statistics
|
|
||||||
services.nginx.virtualHosts."sink.uninsane.org" = {
|
|
||||||
addSSL = true;
|
|
||||||
enableACME = true;
|
|
||||||
root = "/var/www/munin";
|
|
||||||
};
|
|
||||||
|
|
||||||
# Pleroma server and web interface
|
# Pleroma server and web interface
|
||||||
services.nginx.virtualHosts."fed.uninsane.org" = {
|
services.nginx.virtualHosts."fed.uninsane.org" = {
|
||||||
addSSL = true;
|
addSSL = true;
|
||||||
@@ -230,12 +219,6 @@
|
|||||||
locations."/".proxyPass = "http://127.0.0.1:4533";
|
locations."/".proxyPass = "http://127.0.0.1:4533";
|
||||||
};
|
};
|
||||||
|
|
||||||
services.nginx.virtualHosts."rss.uninsane.org" = {
|
|
||||||
addSSL = true;
|
|
||||||
enableACME = true;
|
|
||||||
# the routing is handled by freshrss.nix
|
|
||||||
};
|
|
||||||
|
|
||||||
services.nginx.virtualHosts."ipfs.uninsane.org" = {
|
services.nginx.virtualHosts."ipfs.uninsane.org" = {
|
||||||
# don't default to ssl upgrades, since this may be dnslink'd from a different domain.
|
# don't default to ssl upgrades, since this may be dnslink'd from a different domain.
|
||||||
# ideally we'd disable ssl entirely, but some places assume it?
|
# ideally we'd disable ssl entirely, but some places assume it?
|
||||||
|
|||||||
@@ -92,8 +92,8 @@
|
|||||||
backends: [{ExSyslogger, :ex_syslogger}]
|
backends: [{ExSyslogger, :ex_syslogger}]
|
||||||
|
|
||||||
config :logger, :ex_syslogger,
|
config :logger, :ex_syslogger,
|
||||||
level: :warn
|
level: :debug
|
||||||
# level: :debug
|
# level: :warn
|
||||||
|
|
||||||
# XXX colin: not sure if this actually _does_ anything
|
# XXX colin: not sure if this actually _does_ anything
|
||||||
config :pleroma, :emoji,
|
config :pleroma, :emoji,
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ in
|
|||||||
{
|
{
|
||||||
sane.impermanence.service-dirs = [
|
sane.impermanence.service-dirs = [
|
||||||
# TODO: mode? could be more granular
|
# TODO: mode? could be more granular
|
||||||
{ user = "opendkim"; group = "opendkim"; directory = "/var/lib/opendkim"; }
|
{ user = "221"; group = "221"; directory = "/var/lib/opendkim"; }
|
||||||
{ user = "root"; group = "root"; directory = "/var/lib/postfix"; }
|
{ user = "root"; group = "root"; directory = "/var/lib/postfix"; }
|
||||||
];
|
];
|
||||||
services.postfix.enable = true;
|
services.postfix.enable = true;
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
{
|
{
|
||||||
sane.impermanence.service-dirs = [
|
sane.impermanence.service-dirs = [
|
||||||
# TODO: mode?
|
# TODO: mode?
|
||||||
{ user = "postgres"; group = "postgres"; directory = "/var/lib/postgresql"; }
|
{ user = "71"; group = "71"; directory = "/var/lib/postgresql"; }
|
||||||
];
|
];
|
||||||
services.postgresql.enable = true;
|
services.postgresql.enable = true;
|
||||||
# services.postgresql.dataDir = "/opt/postgresql/13";
|
# services.postgresql.dataDir = "/opt/postgresql/13";
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
{
|
{
|
||||||
sane.impermanence.service-dirs = [
|
sane.impermanence.service-dirs = [
|
||||||
# TODO: mode? we need this specifically for the stats tracking in .config/
|
# TODO: mode? we need this specifically for the stats tracking in .config/
|
||||||
{ user = "transmission"; group = "transmission"; directory = "/var/lib/transmission"; }
|
{ user = "70"; group = "70"; directory = "/var/lib/transmission"; }
|
||||||
];
|
];
|
||||||
services.transmission.enable = true;
|
services.transmission.enable = true;
|
||||||
services.transmission.settings = {
|
services.transmission.settings = {
|
||||||
|
|||||||
@@ -14,16 +14,6 @@ in
|
|||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
sane.gui.enable = true;
|
sane.gui.enable = true;
|
||||||
|
|
||||||
users.users.avahi.uid = config.sane.allocations.avahi-uid;
|
|
||||||
users.groups.avahi.gid = config.sane.allocations.avahi-gid;
|
|
||||||
users.users.colord.uid = config.sane.allocations.colord-uid;
|
|
||||||
users.groups.colord.gid = config.sane.allocations.colord-gid;
|
|
||||||
users.users.geoclue.uid = config.sane.allocations.geoclue-uid;
|
|
||||||
users.groups.geoclue.gid = config.sane.allocations.geoclue-gid;
|
|
||||||
users.users.rtkit.uid = config.sane.allocations.rtkit-uid;
|
|
||||||
users.groups.rtkit.gid = config.sane.allocations.rtkit-gid;
|
|
||||||
|
|
||||||
# start gnome/gdm on boot
|
# start gnome/gdm on boot
|
||||||
services.xserver.enable = true;
|
services.xserver.enable = true;
|
||||||
services.xserver.desktopManager.gnome.enable = true;
|
services.xserver.desktopManager.gnome.enable = true;
|
||||||
|
|||||||
@@ -10,18 +10,9 @@ in
|
|||||||
default = false;
|
default = false;
|
||||||
type = types.bool;
|
type = types.bool;
|
||||||
};
|
};
|
||||||
sane.gui.phosh.useGreeter = mkOption {
|
|
||||||
description = ''
|
|
||||||
launch phosh via a greeter (like lightdm-mobile-greeter).
|
|
||||||
phosh is usable without a greeter, but skipping the greeter means no PAM session.
|
|
||||||
'';
|
|
||||||
default = true;
|
|
||||||
type = types.bool;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
config = mkIf cfg.enable (mkMerge [
|
config = mkIf cfg.enable {
|
||||||
{
|
|
||||||
sane.gui.enable = true;
|
sane.gui.enable = true;
|
||||||
|
|
||||||
users.users.avahi.uid = config.sane.allocations.avahi-uid;
|
users.users.avahi.uid = config.sane.allocations.avahi-uid;
|
||||||
@@ -30,7 +21,6 @@ in
|
|||||||
users.users.rtkit.uid = config.sane.allocations.rtkit-uid;
|
users.users.rtkit.uid = config.sane.allocations.rtkit-uid;
|
||||||
users.groups.avahi.gid = config.sane.allocations.avahi-gid;
|
users.groups.avahi.gid = config.sane.allocations.avahi-gid;
|
||||||
users.groups.colord.gid = config.sane.allocations.colord-gid;
|
users.groups.colord.gid = config.sane.allocations.colord-gid;
|
||||||
users.groups.feedbackd.gid = config.sane.allocations.feedbackd-gid;
|
|
||||||
users.groups.geoclue.gid = config.sane.allocations.geoclue-gid;
|
users.groups.geoclue.gid = config.sane.allocations.geoclue-gid;
|
||||||
users.groups.rtkit.gid = config.sane.allocations.rtkit-gid;
|
users.groups.rtkit.gid = config.sane.allocations.rtkit-gid;
|
||||||
|
|
||||||
@@ -75,35 +65,5 @@ in
|
|||||||
# TODO: see about removing this if the in-built gnome-settings bluetooth manager can work
|
# TODO: see about removing this if the in-built gnome-settings bluetooth manager can work
|
||||||
gnome.gnome-bluetooth
|
gnome.gnome-bluetooth
|
||||||
];
|
];
|
||||||
}
|
|
||||||
(mkIf cfg.useGreeter {
|
|
||||||
services.xserver.enable = true;
|
|
||||||
# NB: setting defaultSession has the critical side-effect that it lets org.freedesktop.AccountsService
|
|
||||||
# know that our user exists. this ensures lightdm succeeds when calling /org/freedesktop/AccountsServices ListCachedUsers
|
|
||||||
# lightdm greeters get the login users from lightdm which gets it from org.freedesktop.Accounts.ListCachedUsers.
|
|
||||||
# this requires the user we want to login as to be cached.
|
|
||||||
services.xserver.displayManager.job.preStart = ''
|
|
||||||
${pkgs.systemd}/bin/busctl call org.freedesktop.Accounts /org/freedesktop/Accounts org.freedesktop.Accounts CacheUser s colin
|
|
||||||
'';
|
|
||||||
# services.xserver.displayManager.defaultSession = "sm.puri.Phosh"; # XXX: not sure why this doesn't propagate correctly.
|
|
||||||
services.xserver.displayManager.lightdm.extraSeatDefaults = ''
|
|
||||||
user-session = phosh
|
|
||||||
'';
|
|
||||||
services.xserver.displayManager.lightdm.greeters.gtk.enable = false; # gtk greeter overrides our own?
|
|
||||||
services.xserver.displayManager.lightdm.greeter = {
|
|
||||||
enable = true;
|
|
||||||
package = pkgs.lightdm-mobile-greeter.xgreeters;
|
|
||||||
name = "lightdm-mobile-greeter";
|
|
||||||
};
|
};
|
||||||
# services.xserver.displayManager.lightdm.enable = true;
|
|
||||||
# # services.xserver.displayManager.lightdm.greeters.enso.enable = true; # tried (with reboot); got a mouse then died. next time was black
|
|
||||||
# # services.xserver.displayManager.lightdm.greeters.gtk.enable = true; # tried (with reboot); unusable without OSK
|
|
||||||
# # services.xserver.displayManager.lightdm.greeters.mini.enable = true; # tried (with reboot); unusable without OSK
|
|
||||||
# # services.xserver.displayManager.lightdm.greeters.pantheon.enable = true; # tried (no reboot); unusable without OSK
|
|
||||||
# services.xserver.displayManager.lightdm.greeters.slick.enable = true; # tried; unusable without OSK (a11y -> OSK doesn't work)
|
|
||||||
# # services.xserver.displayManager.lightdm.greeters.tiny.enable = true; # tried; block screen
|
|
||||||
|
|
||||||
systemd.services.phosh.wantedBy = lib.mkForce []; # disable auto-start
|
|
||||||
})
|
|
||||||
]);
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -21,24 +21,15 @@ in
|
|||||||
enable = true;
|
enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
# alternatively, could use SDDM
|
# TODO: should be able to use SDDM to get interactive login
|
||||||
services.greetd = let
|
services.greetd = {
|
||||||
swayConfig = pkgs.writeText "greetd-sway-config" ''
|
|
||||||
# `-l` activates layer-shell mode.
|
|
||||||
exec "${pkgs.greetd.gtkgreet}/bin/gtkgreet -l -c sway"
|
|
||||||
'';
|
|
||||||
in {
|
|
||||||
# greetd source/docs:
|
|
||||||
# - <https://git.sr.ht/~kennylevinsen/greetd>
|
|
||||||
enable = true;
|
enable = true;
|
||||||
settings = {
|
settings = rec {
|
||||||
default_session = {
|
initial_session = {
|
||||||
command = "${pkgs.sway}/bin/sway --config ${swayConfig}";
|
command = "${pkgs.sway}/bin/sway";
|
||||||
# alternatives:
|
user = "colin";
|
||||||
# - TTY: `command = "${pkgs.greetd.greetd}/bin/agreety --cmd ${pkgs.sway}/bin/sway";`
|
|
||||||
# - autologin: `command = "${pkgs.sway}/bin/sway"; user = "colin";`
|
|
||||||
# - Dumb Login (doesn't work)": `command = "${pkgs.greetd.dlm}/bin/dlm";`
|
|
||||||
};
|
};
|
||||||
|
default_session = initial_session;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -97,22 +88,21 @@ in
|
|||||||
"${modifier}+Return" = "exec ${terminal}";
|
"${modifier}+Return" = "exec ${terminal}";
|
||||||
"${modifier}+Shift+q" = "kill";
|
"${modifier}+Shift+q" = "kill";
|
||||||
"${modifier}+d" = "exec ${menu}";
|
"${modifier}+d" = "exec ${menu}";
|
||||||
"${modifier}+l" = "exec ${pkgs.swaylock}/bin/swaylock --indicator-idle-visible --indicator-radius 100 --indicator-thickness 30";
|
|
||||||
|
|
||||||
# "${modifier}+${left}" = "focus left";
|
"${modifier}+${left}" = "focus left";
|
||||||
# "${modifier}+${down}" = "focus down";
|
"${modifier}+${down}" = "focus down";
|
||||||
# "${modifier}+${up}" = "focus up";
|
"${modifier}+${up}" = "focus up";
|
||||||
# "${modifier}+${right}" = "focus right";
|
"${modifier}+${right}" = "focus right";
|
||||||
|
|
||||||
"${modifier}+Left" = "focus left";
|
"${modifier}+Left" = "focus left";
|
||||||
"${modifier}+Down" = "focus down";
|
"${modifier}+Down" = "focus down";
|
||||||
"${modifier}+Up" = "focus up";
|
"${modifier}+Up" = "focus up";
|
||||||
"${modifier}+Right" = "focus right";
|
"${modifier}+Right" = "focus right";
|
||||||
|
|
||||||
# "${modifier}+Shift+${left}" = "move left";
|
"${modifier}+Shift+${left}" = "move left";
|
||||||
# "${modifier}+Shift+${down}" = "move down";
|
"${modifier}+Shift+${down}" = "move down";
|
||||||
# "${modifier}+Shift+${up}" = "move up";
|
"${modifier}+Shift+${up}" = "move up";
|
||||||
# "${modifier}+Shift+${right}" = "move right";
|
"${modifier}+Shift+${right}" = "move right";
|
||||||
|
|
||||||
"${modifier}+Shift+Left" = "move left";
|
"${modifier}+Shift+Left" = "move left";
|
||||||
"${modifier}+Shift+Down" = "move down";
|
"${modifier}+Shift+Down" = "move down";
|
||||||
@@ -582,7 +572,7 @@ in
|
|||||||
};
|
};
|
||||||
sane.home-manager.extraPackages = with pkgs; [
|
sane.home-manager.extraPackages = with pkgs; [
|
||||||
swaylock
|
swaylock
|
||||||
swayidle # (unused)
|
swayidle
|
||||||
wl-clipboard
|
wl-clipboard
|
||||||
mako # notification daemon
|
mako # notification daemon
|
||||||
xdg-utils # for xdg-open
|
xdg-utils # for xdg-open
|
||||||
|
|||||||
@@ -23,9 +23,6 @@ in
|
|||||||
sane.allocations.greeter-uid = mkId 999;
|
sane.allocations.greeter-uid = mkId 999;
|
||||||
sane.allocations.greeter-gid = mkId 999;
|
sane.allocations.greeter-gid = mkId 999;
|
||||||
|
|
||||||
sane.allocations.freshrss-uid = mkId 2401;
|
|
||||||
sane.allocations.freshrss-gid = mkId 2401;
|
|
||||||
|
|
||||||
sane.allocations.colin-uid = mkId 1000;
|
sane.allocations.colin-uid = mkId 1000;
|
||||||
sane.allocations.guest-uid = mkId 1100;
|
sane.allocations.guest-uid = mkId 1100;
|
||||||
|
|
||||||
|
|||||||
16
modules/universal/env/default.nix
vendored
16
modules/universal/env/default.nix
vendored
@@ -1,7 +1,8 @@
|
|||||||
{ pkgs, ... }:
|
{ ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
|
./feeds.nix
|
||||||
./home-manager.nix
|
./home-manager.nix
|
||||||
./home-packages.nix
|
./home-packages.nix
|
||||||
./system-packages.nix
|
./system-packages.nix
|
||||||
@@ -19,18 +20,5 @@
|
|||||||
# NIXOS_OZONE_WL = "1";
|
# NIXOS_OZONE_WL = "1";
|
||||||
# LIBGL_ALWAYS_SOFTWARE = "1";
|
# LIBGL_ALWAYS_SOFTWARE = "1";
|
||||||
};
|
};
|
||||||
# enable zsh completions
|
|
||||||
environment.pathsToLink = [ "/share/zsh" ];
|
|
||||||
environment.systemPackages = with pkgs; [
|
|
||||||
# required for pam_mount
|
|
||||||
gocryptfs
|
|
||||||
];
|
|
||||||
|
|
||||||
security.pam.mount.enable = true;
|
|
||||||
# security.pam.mount.debugLevel = 1;
|
|
||||||
# security.pam.enableSSHAgentAuth = true; # ??
|
|
||||||
# needed for `allow_other` in e.g. gocryptfs mounts
|
|
||||||
# or i guess going through mount.fuse sets suid so that's not necessary?
|
|
||||||
# programs.fuse.userAllowOther = true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
194
modules/universal/env/feeds.nix
vendored
194
modules/universal/env/feeds.nix
vendored
@@ -1,175 +1,41 @@
|
|||||||
{ lib }:
|
{ lib, ... }:
|
||||||
|
|
||||||
let
|
with lib;
|
||||||
hourly = { freq = "hourly"; };
|
{
|
||||||
daily = { freq = "daily"; };
|
options = {
|
||||||
weekly = { freq = "weekly"; };
|
sane.feeds.podcastUrls = mkOption {
|
||||||
infrequent = { freq = "infrequent"; };
|
type = types.listOf types.str;
|
||||||
|
default = [
|
||||||
art = { cat = "art"; };
|
"https://lexfridman.com/feed/podcast/"
|
||||||
humor = { cat = "humor"; };
|
|
||||||
pol = { cat = "pol"; }; # or maybe just "social"
|
|
||||||
rat = { cat = "rat"; };
|
|
||||||
tech = { cat = "tech"; };
|
|
||||||
uncat = { cat = "uncat"; };
|
|
||||||
|
|
||||||
text = { format = "text"; };
|
|
||||||
image = { format = "image"; };
|
|
||||||
podcast = { format = "podcast"; };
|
|
||||||
|
|
||||||
mkRss = format: url: { inherit url format; } // uncat // infrequent;
|
|
||||||
mkText = mkRss text;
|
|
||||||
mkImg = mkRss image;
|
|
||||||
mkPod = mkRss podcast;
|
|
||||||
|
|
||||||
# merge the attrs `new` into each value of the attrs `addTo`
|
|
||||||
addAttrs = new: addTo: builtins.mapAttrs (k: v: v // new) addTo;
|
|
||||||
# for each value in `attrs`, add a value to the child attrs which holds its key within the parent attrs.
|
|
||||||
withInverseMapping = key: attrs: builtins.mapAttrs (k: v: v // { "${key}" = k; }) attrs;
|
|
||||||
in rec {
|
|
||||||
podcasts = [
|
|
||||||
(mkPod "https://lexfridman.com/feed/podcast/" // rat // weekly)
|
|
||||||
## Astral Codex Ten
|
## Astral Codex Ten
|
||||||
(mkPod "http://feeds.libsyn.com/108018/rss" // rat // daily)
|
"http://feeds.libsyn.com/108018/rss"
|
||||||
## Econ Talk
|
## Econ Talk
|
||||||
(mkPod "https://feeds.simplecast.com/wgl4xEgL" // rat // daily)
|
"https://feeds.simplecast.com/wgl4xEgL"
|
||||||
## Cory Doctorow
|
## Cory Doctorow
|
||||||
(mkPod "https://feeds.feedburner.com/doctorow_podcast" // pol // infrequent)
|
"https://feeds.feedburner.com/doctorow_podcast"
|
||||||
(mkPod "https://congressionaldish.libsyn.com/rss" // pol // infrequent)
|
"https://congressionaldish.libsyn.com/rss"
|
||||||
## Civboot
|
## Civboot
|
||||||
(mkPod "https://anchor.fm/s/34c7232c/podcast/rss" // tech // infrequent)
|
"https://anchor.fm/s/34c7232c/podcast/rss"
|
||||||
(mkPod "https://feeds.feedburner.com/80000HoursPodcast" // rat // weekly)
|
"https://feeds.feedburner.com/80000HoursPodcast"
|
||||||
(mkPod "https://allinchamathjason.libsyn.com/rss" // pol // weekly)
|
"https://allinchamathjason.libsyn.com/rss"
|
||||||
(mkPod "https://acquired.libsyn.com/rss" // tech // infrequent)
|
"https://acquired.libsyn.com/rss"
|
||||||
(mkPod "https://rss.acast.com/deconstructed" // pol // infrequent)
|
"https://rss.acast.com/deconstructed"
|
||||||
## The Daily
|
## The Daily
|
||||||
(mkPod "https://feeds.simplecast.com/54nAGcIl" // pol // daily)
|
"https://feeds.simplecast.com/54nAGcIl"
|
||||||
(mkPod "https://rss.acast.com/intercepted-with-jeremy-scahill" // pol // weekly)
|
"https://rss.acast.com/intercepted-with-jeremy-scahill"
|
||||||
(mkPod "https://podcast.posttv.com/itunes/post-reports.xml" // pol // weekly)
|
"https://podcast.posttv.com/itunes/post-reports.xml"
|
||||||
## Eric Weinstein
|
## Eric Weinstein
|
||||||
(mkPod "https://rss.art19.com/the-portal" // rat // infrequent)
|
"https://rss.art19.com/the-portal"
|
||||||
(mkPod "https://feeds.megaphone.fm/darknetdiaries" // tech // infrequent)
|
"https://feeds.megaphone.fm/darknetdiaries"
|
||||||
(mkPod "http://feeds.wnyc.org/radiolab" // pol // infrequent)
|
"http://feeds.wnyc.org/radiolab"
|
||||||
(mkPod "https://wakingup.libsyn.com/rss" // pol // infrequent)
|
"https://wakingup.libsyn.com/rss"
|
||||||
## 99% Invisible
|
## 99% Invisible
|
||||||
(mkPod "https://feeds.simplecast.com/BqbsxVfO" // pol // infrequent)
|
"https://feeds.simplecast.com/BqbsxVfO"
|
||||||
(mkPod "https://rss.acast.com/ft-tech-tonic" // tech // infrequent)
|
"https://rss.acast.com/ft-tech-tonic"
|
||||||
(mkPod "https://feeds.feedburner.com/dancarlin/history?format=xml" // rat // infrequent)
|
"https://feeds.feedburner.com/dancarlin/history?format=xml"
|
||||||
## 60 minutes (NB: this features more than *just* audio?)
|
## 60 minutes (NB: this features more than *just* audio?)
|
||||||
(mkPod "https://www.cbsnews.com/latest/rss/60-minutes" // pol // infrequent)
|
"https://www.cbsnews.com/latest/rss/60-minutes"
|
||||||
];
|
];
|
||||||
|
};
|
||||||
texts = [
|
};
|
||||||
# AGGREGATORS (> 1 post/day)
|
|
||||||
(mkText "https://www.lesswrong.com/feed.xml" // rat // hourly)
|
|
||||||
(mkText "http://www.econlib.org/index.xml" // pol // hourly)
|
|
||||||
|
|
||||||
# AGGREGATORS (< 1 post/day)
|
|
||||||
(mkText "https://palladiummag.com/feed" // uncat // weekly)
|
|
||||||
(mkText "https://profectusmag.com/feed" // uncat // weekly)
|
|
||||||
(mkText "https://semiaccurate.com/feed" // tech // weekly)
|
|
||||||
(mkText "https://linuxphoneapps.org/blog/atom.xml" // tech // infrequent)
|
|
||||||
(mkText "https://spectrum.ieee.org/rss" // tech // weekly)
|
|
||||||
|
|
||||||
## No Moods, Ads or Cutesy Fucking Icons
|
|
||||||
(mkText "https://www.rifters.com/crawl/?feed=rss2" // uncat // weekly)
|
|
||||||
|
|
||||||
# DEVELOPERS
|
|
||||||
(mkText "https://mg.lol/blog/rss/" // infrequent // tech)
|
|
||||||
## Ken Shirriff
|
|
||||||
(mkText "https://www.righto.com/feeds/posts/default" // tech // infrequent)
|
|
||||||
## Vitalik Buterin
|
|
||||||
(mkText "https://vitalik.ca/feed.xml" // tech // infrequent)
|
|
||||||
## ian (Sanctuary)
|
|
||||||
(mkText "https://sagacioussuricata.com/feed.xml" // tech // infrequent)
|
|
||||||
## Bunnie Juang
|
|
||||||
(mkText "https://www.bunniestudios.com/blog/?feed=rss2" // tech // infrequent)
|
|
||||||
(mkText "https://blog.danieljanus.pl/atom.xml" // tech // infrequent)
|
|
||||||
(mkText "https://ianthehenry.com/feed.xml" // tech // infrequent)
|
|
||||||
(mkText "https://bitbashing.io/feed.xml" // tech // infrequent)
|
|
||||||
(mkText "https://idiomdrottning.org/feed.xml" // uncat // daily)
|
|
||||||
|
|
||||||
# (TECH; POL) COMMENTATORS
|
|
||||||
(mkText "http://benjaminrosshoffman.com/feed" // pol // weekly)
|
|
||||||
## Ben Thompson
|
|
||||||
(mkText "https://www.stratechery.com/rss" // pol // weekly)
|
|
||||||
## Balaji
|
|
||||||
(mkText "https://balajis.com/rss" // pol // weekly)
|
|
||||||
(mkText "https://www.ben-evans.com/benedictevans/rss.xml" // pol // weekly)
|
|
||||||
(mkText "https://www.lynalden.com/feed" // pol // infrequent)
|
|
||||||
(mkText "https://austinvernon.site/rss.xml" // tech // infrequent)
|
|
||||||
(mkText "https://oversharing.substack.com/feed" // pol // daily)
|
|
||||||
(mkText "https://doomberg.substack.com/feed" // tech // weekly)
|
|
||||||
## David Rosenthal
|
|
||||||
(mkText "https://blog.dshr.org/rss.xml" // pol // weekly)
|
|
||||||
## Matt Levine
|
|
||||||
(mkText "https://www.bloomberg.com/opinion/authors/ARbTQlRLRjE/matthew-s-levine.rss" // pol // weekly)
|
|
||||||
|
|
||||||
# RATIONALITY/PHILOSOPHY/ETC
|
|
||||||
(mkText "https://samkriss.substack.com/feed" // humor // infrequent)
|
|
||||||
(mkText "https://unintendedconsequenc.es/feed" // rat // infrequent)
|
|
||||||
(mkText "https://applieddivinitystudies.com/atom.xml" // rat // weekly)
|
|
||||||
(mkText "https://slimemoldtimemold.com/feed.xml" // rat // weekly)
|
|
||||||
(mkText "https://www.richardcarrier.info/feed" // rat // weekly)
|
|
||||||
(mkText "https://www.gwern.net/feed.xml" // uncat // infrequent)
|
|
||||||
## Jason Crawford
|
|
||||||
(mkText "https://rootsofprogress.org/feed.xml" // rat // weekly)
|
|
||||||
## Robin Hanson
|
|
||||||
(mkText "https://www.overcomingbias.com/feed" // rat // daily)
|
|
||||||
## Scott Alexander
|
|
||||||
(mkText "https://astralcodexten.substack.com/feed.xml" // rat // daily)
|
|
||||||
## Paul Christiano
|
|
||||||
(mkText "https://sideways-view.com/feed" // rat // infrequent)
|
|
||||||
## Sean Carroll
|
|
||||||
(mkText "https://www.preposterousuniverse.com/rss" // rat // infrequent)
|
|
||||||
|
|
||||||
# CODE
|
|
||||||
(mkText "https://github.com/Kaiteki-Fedi/Kaiteki/commits/master.atom" // tech // infrequent)
|
|
||||||
];
|
|
||||||
|
|
||||||
images = [
|
|
||||||
(mkImg "https://www.smbc-comics.com/comic/rss" // humor // daily)
|
|
||||||
(mkImg "https://xkcd.com/atom.xml" // humor // daily)
|
|
||||||
(mkImg "http://dilbert.com/feed" // humor // daily)
|
|
||||||
|
|
||||||
# ART
|
|
||||||
(mkImg "https://miniature-calendar.com/feed" // art // daily)
|
|
||||||
];
|
|
||||||
|
|
||||||
all = texts ++ images ++ podcasts;
|
|
||||||
|
|
||||||
# return only the feed items which match this category (e.g. "tech")
|
|
||||||
filterCat = cat: feeds: builtins.filter (item: item.cat == cat) feeds;
|
|
||||||
# return only the feed items which match this format (e.g. "podcast")
|
|
||||||
filterFormat = format: feeds: builtins.filter (item: item.format == format) feeds;
|
|
||||||
|
|
||||||
# transform a list of feeds into an attrs mapping cat => [ feed0 feed1 ... ]
|
|
||||||
partitionByCat = feeds: builtins.groupBy (f: f.cat) feeds;
|
|
||||||
|
|
||||||
# represents a single RSS feed.
|
|
||||||
opmlTerminal = feed: ''<outline xmlUrl="${feed.url}" type="rss"/>'';
|
|
||||||
# a list of RSS feeds.
|
|
||||||
opmlTerminals = feeds: lib.strings.concatStringsSep "\n" (builtins.map opmlTerminal feeds);
|
|
||||||
# one node which packages some flat grouping of terminals.
|
|
||||||
opmlGroup = title: feeds: ''
|
|
||||||
<outline text="${title}" title="${title}">
|
|
||||||
${opmlTerminals feeds}
|
|
||||||
</outline>
|
|
||||||
'';
|
|
||||||
# a list of groups (`groupMap` is an attrs mapping groupName => [ feed0 feed1 ... ]).
|
|
||||||
opmlGroups = groupMap: lib.strings.concatStringsSep "\n" (
|
|
||||||
builtins.attrValues (builtins.mapAttrs opmlGroup groupMap)
|
|
||||||
);
|
|
||||||
# top-level OPML file which could be consumed by something else.
|
|
||||||
opmlTopLevel = body: ''
|
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<opml version="2.0">
|
|
||||||
<body>
|
|
||||||
${body}
|
|
||||||
</body>
|
|
||||||
</opml>
|
|
||||||
'';
|
|
||||||
|
|
||||||
# **primary API**: generate a OPML file from the provided feeds
|
|
||||||
feedsToOpml = feeds: opmlTopLevel (opmlGroups (partitionByCat feeds));
|
|
||||||
}
|
}
|
||||||
|
|||||||
191
modules/universal/env/home-manager.nix
vendored
191
modules/universal/env/home-manager.nix
vendored
@@ -17,7 +17,6 @@ let
|
|||||||
# extract `persist-files` from `extraPackages`
|
# extract `persist-files` from `extraPackages`
|
||||||
persistfileslist = pkgspec: builtins.concatLists (builtins.map (e: if e ? "persist-files" then e.persist-files else []) pkgspec);
|
persistfileslist = pkgspec: builtins.concatLists (builtins.map (e: if e ? "persist-files" then e.persist-files else []) pkgspec);
|
||||||
# TODO: dirlist and persistfileslist should be folded
|
# TODO: dirlist and persistfileslist should be folded
|
||||||
feeds = import ./feeds.nix { inherit lib; };
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
options = {
|
options = {
|
||||||
@@ -117,36 +116,28 @@ in
|
|||||||
# the xdg mime type for a file can be found with:
|
# the xdg mime type for a file can be found with:
|
||||||
# - `xdg-mime query filetype path/to/thing.ext`
|
# - `xdg-mime query filetype path/to/thing.ext`
|
||||||
xdg.mimeApps.enable = true;
|
xdg.mimeApps.enable = true;
|
||||||
xdg.mimeApps.defaultApplications = let
|
xdg.mimeApps.defaultApplications = {
|
||||||
www = "librewolf.desktop";
|
|
||||||
pdf = "org.gnome.Evince.desktop";
|
|
||||||
md = "obsidian.desktop";
|
|
||||||
thumb = "org.gnome.gThumb.desktop";
|
|
||||||
video = "vlc.desktop";
|
|
||||||
# audio = "mpv.desktop";
|
|
||||||
audio = "vlc.desktop";
|
|
||||||
in {
|
|
||||||
# HTML
|
# HTML
|
||||||
"text/html" = [ www ];
|
"text/html" = [ "librewolf.desktop" ];
|
||||||
"x-scheme-handler/http" = [ www ];
|
"x-scheme-handler/http" = [ "librewolf.desktop" ];
|
||||||
"x-scheme-handler/https" = [ www ];
|
"x-scheme-handler/https" = [ "librewolf.desktop" ];
|
||||||
"x-scheme-handler/about" = [ www ];
|
"x-scheme-handler/about" = [ "librewolf.desktop" ];
|
||||||
"x-scheme-handler/unknown" = [ www ];
|
"x-scheme-handler/unknown" = [ "librewolf.desktop" ];
|
||||||
# RICH-TEXT DOCUMENTS
|
# RICH-TEXT DOCUMENTS
|
||||||
"application/pdf" = [ pdf ];
|
"application/pdf" = [ "org.gnome.Evince.desktop" ];
|
||||||
"text/markdown" = [ md ];
|
"text/markdown" = [ "obsidian.desktop" ];
|
||||||
# IMAGES
|
# IMAGES
|
||||||
"image/heif" = [ thumb ]; # apple codec
|
"image/heif" = [ "org.gnome.gThumb.desktop" ]; # apple codec
|
||||||
"image/png" = [ thumb ];
|
"image/png" = [ "org.gnome.gThumb.desktop" ];
|
||||||
"image/jpeg" = [ thumb ];
|
"image/jpeg" = [ "org.gnome.gThumb.desktop" ];
|
||||||
# VIDEO
|
# VIDEO
|
||||||
"video/mp4" = [ video ];
|
"video/mp4" = [ "vlc.desktop" ];
|
||||||
"video/quicktime" = [ video ];
|
"video/quicktime" = [ "vlc.desktop" ];
|
||||||
"video/x-matroska" = [ video ];
|
"video/x-matroska" = [ "vlc.desktop" ];
|
||||||
# AUDIO
|
# AUDIO
|
||||||
"audio/flac" = [ audio ];
|
"audio/flag" = [ "vlc.desktop" ];
|
||||||
"audio/mpeg" = [ audio ];
|
"audio/mpeg" = [ "vlc.desktop" ];
|
||||||
"audio/x-vorbis+ogg" = [ audio ];
|
"audio/x-vorbis+ogg" = [ "vlc.desktop" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
# convenience
|
# convenience
|
||||||
@@ -206,9 +197,7 @@ in
|
|||||||
|
|
||||||
xdg.configFile."vlc/vlcrc".text =
|
xdg.configFile."vlc/vlcrc".text =
|
||||||
let
|
let
|
||||||
podcastUrls = lib.strings.concatStringsSep "|" (
|
podcastUrls = lib.strings.concatStringsSep "|" sysconfig.sane.feeds.podcastUrls;
|
||||||
builtins.map (feed: feed.url) feeds.podcasts
|
|
||||||
);
|
|
||||||
in ''
|
in ''
|
||||||
[podcast]
|
[podcast]
|
||||||
podcast-urls=${podcastUrls}
|
podcast-urls=${podcastUrls}
|
||||||
@@ -217,24 +206,100 @@ in
|
|||||||
[qt]
|
[qt]
|
||||||
qt-privacy-ask=0
|
qt-privacy-ask=0
|
||||||
'';
|
'';
|
||||||
|
xdg.configFile."gpodderFeeds.opml".text =
|
||||||
xdg.configFile."gpodderFeeds.opml".text = with feeds;
|
let
|
||||||
feedsToOpml feeds.podcasts;
|
entries = builtins.toString (builtins.map
|
||||||
|
(url: ''\n <outline xmlUrl="${url}" type="rss"/>'')
|
||||||
# news-flash RSS viewer
|
sysconfig.sane.feeds.podcastUrls
|
||||||
xdg.configFile."newsflashFeeds.opml".text = with feeds;
|
);
|
||||||
feedsToOpml (feeds.texts ++ feeds.images);
|
in ''
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<opml version="2.0">
|
||||||
|
<body>${entries}
|
||||||
|
</body>
|
||||||
|
</opml>
|
||||||
|
'';
|
||||||
|
|
||||||
# gnome feeds RSS viewer
|
# gnome feeds RSS viewer
|
||||||
xdg.configFile."org.gabmus.gfeeds.json".text =
|
xdg.configFile."org.gabmus.gfeeds.json".text = builtins.toJSON {
|
||||||
let
|
feeds = {
|
||||||
myFeeds = feeds.texts ++ feeds.images;
|
# AGGREGATORS (> 1 post/day)
|
||||||
in builtins.toJSON {
|
"https://www.lesswrong.com/feed.xml" = { tags = [ "hourly" "rat" ]; };
|
||||||
# feed format is a map from URL to a dict,
|
"http://www.econlib.org/index.xml" = { tags = [ "hourly" "pol" ]; };
|
||||||
# with dict["tags"] a list of string tags.
|
# AGGREGATORS (< 1 post/day)
|
||||||
feeds = builtins.foldl' (acc: feed: acc // {
|
"https://palladiummag.com/feed" = { tags = [ "weekly" "uncat" ]; };
|
||||||
"${feed.url}".tags = [ feed.cat feed.freq ];
|
"https://profectusmag.com/feed" = { tags = [ "weekly" "uncat" ]; };
|
||||||
}) {} myFeeds;
|
|
||||||
|
"https://semiaccurate.com/feed" = { tags = [ "weekly" "tech" ]; };
|
||||||
|
"https://linuxphoneapps.org/blog/atom.xml" = { tags = [ "infrequent" "tech" ]; };
|
||||||
|
"https://spectrum.ieee.org/rss" = { tags = [ "weekly" "tech" ]; };
|
||||||
|
|
||||||
|
## No Moods, Ads or Cutesy Fucking Icons
|
||||||
|
"https://www.rifters.com/crawl/?feed=rss2" = { tags = [ "weekly" "uncat" ]; };
|
||||||
|
|
||||||
|
# DEVELOPERS
|
||||||
|
"https://mg.lol/blog/rss/" = { tags = [ "infrequent" "tech" ]; };
|
||||||
|
## Ken Shirriff
|
||||||
|
"https://www.righto.com/feeds/posts/default" = { tags = [ "infrequent" "tech" ]; };
|
||||||
|
## Vitalik Buterin
|
||||||
|
"https://vitalik.ca/feed.xml" = { tags = [ "infrequent" "tech" ]; };
|
||||||
|
## ian (Sanctuary)
|
||||||
|
"https://sagacioussuricata.com/feed.xml" = { tags = [ "infrequent" "tech" ]; };
|
||||||
|
## Bunnie Juang
|
||||||
|
"https://www.bunniestudios.com/blog/?feed=rss2" = { tags = [ "infrequent" "tech" ]; };
|
||||||
|
"https://blog.danieljanus.pl/atom.xml" = { tags = [ "infrequent" "tech" ]; };
|
||||||
|
"https://ianthehenry.com/feed.xml" = { tags = [ "infrequent" "tech" ]; };
|
||||||
|
"https://bitbashing.io/feed.xml" = { tags = [ "infrequent" "tech" ]; };
|
||||||
|
"https://idiomdrottning.org/feed.xml" = { tags = [ "daily" "uncat" ]; };
|
||||||
|
|
||||||
|
# (TECH; POL) COMMENTATORS
|
||||||
|
"http://benjaminrosshoffman.com/feed" = { tags = [ "weekly" "pol" ]; };
|
||||||
|
## Ben Thompson
|
||||||
|
"https://www.stratechery.com/rss" = { tags = [ "weekly" "pol" ]; };
|
||||||
|
## Balaji
|
||||||
|
"https://balajis.com/rss" = { tags = [ "weekly" "pol" ]; };
|
||||||
|
"https://www.ben-evans.com/benedictevans/rss.xml" = { tags = [ "weekly" "pol" ]; };
|
||||||
|
"https://www.lynalden.com/feed" = { tags = [ "infrequent" "pol" ]; };
|
||||||
|
"https://austinvernon.site/rss.xml" = { tags = [ "infrequent" "tech" ]; };
|
||||||
|
"https://oversharing.substack.com/feed" = { tags = [ "daily" "pol" ]; };
|
||||||
|
"https://doomberg.substack.com/feed" = { tags = [ "weekly" "tech" ]; };
|
||||||
|
## David Rosenthal
|
||||||
|
"https://blog.dshr.org/rss.xml" = { tags = [ "weekly" "pol" ]; };
|
||||||
|
## Matt Levine
|
||||||
|
"https://www.bloomberg.com/opinion/authors/ARbTQlRLRjE/matthew-s-levine.rss" = { tags = [ "weekly" "pol" ]; };
|
||||||
|
|
||||||
|
# RATIONALITY/PHILOSOPHY/ETC
|
||||||
|
"https://samkriss.substack.com/feed" = { tags = [ "infrequent" "uncat" ]; }; # ... satire? phil?
|
||||||
|
"https://unintendedconsequenc.es/feed" = { tags = [ "infrequent" "rat" ]; };
|
||||||
|
|
||||||
|
"https://applieddivinitystudies.com/atom.xml" = { tags = [ "weekly" "rat" ]; };
|
||||||
|
"https://slimemoldtimemold.com/feed.xml" = { tags = [ "weekly" "rat" ]; };
|
||||||
|
|
||||||
|
"https://www.richardcarrier.info/feed" = { tags = [ "weekly" "rat" ]; };
|
||||||
|
"https://www.gwern.net/feed.xml" = { tags = [ "infrequent" "uncat" ]; };
|
||||||
|
|
||||||
|
## Jason Crawford
|
||||||
|
"https://rootsofprogress.org/feed.xml" = { tags = [ "weekly" "rat" ]; };
|
||||||
|
## Robin Hanson
|
||||||
|
"https://www.overcomingbias.com/feed" = { tags = [ "daily" "rat" ]; };
|
||||||
|
## Scott Alexander
|
||||||
|
"https://astralcodexten.substack.com/feed.xml" = { tags = [ "daily" "rat" ]; };
|
||||||
|
## Paul Christiano
|
||||||
|
"https://sideways-view.com/feed" = { tags = [ "infrequent" "rat" ]; };
|
||||||
|
## Sean Carroll
|
||||||
|
"https://www.preposterousuniverse.com/rss" = { tags = [ "infrequent" "rat" ]; };
|
||||||
|
|
||||||
|
# COMICS
|
||||||
|
"https://www.smbc-comics.com/comic/rss" = { tags = [ "daily" "visual" ]; };
|
||||||
|
"https://xkcd.com/atom.xml" = { tags = [ "daily" "visual" ]; };
|
||||||
|
"http://dilbert.com/feed" = { tags = ["daily" "visual" ]; };
|
||||||
|
|
||||||
|
# ART
|
||||||
|
"https://miniature-calendar.com/feed" = { tags = [ "daily" "visual" ]; };
|
||||||
|
|
||||||
|
# CODE
|
||||||
|
"https://github.com/Kaiteki-Fedi/Kaiteki/commits/master.atom" = { tags = [ "infrequent" "tech" ]; };
|
||||||
|
};
|
||||||
dark_reader = false;
|
dark_reader = false;
|
||||||
new_first = true;
|
new_first = true;
|
||||||
# windowsize = {
|
# windowsize = {
|
||||||
@@ -253,9 +318,17 @@ in
|
|||||||
open_links_externally = true;
|
open_links_externally = true;
|
||||||
full_feed_name = false;
|
full_feed_name = false;
|
||||||
refresh_on_startup = true;
|
refresh_on_startup = true;
|
||||||
tags = lib.lists.unique (
|
tags = [
|
||||||
(builtins.catAttrs "cat" myFeeds) ++ (builtins.catAttrs "freq" myFeeds)
|
# hourly => aggregator
|
||||||
);
|
# daily => prolifiq writer
|
||||||
|
# weekly => i can keep up with most -- but maybe not all -- of their content
|
||||||
|
# infrequent => i can read everything in this category
|
||||||
|
"hourly" "daily" "weekly" "infrequent"
|
||||||
|
# rat[ionality] gets used interchangably with philosophy, here.
|
||||||
|
# pol[itical] gets used for social commentary and economics as well.
|
||||||
|
# visual gets used for comics/art
|
||||||
|
"uncat" "rat" "tech" "pol" "visual"
|
||||||
|
];
|
||||||
open_youtube_externally = false;
|
open_youtube_externally = false;
|
||||||
media_player = "vlc"; # default: mpv
|
media_player = "vlc"; # default: mpv
|
||||||
};
|
};
|
||||||
@@ -267,8 +340,6 @@ in
|
|||||||
enable = true;
|
enable = true;
|
||||||
enableSyntaxHighlighting = true;
|
enableSyntaxHighlighting = true;
|
||||||
enableVteIntegration = true;
|
enableVteIntegration = true;
|
||||||
history.ignorePatterns = [ "rm *" ];
|
|
||||||
# history.path = TODO
|
|
||||||
dotDir = ".config/zsh";
|
dotDir = ".config/zsh";
|
||||||
|
|
||||||
initExtraBeforeCompInit = ''
|
initExtraBeforeCompInit = ''
|
||||||
@@ -303,7 +374,6 @@ in
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
kitty = {
|
kitty = {
|
||||||
enable = true;
|
enable = true;
|
||||||
# docs: https://sw.kovidgoyal.net/kitty/conf/
|
# docs: https://sw.kovidgoyal.net/kitty/conf/
|
||||||
@@ -370,21 +440,10 @@ in
|
|||||||
# theme = "zenwritten_dark"; # mediocre: looks same as zenbones_dark
|
# theme = "zenwritten_dark"; # mediocre: looks same as zenbones_dark
|
||||||
# extraConfig = "";
|
# extraConfig = "";
|
||||||
};
|
};
|
||||||
|
|
||||||
git = {
|
git = {
|
||||||
enable = true;
|
enable = true;
|
||||||
userName = "colin";
|
userName = "colin";
|
||||||
userEmail = "colin@uninsane.org";
|
userEmail = "colin@uninsane.org";
|
||||||
|
|
||||||
aliases = { co = "checkout"; };
|
|
||||||
extraConfig = {
|
|
||||||
# difftastic docs:
|
|
||||||
# - <https://difftastic.wilfred.me.uk/git.html>
|
|
||||||
diff.tool = "difftastic";
|
|
||||||
difftool.prompt = false;
|
|
||||||
"difftool \"difftastic\"".cmd = ''${pkgs.difftastic}/bin/difft "$LOCAL" "$REMOTE"'';
|
|
||||||
# now run `git difftool` to use difftastic git
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
neovim = {
|
neovim = {
|
||||||
@@ -504,14 +563,6 @@ in
|
|||||||
package = import ./web-browser.nix pkgs;
|
package = import ./web-browser.nix pkgs;
|
||||||
};
|
};
|
||||||
|
|
||||||
mpv = {
|
|
||||||
enable = true;
|
|
||||||
config = {
|
|
||||||
save-position-on-quit = true;
|
|
||||||
keep-open = "yes";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
# "command not found" will cause the command to be searched in nixpkgs
|
# "command not found" will cause the command to be searched in nixpkgs
|
||||||
nix-index.enable = true;
|
nix-index.enable = true;
|
||||||
} // cfg.programs;
|
} // cfg.programs;
|
||||||
|
|||||||
47
modules/universal/env/home-packages.nix
vendored
47
modules/universal/env/home-packages.nix
vendored
@@ -6,10 +6,8 @@ let
|
|||||||
cfg = config.sane.home-packages;
|
cfg = config.sane.home-packages;
|
||||||
universalPkgs = [
|
universalPkgs = [
|
||||||
backblaze-b2
|
backblaze-b2
|
||||||
cdrtools
|
|
||||||
duplicity
|
duplicity
|
||||||
gnupg
|
gnupg
|
||||||
gocryptfs
|
|
||||||
ifuse
|
ifuse
|
||||||
ipfs
|
ipfs
|
||||||
libimobiledevice
|
libimobiledevice
|
||||||
@@ -28,6 +26,7 @@ let
|
|||||||
pulsemixer
|
pulsemixer
|
||||||
python3
|
python3
|
||||||
# python3Packages.eyeD3 # music tagging
|
# python3Packages.eyeD3 # music tagging
|
||||||
|
rmlint
|
||||||
sane-scripts
|
sane-scripts
|
||||||
sequoia
|
sequoia
|
||||||
snapper
|
snapper
|
||||||
@@ -77,7 +76,7 @@ let
|
|||||||
gnome.gnome-disk-utility
|
gnome.gnome-disk-utility
|
||||||
gnome.gnome-maps # works on phosh
|
gnome.gnome-maps # works on phosh
|
||||||
gnome.nautilus
|
gnome.nautilus
|
||||||
# gnome-podcasts
|
gnome-podcasts
|
||||||
gnome.gnome-system-monitor
|
gnome.gnome-system-monitor
|
||||||
gnome.gnome-terminal # works on phosh
|
gnome.gnome-terminal # works on phosh
|
||||||
gnome.gnome-weather
|
gnome.gnome-weather
|
||||||
@@ -87,19 +86,16 @@ let
|
|||||||
gthumb
|
gthumb
|
||||||
inkscape
|
inkscape
|
||||||
|
|
||||||
|
kaiteki # Pleroma client
|
||||||
|
gnome.zenity # for kaiteki (it will use qarma, kdialog, or zenity)
|
||||||
|
|
||||||
kid3 # audio tagging
|
kid3 # audio tagging
|
||||||
krita
|
krita
|
||||||
libreoffice-fresh # XXX colin: maybe don't want this on mobile
|
libreoffice-fresh # XXX colin: maybe don't want this on mobile
|
||||||
lollypop
|
lollypop
|
||||||
mesa-demos
|
mesa-demos
|
||||||
|
|
||||||
{ pkg = mpv; dir = ".config/mpv/watch_later"; }
|
|
||||||
|
|
||||||
networkmanagerapplet
|
networkmanagerapplet
|
||||||
|
|
||||||
# not strictly necessary, but allows caching articles; offline use, etc.
|
|
||||||
{ pkg = newsflash; dir = ".local/share/news-flash"; }
|
|
||||||
|
|
||||||
# settings (electron app). TODO: can i manage these settings with home-manager?
|
# settings (electron app). TODO: can i manage these settings with home-manager?
|
||||||
{ pkg = obsidian; dir = ".config/obsidian"; }
|
{ pkg = obsidian; dir = ".config/obsidian"; }
|
||||||
|
|
||||||
@@ -132,9 +128,6 @@ let
|
|||||||
nss = pkgs.nss_latest;
|
nss = pkgs.nss_latest;
|
||||||
}); in { pkg = discord; dir = ".config/discord"; })
|
}); in { pkg = discord; dir = ".config/discord"; })
|
||||||
|
|
||||||
kaiteki # Pleroma client
|
|
||||||
gnome.zenity # for kaiteki (it will use qarma, kdialog, or zenity)
|
|
||||||
|
|
||||||
logseq
|
logseq
|
||||||
losslesscut-bin
|
losslesscut-bin
|
||||||
makemkv
|
makemkv
|
||||||
@@ -156,19 +149,16 @@ let
|
|||||||
] else []);
|
] else []);
|
||||||
|
|
||||||
# useful devtools:
|
# useful devtools:
|
||||||
devPkgs = [
|
# bison
|
||||||
bison
|
# dtc
|
||||||
dtc
|
# flex
|
||||||
flex
|
# gcc
|
||||||
gcc
|
|
||||||
gdb
|
|
||||||
# gcc-arm-embedded
|
# gcc-arm-embedded
|
||||||
# gcc_multi
|
# gcc_multi
|
||||||
gnumake
|
# gnumake
|
||||||
mix2nix
|
# mix2nix
|
||||||
rustup
|
# rustup
|
||||||
swig
|
# swig
|
||||||
];
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
options = {
|
options = {
|
||||||
@@ -176,18 +166,9 @@ in
|
|||||||
default = false;
|
default = false;
|
||||||
type = types.bool;
|
type = types.bool;
|
||||||
};
|
};
|
||||||
sane.home-packages.enableDevPkgs = mkOption {
|
|
||||||
description = ''
|
|
||||||
enable packages that are useful for building other software by hand.
|
|
||||||
you should prefer to keep this disabled except when prototyping, e.g. packaging new software.
|
|
||||||
'';
|
|
||||||
default = false;
|
|
||||||
type = types.bool;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
config = {
|
config = {
|
||||||
sane.home-manager.extraPackages = universalPkgs
|
sane.home-manager.extraPackages = universalPkgs
|
||||||
++ (if cfg.enableGuiPkgs then guiPkgs else [])
|
++ (if cfg.enableGuiPkgs then guiPkgs else []);
|
||||||
++ (if cfg.enableDevPkgs then devPkgs else []);
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -52,19 +52,9 @@ in
|
|||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDpmFdNSVPRol5hkbbCivRhyeENzb9HVyf9KutGLP2Zu colin@lappy"
|
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDpmFdNSVPRol5hkbbCivRhyeENzb9HVyf9KutGLP2Zu colin@lappy"
|
||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPU5GlsSfbaarMvDA20bxpSZGWviEzXGD8gtrIowc1pX colin@desko"
|
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPU5GlsSfbaarMvDA20bxpSZGWviEzXGD8gtrIowc1pX colin@desko"
|
||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPS1qFzKurAdB9blkWomq8gI1g0T3sTs9LsmFOj5VtqX colin@servo"
|
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPS1qFzKurAdB9blkWomq8gI1g0T3sTs9LsmFOj5VtqX colin@servo"
|
||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICrR+gePnl0nV/vy7I5BzrGeyVL+9eOuXHU1yNE3uCwU colin@moby"
|
# moby doesn't need to login to any other devices yet
|
||||||
|
# "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICrR+gePnl0nV/vy7I5BzrGeyVL+9eOuXHU1yNE3uCwU colin@moby"
|
||||||
];
|
];
|
||||||
|
|
||||||
pamMount = {
|
|
||||||
# mount encrypted stuff at login
|
|
||||||
# requires that login password == fs encryption password
|
|
||||||
# fstype = "fuse";
|
|
||||||
# path = "${pkgs.gocryptfs}/bin/gocryptfs#/nix/persist/home/colin/private";
|
|
||||||
fstype = "fuse.gocryptfs";
|
|
||||||
path = "/nix/persist/home/colin/private";
|
|
||||||
mountpoint = "/home/colin/private";
|
|
||||||
options="nodev,nosuid,quiet,allow_other";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
sane.impermanence.service-dirs = mkIf cfg.guest.enable [
|
sane.impermanence.service-dirs = mkIf cfg.guest.enable [
|
||||||
|
|||||||
302
nixpatches/04-dart-2.7.0.patch
Normal file
302
nixpatches/04-dart-2.7.0.patch
Normal file
@@ -0,0 +1,302 @@
|
|||||||
|
diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix
|
||||||
|
index 9eba6773448..f51aeb8b624 100644
|
||||||
|
--- a/pkgs/development/compilers/flutter/default.nix
|
||||||
|
+++ b/pkgs/development/compilers/flutter/default.nix
|
||||||
|
@@ -4,20 +4,20 @@ let
|
||||||
|
getPatches = dir:
|
||||||
|
let files = builtins.attrNames (builtins.readDir dir);
|
||||||
|
in map (f: dir + ("/" + f)) files;
|
||||||
|
- version = "2.10.1";
|
||||||
|
+ version = "3.0.0";
|
||||||
|
channel = "stable";
|
||||||
|
filename = "flutter_linux_${version}-${channel}.tar.xz";
|
||||||
|
|
||||||
|
# Decouples flutter derivation from dart derivation,
|
||||||
|
# use specific dart version to not need to bump dart derivation when bumping flutter.
|
||||||
|
- dartVersion = "2.16.1";
|
||||||
|
+ dartVersion = "2.17.0";
|
||||||
|
dartSourceBase = "https://storage.googleapis.com/dart-archive/channels";
|
||||||
|
dartForFlutter = dart.override {
|
||||||
|
version = dartVersion;
|
||||||
|
sources = {
|
||||||
|
"${dartVersion}-x86_64-linux" = fetchurl {
|
||||||
|
url = "${dartSourceBase}/stable/release/${dartVersion}/sdk/dartsdk-linux-x64-release.zip";
|
||||||
|
- sha256 = "sha256-PMY6DCFQC8XrlnFzOEPcwgBAs5/cAvNd78969Z+I1Fk=";
|
||||||
|
+ sha256 = "57b8fd964e47c81d467aeb95b099a670ab7e8f54a1cd74d45bcd1fdc77913d86";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
@@ -29,7 +29,7 @@ in {
|
||||||
|
pname = "flutter";
|
||||||
|
src = fetchurl {
|
||||||
|
url = "https://storage.googleapis.com/flutter_infra_release/releases/${channel}/linux/${filename}";
|
||||||
|
- sha256 = "sha256-rSfwcglDV2rvJl10j7FByAWmghd2FYxrlkgYnvRO54Y=";
|
||||||
|
+ sha256 = "e96d75ec8e7dc2a46bc8dad5a9e01c391ab9310ad01c4e3940c963dd263788a0";
|
||||||
|
};
|
||||||
|
patches = getPatches ./patches;
|
||||||
|
};
|
||||||
|
diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix
|
||||||
|
index 43538ede339..ece25c14b55 100644
|
||||||
|
--- a/pkgs/development/compilers/flutter/flutter.nix
|
||||||
|
+++ b/pkgs/development/compilers/flutter/flutter.nix
|
||||||
|
@@ -56,12 +56,15 @@ let
|
||||||
|
export STAMP_PATH="$FLUTTER_ROOT/bin/cache/flutter_tools.stamp"
|
||||||
|
|
||||||
|
export DART_SDK_PATH="${dart}"
|
||||||
|
+ export DART="${dart}/bin/dart"
|
||||||
|
|
||||||
|
HOME=../.. # required for pub upgrade --offline, ~/.pub-cache
|
||||||
|
# path is relative otherwise it's replaced by /build/flutter
|
||||||
|
+ # mkdir -p "$HOME/.cache"
|
||||||
|
+ # ln -sf "$FLUTTER_ROOT" "$HOME/.cache/flutter"
|
||||||
|
|
||||||
|
pushd "$FLUTTER_TOOLS_DIR"
|
||||||
|
- ${dart}/bin/pub get --offline
|
||||||
|
+ ${dart}/bin/dart pub get --offline
|
||||||
|
popd
|
||||||
|
|
||||||
|
local revision="$(cd "$FLUTTER_ROOT"; git rev-parse HEAD)"
|
||||||
|
diff --git a/pkgs/development/compilers/flutter/patches/git-dir.patch b/pkgs/development/compilers/flutter/patches/git-dir.patch
|
||||||
|
new file mode 100644
|
||||||
|
index 00000000000..0c736f945ea
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/pkgs/development/compilers/flutter/patches/git-dir.patch
|
||||||
|
@@ -0,0 +1,102 @@
|
||||||
|
+diff --git a/dev/bots/prepare_package.dart b/dev/bots/prepare_package.dart
|
||||||
|
+index 468a91a954..5def6897ce 100644
|
||||||
|
+--- a/dev/bots/prepare_package.dart
|
||||||
|
++++ b/dev/bots/prepare_package.dart
|
||||||
|
+@@ -525,7 +525,7 @@ class ArchiveCreator {
|
||||||
|
+
|
||||||
|
+ Future<String> _runGit(List<String> args, {Directory? workingDirectory}) {
|
||||||
|
+ return _processRunner.runProcess(
|
||||||
|
+- <String>['git', ...args],
|
||||||
|
++ <String>['git', '--git-dir', '.git', ...args],
|
||||||
|
+ workingDirectory: workingDirectory ?? flutterRoot,
|
||||||
|
+ );
|
||||||
|
+ }
|
||||||
|
+diff --git a/packages/flutter_tools/lib/src/commands/downgrade.dart b/packages/flutter_tools/lib/src/commands/downgrade.dart
|
||||||
|
+index bb0eb428a9..4a2a48bb5e 100644
|
||||||
|
+--- a/packages/flutter_tools/lib/src/commands/downgrade.dart
|
||||||
|
++++ b/packages/flutter_tools/lib/src/commands/downgrade.dart
|
||||||
|
+@@ -118,7 +118,7 @@ class DowngradeCommand extends FlutterCommand {
|
||||||
|
+ // Detect unknown versions.
|
||||||
|
+ final ProcessUtils processUtils = _processUtils!;
|
||||||
|
+ final RunResult parseResult = await processUtils.run(<String>[
|
||||||
|
+- 'git', 'describe', '--tags', lastFlutterVersion,
|
||||||
|
++ 'git', '--git-dir', '.git', 'describe', '--tags', lastFlutterVersion,
|
||||||
|
+ ], workingDirectory: workingDirectory);
|
||||||
|
+ if (parseResult.exitCode != 0) {
|
||||||
|
+ throwToolExit('Failed to parse version for downgrade:\n${parseResult.stderr}');
|
||||||
|
+@@ -191,7 +191,7 @@ class DowngradeCommand extends FlutterCommand {
|
||||||
|
+ continue;
|
||||||
|
+ }
|
||||||
|
+ final RunResult parseResult = await _processUtils!.run(<String>[
|
||||||
|
+- 'git', 'describe', '--tags', sha,
|
||||||
|
++ 'git', '--git-dir', '.git', 'describe', '--tags', sha,
|
||||||
|
+ ], workingDirectory: workingDirectory);
|
||||||
|
+ if (parseResult.exitCode == 0) {
|
||||||
|
+ buffer.writeln('Channel "${getNameForChannel(channel)}" was previously on: ${parseResult.stdout}.');
|
||||||
|
+diff --git a/packages/flutter_tools/lib/src/version.dart b/packages/flutter_tools/lib/src/version.dart
|
||||||
|
+index f2068a6ca2..99b161689e 100644
|
||||||
|
+--- a/packages/flutter_tools/lib/src/version.dart
|
||||||
|
++++ b/packages/flutter_tools/lib/src/version.dart
|
||||||
|
+@@ -106,7 +106,7 @@ class FlutterVersion {
|
||||||
|
+ String? channel = _channel;
|
||||||
|
+ if (channel == null) {
|
||||||
|
+ final String gitChannel = _runGit(
|
||||||
|
+- 'git rev-parse --abbrev-ref --symbolic @{u}',
|
||||||
|
++ 'git --git-dir .git rev-parse --abbrev-ref --symbolic @{u}',
|
||||||
|
+ globals.processUtils,
|
||||||
|
+ _workingDirectory,
|
||||||
|
+ );
|
||||||
|
+@@ -114,7 +114,7 @@ class FlutterVersion {
|
||||||
|
+ if (slash != -1) {
|
||||||
|
+ final String remote = gitChannel.substring(0, slash);
|
||||||
|
+ _repositoryUrl = _runGit(
|
||||||
|
+- 'git ls-remote --get-url $remote',
|
||||||
|
++ 'git --git-dir .git ls-remote --get-url $remote',
|
||||||
|
+ globals.processUtils,
|
||||||
|
+ _workingDirectory,
|
||||||
|
+ );
|
||||||
|
+@@ -326,7 +326,7 @@ class FlutterVersion {
|
||||||
|
+ /// the branch name will be returned as `'[user-branch]'`.
|
||||||
|
+ String getBranchName({ bool redactUnknownBranches = false }) {
|
||||||
|
+ _branch ??= () {
|
||||||
|
+- final String branch = _runGit('git rev-parse --abbrev-ref HEAD', globals.processUtils);
|
||||||
|
++ final String branch = _runGit('git --git-dir .git rev-parse --abbrev-ref HEAD', globals.processUtils);
|
||||||
|
+ return branch == 'HEAD' ? channel : branch;
|
||||||
|
+ }();
|
||||||
|
+ if (redactUnknownBranches || _branch!.isEmpty) {
|
||||||
|
+@@ -359,7 +359,7 @@ class FlutterVersion {
|
||||||
|
+ /// wrapper that does that.
|
||||||
|
+ @visibleForTesting
|
||||||
|
+ static List<String> gitLog(List<String> args) {
|
||||||
|
+- return <String>['git', '-c', 'log.showSignature=false', 'log'] + args;
|
||||||
|
++ return <String>['git', '-c', 'log.showSignature=false', '--git-dir', '.git', 'log'] + args;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /// Gets the release date of the latest available Flutter version.
|
||||||
|
+@@ -730,7 +730,7 @@ class GitTagVersion {
|
||||||
|
+
|
||||||
|
+ static GitTagVersion determine(ProcessUtils processUtils, {String? workingDirectory, bool fetchTags = false, String gitRef = 'HEAD'}) {
|
||||||
|
+ if (fetchTags) {
|
||||||
|
+- final String channel = _runGit('git rev-parse --abbrev-ref HEAD', processUtils, workingDirectory);
|
||||||
|
++ final String channel = _runGit('git --git-dir .git rev-parse --abbrev-ref HEAD', processUtils, workingDirectory);
|
||||||
|
+ if (channel == 'dev' || channel == 'beta' || channel == 'stable') {
|
||||||
|
+ globals.printTrace('Skipping request to fetchTags - on well known channel $channel.');
|
||||||
|
+ } else {
|
||||||
|
+@@ -739,7 +739,7 @@ class GitTagVersion {
|
||||||
|
+ }
|
||||||
|
+ // find all tags attached to the given [gitRef]
|
||||||
|
+ final List<String> tags = _runGit(
|
||||||
|
+- 'git tag --points-at $gitRef', processUtils, workingDirectory).trim().split('\n');
|
||||||
|
++ 'git --git-dir .git tag --points-at $gitRef', processUtils, workingDirectory).trim().split('\n');
|
||||||
|
+
|
||||||
|
+ // Check first for a stable tag
|
||||||
|
+ final RegExp stableTagPattern = RegExp(r'^\d+\.\d+\.\d+$');
|
||||||
|
+@@ -760,7 +760,7 @@ class GitTagVersion {
|
||||||
|
+ // recent tag and number of commits past.
|
||||||
|
+ return parse(
|
||||||
|
+ _runGit(
|
||||||
|
+- 'git describe --match *.*.* --long --tags $gitRef',
|
||||||
|
++ 'git --git-dir .git describe --match *.*.* --long --tags $gitRef',
|
||||||
|
+ processUtils,
|
||||||
|
+ workingDirectory,
|
||||||
|
+ )
|
||||||
|
diff --git a/pkgs/development/compilers/flutter/patches/revert-frontend_server_cache.patch b/pkgs/development/compilers/flutter/patches/revert-frontend_server_cache.patch
|
||||||
|
new file mode 100644
|
||||||
|
index 00000000000..f68029eb7a1
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/pkgs/development/compilers/flutter/patches/revert-frontend_server_cache.patch
|
||||||
|
@@ -0,0 +1,130 @@
|
||||||
|
+diff --git a/packages/flutter_tools/lib/src/artifacts.dart b/packages/flutter_tools/lib/src/artifacts.dart
|
||||||
|
+index 2aac9686e8..32c4b98b88 100644
|
||||||
|
+--- a/packages/flutter_tools/lib/src/artifacts.dart
|
||||||
|
++++ b/packages/flutter_tools/lib/src/artifacts.dart
|
||||||
|
+@@ -346,10 +346,10 @@ class CachedArtifacts implements Artifacts {
|
||||||
|
+ ) {
|
||||||
|
+ switch (artifact) {
|
||||||
|
+ case HostArtifact.engineDartSdkPath:
|
||||||
|
+- final String path = _dartSdkPath(_cache);
|
||||||
|
++ final String path = _dartSdkPath(_fileSystem);
|
||||||
|
+ return _fileSystem.directory(path);
|
||||||
|
+ case HostArtifact.engineDartBinary:
|
||||||
|
+- final String path = _fileSystem.path.join(_dartSdkPath(_cache), 'bin', _hostArtifactToFileName(artifact, _platform.isWindows));
|
||||||
|
++ final String path = _fileSystem.path.join(_dartSdkPath(_fileSystem), 'bin', _hostArtifactToFileName(artifact, _platform.isWindows));
|
||||||
|
+ return _fileSystem.file(path);
|
||||||
|
+ case HostArtifact.flutterWebSdk:
|
||||||
|
+ final String path = _getFlutterWebSdkPath();
|
||||||
|
+@@ -398,7 +398,7 @@ class CachedArtifacts implements Artifacts {
|
||||||
|
+ case HostArtifact.dart2jsSnapshot:
|
||||||
|
+ case HostArtifact.dartdevcSnapshot:
|
||||||
|
+ case HostArtifact.kernelWorkerSnapshot:
|
||||||
|
+- final String path = _fileSystem.path.join(_dartSdkPath(_cache), 'bin', 'snapshots', _hostArtifactToFileName(artifact, _platform.isWindows));
|
||||||
|
++ final String path = _fileSystem.path.join(_dartSdkPath(_fileSystem), 'bin', 'snapshots', _hostArtifactToFileName(artifact, _platform.isWindows));
|
||||||
|
+ return _fileSystem.file(path);
|
||||||
|
+ case HostArtifact.iosDeploy:
|
||||||
|
+ final String artifactFileName = _hostArtifactToFileName(artifact, _platform.isWindows);
|
||||||
|
+@@ -461,11 +461,13 @@ class CachedArtifacts implements Artifacts {
|
||||||
|
+ String _getAndroidArtifactPath(Artifact artifact, TargetPlatform platform, BuildMode mode) {
|
||||||
|
+ final String engineDir = _getEngineArtifactsPath(platform, mode)!;
|
||||||
|
+ switch (artifact) {
|
||||||
|
++ case Artifact.frontendServerSnapshotForEngineDartSdk:
|
||||||
|
++ assert(mode != BuildMode.debug, 'Artifact $artifact only available in non-debug mode.');
|
||||||
|
++ return _fileSystem.path.join(engineDir, _artifactToFileName(artifact));
|
||||||
|
+ case Artifact.genSnapshot:
|
||||||
|
+ assert(mode != BuildMode.debug, 'Artifact $artifact only available in non-debug mode.');
|
||||||
|
+ final String hostPlatform = getNameForHostPlatform(getCurrentHostPlatform());
|
||||||
|
+ return _fileSystem.path.join(engineDir, hostPlatform, _artifactToFileName(artifact));
|
||||||
|
+- case Artifact.frontendServerSnapshotForEngineDartSdk:
|
||||||
|
+ case Artifact.constFinder:
|
||||||
|
+ case Artifact.flutterFramework:
|
||||||
|
+ case Artifact.flutterMacOSFramework:
|
||||||
|
+@@ -497,13 +499,13 @@ class CachedArtifacts implements Artifacts {
|
||||||
|
+ switch (artifact) {
|
||||||
|
+ case Artifact.genSnapshot:
|
||||||
|
+ case Artifact.flutterXcframework:
|
||||||
|
++ case Artifact.frontendServerSnapshotForEngineDartSdk:
|
||||||
|
+ final String artifactFileName = _artifactToFileName(artifact)!;
|
||||||
|
+ final String engineDir = _getEngineArtifactsPath(platform, mode)!;
|
||||||
|
+ return _fileSystem.path.join(engineDir, artifactFileName);
|
||||||
|
+ case Artifact.flutterFramework:
|
||||||
|
+ final String engineDir = _getEngineArtifactsPath(platform, mode)!;
|
||||||
|
+ return _getIosEngineArtifactPath(engineDir, environmentType, _fileSystem);
|
||||||
|
+- case Artifact.frontendServerSnapshotForEngineDartSdk:
|
||||||
|
+ case Artifact.constFinder:
|
||||||
|
+ case Artifact.flutterMacOSFramework:
|
||||||
|
+ case Artifact.flutterMacOSPodspec:
|
||||||
|
+@@ -594,14 +596,10 @@ class CachedArtifacts implements Artifacts {
|
||||||
|
+ // For script snapshots any gen_snapshot binary will do. Returning gen_snapshot for
|
||||||
|
+ // android_arm in profile mode because it is available on all supported host platforms.
|
||||||
|
+ return _getAndroidArtifactPath(artifact, TargetPlatform.android_arm, BuildMode.profile);
|
||||||
|
+- case Artifact.frontendServerSnapshotForEngineDartSdk:
|
||||||
|
+- return _fileSystem.path.join(
|
||||||
|
+- _dartSdkPath(_cache), 'bin', 'snapshots',
|
||||||
|
+- _artifactToFileName(artifact),
|
||||||
|
+- );
|
||||||
|
+ case Artifact.flutterTester:
|
||||||
|
+ case Artifact.vmSnapshotData:
|
||||||
|
+ case Artifact.isolateSnapshotData:
|
||||||
|
++ case Artifact.frontendServerSnapshotForEngineDartSdk:
|
||||||
|
+ case Artifact.icuData:
|
||||||
|
+ final String engineArtifactsPath = _cache.getArtifactDirectory('engine').path;
|
||||||
|
+ final String platformDirName = _enginePlatformDirectoryName(platform);
|
||||||
|
+@@ -797,7 +795,7 @@ class CachedLocalEngineArtifacts implements LocalEngineArtifacts {
|
||||||
|
+ final String path = _fileSystem.path.join(_hostEngineOutPath, 'dart-sdk', 'bin', 'snapshots', _hostArtifactToFileName(artifact, _platform.isWindows));
|
||||||
|
+ return _fileSystem.file(path);
|
||||||
|
+ case HostArtifact.dartdevcSnapshot:
|
||||||
|
+- final String path = _fileSystem.path.join(_dartSdkPath(_cache), 'bin', 'snapshots', _hostArtifactToFileName(artifact, _platform.isWindows));
|
||||||
|
++ final String path = _fileSystem.path.join(_dartSdkPath(_fileSystem), 'bin', 'snapshots', _hostArtifactToFileName(artifact, _platform.isWindows));
|
||||||
|
+ return _fileSystem.file(path);
|
||||||
|
+ case HostArtifact.kernelWorkerSnapshot:
|
||||||
|
+ final String path = _fileSystem.path.join(_hostEngineOutPath, 'dart-sdk', 'bin', 'snapshots', _hostArtifactToFileName(artifact, _platform.isWindows));
|
||||||
|
+@@ -922,9 +920,7 @@ class CachedLocalEngineArtifacts implements LocalEngineArtifacts {
|
||||||
|
+ case Artifact.windowsUwpCppClientWrapper:
|
||||||
|
+ return _fileSystem.path.join(_hostEngineOutPath, artifactFileName);
|
||||||
|
+ case Artifact.frontendServerSnapshotForEngineDartSdk:
|
||||||
|
+- return _fileSystem.path.join(
|
||||||
|
+- _hostEngineOutPath, 'dart-sdk', 'bin', 'snapshots', artifactFileName,
|
||||||
|
+- );
|
||||||
|
++ return _fileSystem.path.join(_hostEngineOutPath, 'gen', artifactFileName);
|
||||||
|
+ case Artifact.uwptool:
|
||||||
|
+ return _fileSystem.path.join(_hostEngineOutPath, artifactFileName);
|
||||||
|
+ }
|
||||||
|
+@@ -1034,8 +1030,8 @@ class OverrideArtifacts implements Artifacts {
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /// Locate the Dart SDK.
|
||||||
|
+-String _dartSdkPath(Cache cache) {
|
||||||
|
+- return cache.getRoot().childDirectory('dart-sdk').path;
|
||||||
|
++String _dartSdkPath(FileSystem fileSystem) {
|
||||||
|
++ return fileSystem.path.join(Cache.flutterRoot!, 'bin', 'cache', 'dart-sdk');
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ class _TestArtifacts implements Artifacts {
|
||||||
|
+diff --git a/packages/flutter_tools/test/general.shard/artifacts_test.dart b/packages/flutter_tools/test/general.shard/artifacts_test.dart
|
||||||
|
+index d906511a15..adfdd4bb42 100644
|
||||||
|
+--- a/packages/flutter_tools/test/general.shard/artifacts_test.dart
|
||||||
|
++++ b/packages/flutter_tools/test/general.shard/artifacts_test.dart
|
||||||
|
+@@ -153,10 +153,6 @@ void main() {
|
||||||
|
+ artifacts.getArtifactPath(Artifact.windowsUwpDesktopPath, platform: TargetPlatform.windows_uwp_x64, mode: BuildMode.release),
|
||||||
|
+ fileSystem.path.join('root', 'bin', 'cache', 'artifacts', 'engine', 'windows-uwp-x64-release'),
|
||||||
|
+ );
|
||||||
|
+- expect(
|
||||||
|
+- artifacts.getArtifactPath(Artifact.frontendServerSnapshotForEngineDartSdk),
|
||||||
|
+- fileSystem.path.join('root', 'bin', 'cache', 'dart-sdk', 'bin', 'snapshots', 'frontend_server.dart.snapshot')
|
||||||
|
+- );
|
||||||
|
+ });
|
||||||
|
+
|
||||||
|
+ testWithoutContext('precompiled web artifact paths are correct', () {
|
||||||
|
+@@ -322,11 +318,6 @@ void main() {
|
||||||
|
+ artifacts.getHostArtifact(HostArtifact.engineDartSdkPath).path,
|
||||||
|
+ fileSystem.path.join('/out', 'host_debug_unopt', 'dart-sdk'),
|
||||||
|
+ );
|
||||||
|
+- expect(
|
||||||
|
+- artifacts.getArtifactPath(Artifact.frontendServerSnapshotForEngineDartSdk),
|
||||||
|
+- fileSystem.path.join('/out', 'host_debug_unopt', 'dart-sdk', 'bin',
|
||||||
|
+- 'snapshots', 'frontend_server.dart.snapshot')
|
||||||
|
+- );
|
||||||
|
+ });
|
||||||
|
+
|
||||||
|
+ testWithoutContext('getEngineType', () {
|
||||||
646
nixpatches/11-flutter-3.3.3-189338.patch
Normal file
646
nixpatches/11-flutter-3.3.3-189338.patch
Normal file
@@ -0,0 +1,646 @@
|
|||||||
|
diff --git a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix
|
||||||
|
index d50e7118cc1..22bbeb212f0 100644
|
||||||
|
--- a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix
|
||||||
|
+++ b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix
|
||||||
|
@@ -1,16 +1,16 @@
|
||||||
|
{ lib
|
||||||
|
, fetchFromGitLab
|
||||||
|
-, flutter
|
||||||
|
+, flutter2
|
||||||
|
, olm
|
||||||
|
, imagemagick
|
||||||
|
, makeDesktopItem
|
||||||
|
}:
|
||||||
|
|
||||||
|
-flutter.mkFlutterApp rec {
|
||||||
|
+flutter2.mkFlutterApp rec {
|
||||||
|
pname = "fluffychat";
|
||||||
|
version = "1.2.0";
|
||||||
|
|
||||||
|
- vendorHash = "sha256-co+bnsVIyg42JpM9FimfGEjrd6A99GlBeow1Dgv7NBI=";
|
||||||
|
+ vendorHash = "sha256-1PDX023WXRmRe/b1L+6Du91BvGwYNp3YATqYSQdPrRY=";
|
||||||
|
|
||||||
|
src = fetchFromGitLab {
|
||||||
|
owner = "famedly";
|
||||||
|
diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix
|
||||||
|
index 4529d2adc1a..02188335129 100644
|
||||||
|
--- a/pkgs/development/compilers/flutter/default.nix
|
||||||
|
+++ b/pkgs/development/compilers/flutter/default.nix
|
||||||
|
@@ -4,34 +4,40 @@ let
|
||||||
|
getPatches = dir:
|
||||||
|
let files = builtins.attrNames (builtins.readDir dir);
|
||||||
|
in map (f: dir + ("/" + f)) files;
|
||||||
|
- version = "3.0.4";
|
||||||
|
- channel = "stable";
|
||||||
|
- filename = "flutter_linux_${version}-${channel}.tar.xz";
|
||||||
|
-
|
||||||
|
- # Decouples flutter derivation from dart derivation,
|
||||||
|
- # use specific dart version to not need to bump dart derivation when bumping flutter.
|
||||||
|
- dartVersion = "2.17.5";
|
||||||
|
- dartSourceBase = "https://storage.googleapis.com/dart-archive/channels";
|
||||||
|
- dartForFlutter = dart.override {
|
||||||
|
- version = dartVersion;
|
||||||
|
- sources = {
|
||||||
|
- "${dartVersion}-x86_64-linux" = fetchurl {
|
||||||
|
- url = "${dartSourceBase}/stable/release/${dartVersion}/sdk/dartsdk-linux-x64-release.zip";
|
||||||
|
- sha256 = "sha256-AFJGeiPsjUZSO+DykmOIFETg2jIohg62tp3ghZrKJFk=";
|
||||||
|
+ flutterDrv = { version, pname, dartVersion, hash, dartHash, patches }: mkFlutter {
|
||||||
|
+ inherit version pname patches;
|
||||||
|
+ dart = dart.override {
|
||||||
|
+ version = dartVersion;
|
||||||
|
+ sources = {
|
||||||
|
+ "${dartVersion}-x86_64-linux" = fetchurl {
|
||||||
|
+ url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-linux-x64-release.zip";
|
||||||
|
+ sha256 = dartHash;
|
||||||
|
+ };
|
||||||
|
};
|
||||||
|
};
|
||||||
|
+ src = fetchurl {
|
||||||
|
+ url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_${version}-stable.tar.xz";
|
||||||
|
+ sha256 = hash;
|
||||||
|
+ };
|
||||||
|
};
|
||||||
|
in
|
||||||
|
{
|
||||||
|
inherit mkFlutter;
|
||||||
|
- stable = mkFlutter rec {
|
||||||
|
- inherit version;
|
||||||
|
- dart = dartForFlutter;
|
||||||
|
+ stable = flutterDrv {
|
||||||
|
pname = "flutter";
|
||||||
|
- src = fetchurl {
|
||||||
|
- url = "https://storage.googleapis.com/flutter_infra_release/releases/${channel}/linux/${filename}";
|
||||||
|
- sha256 = "sha256-vh3QjLGFBN321DUET9XhYqSkILjEj+ZqAALu/mxY+go=";
|
||||||
|
- };
|
||||||
|
- patches = getPatches ./patches;
|
||||||
|
+ version = "3.3.3";
|
||||||
|
+ dartVersion = "2.18.2";
|
||||||
|
+ hash = "sha256-MTZeWQUp4/TcPzYIT6eqIKSPUPvn2Mp/thOQzNgpTXg=";
|
||||||
|
+ dartHash = "sha256-C3+YjecXLvSmJrLwi9H7TgD9Np0AArRWx3EdBrfQpTU";
|
||||||
|
+ patches = getPatches ./patches/flutter3;
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ v2 = flutterDrv {
|
||||||
|
+ pname = "flutter";
|
||||||
|
+ version = "2.10.5";
|
||||||
|
+ dartVersion = "2.16.2";
|
||||||
|
+ hash = "sha256-DTZwxlMUYk8NS1SaWUJolXjD+JnRW73Ps5CdRHDGnt0=";
|
||||||
|
+ dartHash = "sha256-egrYd7B4XhkBiHPIFE2zopxKtQ58GqlogAKA/UeiXnI=";
|
||||||
|
+ patches = getPatches ./patches/flutter2;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix
|
||||||
|
index 28a78c3e306..f2c861356ab 100644
|
||||||
|
--- a/pkgs/development/compilers/flutter/flutter.nix
|
||||||
|
+++ b/pkgs/development/compilers/flutter/flutter.nix
|
||||||
|
@@ -65,7 +65,7 @@ let
|
||||||
|
popd
|
||||||
|
|
||||||
|
local revision="$(cd "$FLUTTER_ROOT"; git rev-parse HEAD)"
|
||||||
|
- ${dart}/bin/dart --snapshot="$SNAPSHOT_PATH" --packages="$FLUTTER_TOOLS_DIR/.packages" "$SCRIPT_PATH"
|
||||||
|
+ ${dart}/bin/dart --snapshot="$SNAPSHOT_PATH" --packages="$FLUTTER_TOOLS_DIR/.dart_tool/package_config.json" "$SCRIPT_PATH"
|
||||||
|
echo "$revision" > "$STAMP_PATH"
|
||||||
|
echo -n "${version}" > version
|
||||||
|
|
||||||
|
diff --git a/pkgs/development/compilers/flutter/patches/disable-auto-update.patch b/pkgs/development/compilers/flutter/patches/flutter2/disable-auto-update.patch
|
||||||
|
similarity index 100%
|
||||||
|
rename from pkgs/development/compilers/flutter/patches/disable-auto-update.patch
|
||||||
|
rename to pkgs/development/compilers/flutter/patches/flutter2/disable-auto-update.patch
|
||||||
|
diff --git a/pkgs/development/compilers/flutter/patches/flutter2/git-dir.patch b/pkgs/development/compilers/flutter/patches/flutter2/git-dir.patch
|
||||||
|
new file mode 100644
|
||||||
|
index 00000000000..0136ef93106
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/pkgs/development/compilers/flutter/patches/flutter2/git-dir.patch
|
||||||
|
@@ -0,0 +1,80 @@
|
||||||
|
+diff --git a/dev/bots/prepare_package.dart b/dev/bots/prepare_package.dart
|
||||||
|
+index 468a91a954..5def6897ce 100644
|
||||||
|
+--- a/dev/bots/prepare_package.dart
|
||||||
|
++++ b/dev/bots/prepare_package.dart
|
||||||
|
+@@ -525,7 +525,7 @@ class ArchiveCreator {
|
||||||
|
+
|
||||||
|
+ Future<String> _runGit(List<String> args, {Directory? workingDirectory}) {
|
||||||
|
+ return _processRunner.runProcess(
|
||||||
|
+- <String>['git', ...args],
|
||||||
|
++ <String>['git', '--git-dir', '.git', ...args],
|
||||||
|
+ workingDirectory: workingDirectory ?? flutterRoot,
|
||||||
|
+ );
|
||||||
|
+ }
|
||||||
|
+diff --git a/packages/flutter_tools/lib/src/version.dart b/packages/flutter_tools/lib/src/version.dart
|
||||||
|
+index f2068a6ca2..99b161689e 100644
|
||||||
|
+--- a/packages/flutter_tools/lib/src/version.dart
|
||||||
|
++++ b/packages/flutter_tools/lib/src/version.dart
|
||||||
|
+@@ -106,7 +106,7 @@ class FlutterVersion {
|
||||||
|
+ String? channel = _channel;
|
||||||
|
+ if (channel == null) {
|
||||||
|
+ final String gitChannel = _runGit(
|
||||||
|
+- 'git rev-parse --abbrev-ref --symbolic @{u}',
|
||||||
|
++ 'git --git-dir .git rev-parse --abbrev-ref --symbolic @{u}',
|
||||||
|
+ globals.processUtils,
|
||||||
|
+ _workingDirectory,
|
||||||
|
+ );
|
||||||
|
+@@ -114,7 +114,7 @@ class FlutterVersion {
|
||||||
|
+ if (slash != -1) {
|
||||||
|
+ final String remote = gitChannel.substring(0, slash);
|
||||||
|
+ _repositoryUrl = _runGit(
|
||||||
|
+- 'git ls-remote --get-url $remote',
|
||||||
|
++ 'git --git-dir .git ls-remote --get-url $remote',
|
||||||
|
+ globals.processUtils,
|
||||||
|
+ _workingDirectory,
|
||||||
|
+ );
|
||||||
|
+@@ -326,7 +326,7 @@ class FlutterVersion {
|
||||||
|
+ /// the branch name will be returned as `'[user-branch]'`.
|
||||||
|
+ String getBranchName({ bool redactUnknownBranches = false }) {
|
||||||
|
+ _branch ??= () {
|
||||||
|
+- final String branch = _runGit('git rev-parse --abbrev-ref HEAD', globals.processUtils);
|
||||||
|
++ final String branch = _runGit('git --git-dir .git rev-parse --abbrev-ref HEAD', globals.processUtils);
|
||||||
|
+ return branch == 'HEAD' ? channel : branch;
|
||||||
|
+ }();
|
||||||
|
+ if (redactUnknownBranches || _branch!.isEmpty) {
|
||||||
|
+@@ -359,7 +359,7 @@ class FlutterVersion {
|
||||||
|
+ /// wrapper that does that.
|
||||||
|
+ @visibleForTesting
|
||||||
|
+ static List<String> gitLog(List<String> args) {
|
||||||
|
+- return <String>['git', '-c', 'log.showSignature=false', 'log'] + args;
|
||||||
|
++ return <String>['git', '-c', 'log.showSignature=false', '--git-dir', '.git', 'log'] + args;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /// Gets the release date of the latest available Flutter version.
|
||||||
|
+@@ -730,7 +730,7 @@ class GitTagVersion {
|
||||||
|
+
|
||||||
|
+ static GitTagVersion determine(ProcessUtils processUtils, {String? workingDirectory, bool fetchTags = false, String gitRef = 'HEAD'}) {
|
||||||
|
+ if (fetchTags) {
|
||||||
|
+- final String channel = _runGit('git rev-parse --abbrev-ref HEAD', processUtils, workingDirectory);
|
||||||
|
++ final String channel = _runGit('git --git-dir .git rev-parse --abbrev-ref HEAD', processUtils, workingDirectory);
|
||||||
|
+ if (channel == 'dev' || channel == 'beta' || channel == 'stable') {
|
||||||
|
+ globals.printTrace('Skipping request to fetchTags - on well known channel $channel.');
|
||||||
|
+ } else {
|
||||||
|
+@@ -739,7 +739,7 @@ class GitTagVersion {
|
||||||
|
+ }
|
||||||
|
+ // find all tags attached to the given [gitRef]
|
||||||
|
+ final List<String> tags = _runGit(
|
||||||
|
+- 'git tag --points-at $gitRef', processUtils, workingDirectory).trim().split('\n');
|
||||||
|
++ 'git --git-dir .git tag --points-at $gitRef', processUtils, workingDirectory).trim().split('\n');
|
||||||
|
+
|
||||||
|
+ // Check first for a stable tag
|
||||||
|
+ final RegExp stableTagPattern = RegExp(r'^\d+\.\d+\.\d+$');
|
||||||
|
+@@ -760,7 +760,7 @@ class GitTagVersion {
|
||||||
|
+ // recent tag and number of commits past.
|
||||||
|
+ return parse(
|
||||||
|
+ _runGit(
|
||||||
|
+- 'git describe --match *.*.* --long --tags $gitRef',
|
||||||
|
++ 'git --git-dir .git describe --match *.*.* --long --tags $gitRef',
|
||||||
|
+ processUtils,
|
||||||
|
+ workingDirectory,
|
||||||
|
+ )
|
||||||
|
diff --git a/pkgs/development/compilers/flutter/patches/flutter2/move-cache.patch b/pkgs/development/compilers/flutter/patches/flutter2/move-cache.patch
|
||||||
|
new file mode 100644
|
||||||
|
index 00000000000..a81d2def242
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/pkgs/development/compilers/flutter/patches/flutter2/move-cache.patch
|
||||||
|
@@ -0,0 +1,72 @@
|
||||||
|
+diff --git a/packages/flutter_tools/lib/src/asset.dart b/packages/flutter_tools/lib/src/asset.dart
|
||||||
|
+index ed42baea29..12941f733a 100644
|
||||||
|
+--- a/packages/flutter_tools/lib/src/asset.dart
|
||||||
|
++++ b/packages/flutter_tools/lib/src/asset.dart
|
||||||
|
+@@ -11,11 +11,11 @@ import 'base/file_system.dart';
|
||||||
|
+ import 'base/logger.dart';
|
||||||
|
+ import 'base/platform.dart';
|
||||||
|
+ import 'build_info.dart';
|
||||||
|
+-import 'cache.dart';
|
||||||
|
+ import 'convert.dart';
|
||||||
|
+ import 'dart/package_map.dart';
|
||||||
|
+ import 'devfs.dart';
|
||||||
|
+ import 'flutter_manifest.dart';
|
||||||
|
++import 'globals.dart' as globals;
|
||||||
|
+ import 'license_collector.dart';
|
||||||
|
+ import 'project.dart';
|
||||||
|
+
|
||||||
|
+@@ -504,7 +504,7 @@ class ManifestAssetBundle implements AssetBundle {
|
||||||
|
+ }
|
||||||
|
+ final Uri entryUri = _fileSystem.path.toUri(asset);
|
||||||
|
+ result.add(_Asset(
|
||||||
|
+- baseDir: _fileSystem.path.join(Cache.flutterRoot!, 'bin', 'cache', 'artifacts', 'material_fonts'),
|
||||||
|
++ baseDir: _fileSystem.path.join(globals.fsUtils.homeDirPath!, '.cache', 'flutter', 'artifacts', 'material_fonts'),
|
||||||
|
+ relativeUri: Uri(path: entryUri.pathSegments.last),
|
||||||
|
+ entryUri: entryUri,
|
||||||
|
+ package: null,
|
||||||
|
+diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart
|
||||||
|
+index defc86cc20..7fdf14d112 100644
|
||||||
|
+--- a/packages/flutter_tools/lib/src/cache.dart
|
||||||
|
++++ b/packages/flutter_tools/lib/src/cache.dart
|
||||||
|
+@@ -22,6 +22,7 @@ import 'base/user_messages.dart';
|
||||||
|
+ import 'build_info.dart';
|
||||||
|
+ import 'convert.dart';
|
||||||
|
+ import 'features.dart';
|
||||||
|
++import 'globals.dart' as globals;
|
||||||
|
+
|
||||||
|
+ const String kFlutterRootEnvironmentVariableName = 'FLUTTER_ROOT'; // should point to //flutter/ (root of flutter/flutter repo)
|
||||||
|
+ const String kFlutterEngineEnvironmentVariableName = 'FLUTTER_ENGINE'; // should point to //engine/src/ (root of flutter/engine repo)
|
||||||
|
+@@ -322,8 +323,13 @@ class Cache {
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
+ assert(_lock == null);
|
||||||
|
++ final Directory dir = _fileSystem.directory(_fileSystem.path.join(globals.fsUtils.homeDirPath!, '.cache', 'flutter'));
|
||||||
|
++ if (!dir.existsSync()) {
|
||||||
|
++ dir.createSync(recursive: true);
|
||||||
|
++ globals.os.chmod(dir, '755');
|
||||||
|
++ }
|
||||||
|
+ final File lockFile =
|
||||||
|
+- _fileSystem.file(_fileSystem.path.join(flutterRoot!, 'bin', 'cache', 'lockfile'));
|
||||||
|
++ _fileSystem.file(_fileSystem.path.join(globals.fsUtils.homeDirPath!, '.cache', 'flutter', 'lockfile'));
|
||||||
|
+ try {
|
||||||
|
+ _lock = lockFile.openSync(mode: FileMode.write);
|
||||||
|
+ } on FileSystemException catch (e) {
|
||||||
|
+@@ -382,8 +388,7 @@ class Cache {
|
||||||
|
+
|
||||||
|
+ String get devToolsVersion {
|
||||||
|
+ if (_devToolsVersion == null) {
|
||||||
|
+- const String devToolsDirPath = 'dart-sdk/bin/resources/devtools';
|
||||||
|
+- final Directory devToolsDir = getCacheDir(devToolsDirPath, shouldCreate: false);
|
||||||
|
++ final Directory devToolsDir = _fileSystem.directory(_fileSystem.path.join(flutterRoot!, 'bin/cache/dart-sdk/bin/resources/devtools'));
|
||||||
|
+ if (!devToolsDir.existsSync()) {
|
||||||
|
+ throw Exception('Could not find directory at ${devToolsDir.path}');
|
||||||
|
+ }
|
||||||
|
+@@ -536,7 +541,7 @@ class Cache {
|
||||||
|
+ if (_rootOverride != null) {
|
||||||
|
+ return _fileSystem.directory(_fileSystem.path.join(_rootOverride!.path, 'bin', 'cache'));
|
||||||
|
+ } else {
|
||||||
|
+- return _fileSystem.directory(_fileSystem.path.join(flutterRoot!, 'bin', 'cache'));
|
||||||
|
++ return _fileSystem.directory(_fileSystem.path.join(globals.fsUtils.homeDirPath!, '.cache', 'flutter'));
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
diff --git a/pkgs/development/compilers/flutter/patches/flutter3/disable-auto-update.patch b/pkgs/development/compilers/flutter/patches/flutter3/disable-auto-update.patch
|
||||||
|
new file mode 100644
|
||||||
|
index 00000000000..21b676a2af3
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/pkgs/development/compilers/flutter/patches/flutter3/disable-auto-update.patch
|
||||||
|
@@ -0,0 +1,36 @@
|
||||||
|
+diff --git a/bin/internal/shared.sh b/bin/internal/shared.sh
|
||||||
|
+index ab746724e9..1087983c87 100644
|
||||||
|
+--- a/bin/internal/shared.sh
|
||||||
|
++++ b/bin/internal/shared.sh
|
||||||
|
+@@ -215,8 +215,6 @@ function shared::execute() {
|
||||||
|
+ exit 1
|
||||||
|
+ fi
|
||||||
|
+
|
||||||
|
+- upgrade_flutter 7< "$PROG_NAME"
|
||||||
|
+-
|
||||||
|
+ BIN_NAME="$(basename "$PROG_NAME")"
|
||||||
|
+ case "$BIN_NAME" in
|
||||||
|
+ flutter*)
|
||||||
|
+diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
|
||||||
|
+index 738fef987d..03a152e64f 100644
|
||||||
|
+--- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
|
||||||
|
++++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
|
||||||
|
+@@ -241,7 +241,6 @@ class FlutterCommandRunner extends CommandRunner<void> {
|
||||||
|
+ globals.flutterUsage.suppressAnalytics = true;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+- globals.flutterVersion.ensureVersionFile();
|
||||||
|
+ final bool machineFlag = topLevelResults['machine'] as bool? ?? false;
|
||||||
|
+ final bool ci = await globals.botDetector.isRunningOnBot;
|
||||||
|
+ final bool redirectedCompletion = !globals.stdio.hasTerminal &&
|
||||||
|
+@@ -250,10 +249,6 @@ class FlutterCommandRunner extends CommandRunner<void> {
|
||||||
|
+ final bool versionCheckFlag = topLevelResults['version-check'] as bool? ?? false;
|
||||||
|
+ final bool explicitVersionCheckPassed = topLevelResults.wasParsed('version-check') && versionCheckFlag;
|
||||||
|
+
|
||||||
|
+- if (topLevelResults.command?.name != 'upgrade' &&
|
||||||
|
+- (explicitVersionCheckPassed || (versionCheckFlag && !isMachine))) {
|
||||||
|
+- await globals.flutterVersion.checkFlutterVersionFreshness();
|
||||||
|
+- }
|
||||||
|
+
|
||||||
|
+ // See if the user specified a specific device.
|
||||||
|
+ globals.deviceManager?.specifiedDeviceId = topLevelResults['device-id'] as String?;
|
||||||
|
diff --git a/pkgs/development/compilers/flutter/patches/git-dir.patch b/pkgs/development/compilers/flutter/patches/flutter3/git-dir.patch
|
||||||
|
similarity index 86%
|
||||||
|
rename from pkgs/development/compilers/flutter/patches/git-dir.patch
|
||||||
|
rename to pkgs/development/compilers/flutter/patches/flutter3/git-dir.patch
|
||||||
|
index 0c736f945ea..42ad756f8ea 100644
|
||||||
|
--- a/pkgs/development/compilers/flutter/patches/git-dir.patch
|
||||||
|
+++ b/pkgs/development/compilers/flutter/patches/flutter3/git-dir.patch
|
||||||
|
@@ -1,8 +1,8 @@
|
||||||
|
diff --git a/dev/bots/prepare_package.dart b/dev/bots/prepare_package.dart
|
||||||
|
-index 468a91a954..5def6897ce 100644
|
||||||
|
+index 8e4cb81340..2c20940423 100644
|
||||||
|
--- a/dev/bots/prepare_package.dart
|
||||||
|
+++ b/dev/bots/prepare_package.dart
|
||||||
|
-@@ -525,7 +525,7 @@ class ArchiveCreator {
|
||||||
|
+@@ -526,7 +526,7 @@ class ArchiveCreator {
|
||||||
|
|
||||||
|
Future<String> _runGit(List<String> args, {Directory? workingDirectory}) {
|
||||||
|
return _processRunner.runProcess(
|
||||||
|
@@ -12,7 +12,7 @@ index 468a91a954..5def6897ce 100644
|
||||||
|
);
|
||||||
|
}
|
||||||
|
diff --git a/packages/flutter_tools/lib/src/commands/downgrade.dart b/packages/flutter_tools/lib/src/commands/downgrade.dart
|
||||||
|
-index bb0eb428a9..4a2a48bb5e 100644
|
||||||
|
+index 666c190067..b6c3761f6f 100644
|
||||||
|
--- a/packages/flutter_tools/lib/src/commands/downgrade.dart
|
||||||
|
+++ b/packages/flutter_tools/lib/src/commands/downgrade.dart
|
||||||
|
@@ -118,7 +118,7 @@ class DowngradeCommand extends FlutterCommand {
|
||||||
|
@@ -34,19 +34,19 @@ index bb0eb428a9..4a2a48bb5e 100644
|
||||||
|
if (parseResult.exitCode == 0) {
|
||||||
|
buffer.writeln('Channel "${getNameForChannel(channel)}" was previously on: ${parseResult.stdout}.');
|
||||||
|
diff --git a/packages/flutter_tools/lib/src/version.dart b/packages/flutter_tools/lib/src/version.dart
|
||||||
|
-index f2068a6ca2..99b161689e 100644
|
||||||
|
+index dc47f17057..8068e2d1f5 100644
|
||||||
|
--- a/packages/flutter_tools/lib/src/version.dart
|
||||||
|
+++ b/packages/flutter_tools/lib/src/version.dart
|
||||||
|
-@@ -106,7 +106,7 @@ class FlutterVersion {
|
||||||
|
+@@ -111,7 +111,7 @@ class FlutterVersion {
|
||||||
|
String? channel = _channel;
|
||||||
|
if (channel == null) {
|
||||||
|
final String gitChannel = _runGit(
|
||||||
|
-- 'git rev-parse --abbrev-ref --symbolic @{u}',
|
||||||
|
-+ 'git --git-dir .git rev-parse --abbrev-ref --symbolic @{u}',
|
||||||
|
+- 'git rev-parse --abbrev-ref --symbolic $kGitTrackingUpstream',
|
||||||
|
++ 'git --git-dir .git rev-parse --abbrev-ref --symbolic $kGitTrackingUpstream',
|
||||||
|
globals.processUtils,
|
||||||
|
_workingDirectory,
|
||||||
|
);
|
||||||
|
-@@ -114,7 +114,7 @@ class FlutterVersion {
|
||||||
|
+@@ -119,7 +119,7 @@ class FlutterVersion {
|
||||||
|
if (slash != -1) {
|
||||||
|
final String remote = gitChannel.substring(0, slash);
|
||||||
|
_repositoryUrl = _runGit(
|
||||||
|
@@ -55,7 +55,7 @@ index f2068a6ca2..99b161689e 100644
|
||||||
|
globals.processUtils,
|
||||||
|
_workingDirectory,
|
||||||
|
);
|
||||||
|
-@@ -326,7 +326,7 @@ class FlutterVersion {
|
||||||
|
+@@ -298,7 +298,7 @@ class FlutterVersion {
|
||||||
|
/// the branch name will be returned as `'[user-branch]'`.
|
||||||
|
String getBranchName({ bool redactUnknownBranches = false }) {
|
||||||
|
_branch ??= () {
|
||||||
|
@@ -64,7 +64,7 @@ index f2068a6ca2..99b161689e 100644
|
||||||
|
return branch == 'HEAD' ? channel : branch;
|
||||||
|
}();
|
||||||
|
if (redactUnknownBranches || _branch!.isEmpty) {
|
||||||
|
-@@ -359,7 +359,7 @@ class FlutterVersion {
|
||||||
|
+@@ -331,7 +331,7 @@ class FlutterVersion {
|
||||||
|
/// wrapper that does that.
|
||||||
|
@visibleForTesting
|
||||||
|
static List<String> gitLog(List<String> args) {
|
||||||
|
@@ -73,16 +73,16 @@ index f2068a6ca2..99b161689e 100644
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Gets the release date of the latest available Flutter version.
|
||||||
|
-@@ -730,7 +730,7 @@ class GitTagVersion {
|
||||||
|
-
|
||||||
|
- static GitTagVersion determine(ProcessUtils processUtils, {String? workingDirectory, bool fetchTags = false, String gitRef = 'HEAD'}) {
|
||||||
|
+@@ -708,7 +708,7 @@ class GitTagVersion {
|
||||||
|
+ String gitRef = 'HEAD'
|
||||||
|
+ }) {
|
||||||
|
if (fetchTags) {
|
||||||
|
- final String channel = _runGit('git rev-parse --abbrev-ref HEAD', processUtils, workingDirectory);
|
||||||
|
+ final String channel = _runGit('git --git-dir .git rev-parse --abbrev-ref HEAD', processUtils, workingDirectory);
|
||||||
|
if (channel == 'dev' || channel == 'beta' || channel == 'stable') {
|
||||||
|
globals.printTrace('Skipping request to fetchTags - on well known channel $channel.');
|
||||||
|
} else {
|
||||||
|
-@@ -739,7 +739,7 @@ class GitTagVersion {
|
||||||
|
+@@ -718,7 +718,7 @@ class GitTagVersion {
|
||||||
|
}
|
||||||
|
// find all tags attached to the given [gitRef]
|
||||||
|
final List<String> tags = _runGit(
|
||||||
|
@@ -91,7 +91,7 @@ index f2068a6ca2..99b161689e 100644
|
||||||
|
|
||||||
|
// Check first for a stable tag
|
||||||
|
final RegExp stableTagPattern = RegExp(r'^\d+\.\d+\.\d+$');
|
||||||
|
-@@ -760,7 +760,7 @@ class GitTagVersion {
|
||||||
|
+@@ -739,7 +739,7 @@ class GitTagVersion {
|
||||||
|
// recent tag and number of commits past.
|
||||||
|
return parse(
|
||||||
|
_runGit(
|
||||||
|
diff --git a/pkgs/development/compilers/flutter/patches/move-cache.patch b/pkgs/development/compilers/flutter/patches/flutter3/move-cache.patch
|
||||||
|
similarity index 83%
|
||||||
|
rename from pkgs/development/compilers/flutter/patches/move-cache.patch
|
||||||
|
rename to pkgs/development/compilers/flutter/patches/flutter3/move-cache.patch
|
||||||
|
index 5cb7c71e9bd..008c5959e5b 100644
|
||||||
|
--- a/pkgs/development/compilers/flutter/patches/move-cache.patch
|
||||||
|
+++ b/pkgs/development/compilers/flutter/patches/flutter3/move-cache.patch
|
||||||
|
@@ -1,13 +1,9 @@
|
||||||
|
+diff --git a/packages/flutter_tools/lib/src/artifacts.dart b/packages/flutter_tools/lib/src/artifacts.dart
|
||||||
|
diff --git a/packages/flutter_tools/lib/src/asset.dart b/packages/flutter_tools/lib/src/asset.dart
|
||||||
|
-index ed42baea29..12941f733a 100644
|
||||||
|
+index 9dd7272fbe..642c8e48e4 100644
|
||||||
|
--- a/packages/flutter_tools/lib/src/asset.dart
|
||||||
|
+++ b/packages/flutter_tools/lib/src/asset.dart
|
||||||
|
-@@ -11,11 +11,11 @@ import 'base/file_system.dart';
|
||||||
|
- import 'base/logger.dart';
|
||||||
|
- import 'base/platform.dart';
|
||||||
|
- import 'build_info.dart';
|
||||||
|
--import 'cache.dart';
|
||||||
|
- import 'convert.dart';
|
||||||
|
+@@ -16,6 +16,7 @@ import 'convert.dart';
|
||||||
|
import 'dart/package_map.dart';
|
||||||
|
import 'devfs.dart';
|
||||||
|
import 'flutter_manifest.dart';
|
||||||
|
@@ -15,17 +11,18 @@ index ed42baea29..12941f733a 100644
|
||||||
|
import 'license_collector.dart';
|
||||||
|
import 'project.dart';
|
||||||
|
|
||||||
|
-@@ -504,7 +504,7 @@ class ManifestAssetBundle implements AssetBundle {
|
||||||
|
- }
|
||||||
|
+@@ -530,8 +531,7 @@ class ManifestAssetBundle implements AssetBundle {
|
||||||
|
final Uri entryUri = _fileSystem.path.toUri(asset);
|
||||||
|
result.add(_Asset(
|
||||||
|
-- baseDir: _fileSystem.path.join(Cache.flutterRoot!, 'bin', 'cache', 'artifacts', 'material_fonts'),
|
||||||
|
-+ baseDir: _fileSystem.path.join(globals.fsUtils.homeDirPath!, '.cache', 'flutter', 'artifacts', 'material_fonts'),
|
||||||
|
+ baseDir: _fileSystem.path.join(
|
||||||
|
+- Cache.flutterRoot!,
|
||||||
|
+- 'bin', 'cache', 'artifacts', 'material_fonts',
|
||||||
|
++ globals.fsUtils.homeDirPath!, '.cache', 'flutter', 'artifacts', 'material_fonts',
|
||||||
|
+ ),
|
||||||
|
relativeUri: Uri(path: entryUri.pathSegments.last),
|
||||||
|
entryUri: entryUri,
|
||||||
|
- package: null,
|
||||||
|
diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart
|
||||||
|
-index defc86cc20..7fdf14d112 100644
|
||||||
|
+index dd80b1e46e..8e54517765 100644
|
||||||
|
--- a/packages/flutter_tools/lib/src/cache.dart
|
||||||
|
+++ b/packages/flutter_tools/lib/src/cache.dart
|
||||||
|
@@ -22,6 +22,7 @@ import 'base/user_messages.dart';
|
||||||
|
@@ -36,7 +33,7 @@ index defc86cc20..7fdf14d112 100644
|
||||||
|
|
||||||
|
const String kFlutterRootEnvironmentVariableName = 'FLUTTER_ROOT'; // should point to //flutter/ (root of flutter/flutter repo)
|
||||||
|
const String kFlutterEngineEnvironmentVariableName = 'FLUTTER_ENGINE'; // should point to //engine/src/ (root of flutter/engine repo)
|
||||||
|
-@@ -322,8 +323,13 @@ class Cache {
|
||||||
|
+@@ -318,8 +319,13 @@ class Cache {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
assert(_lock == null);
|
||||||
|
@@ -51,7 +48,7 @@ index defc86cc20..7fdf14d112 100644
|
||||||
|
try {
|
||||||
|
_lock = lockFile.openSync(mode: FileMode.write);
|
||||||
|
} on FileSystemException catch (e) {
|
||||||
|
-@@ -382,8 +388,7 @@ class Cache {
|
||||||
|
+@@ -378,8 +384,7 @@ class Cache {
|
||||||
|
|
||||||
|
String get devToolsVersion {
|
||||||
|
if (_devToolsVersion == null) {
|
||||||
|
@@ -61,7 +58,7 @@ index defc86cc20..7fdf14d112 100644
|
||||||
|
if (!devToolsDir.existsSync()) {
|
||||||
|
throw Exception('Could not find directory at ${devToolsDir.path}');
|
||||||
|
}
|
||||||
|
-@@ -536,7 +541,7 @@ class Cache {
|
||||||
|
+@@ -532,7 +537,7 @@ class Cache {
|
||||||
|
if (_rootOverride != null) {
|
||||||
|
return _fileSystem.directory(_fileSystem.path.join(_rootOverride!.path, 'bin', 'cache'));
|
||||||
|
} else {
|
||||||
|
@@ -70,8 +67,7 @@ index defc86cc20..7fdf14d112 100644
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
-diff --git a/packages/flutter_tools/lib/src/artifacts.dart b/packages/flutter_tools/lib/src/artifacts.dart
|
||||||
|
-index 2aac9686e8..32c4b98b88 100644
|
||||||
|
+index c539d67156..4e0a64f7a9 100644
|
||||||
|
--- a/packages/flutter_tools/lib/src/artifacts.dart
|
||||||
|
+++ b/packages/flutter_tools/lib/src/artifacts.dart
|
||||||
|
@@ -346,10 +346,10 @@ class CachedArtifacts implements Artifacts {
|
||||||
|
@@ -82,8 +78,8 @@ index 2aac9686e8..32c4b98b88 100644
|
||||||
|
+ final String path = _dartSdkPath(_fileSystem);
|
||||||
|
return _fileSystem.directory(path);
|
||||||
|
case HostArtifact.engineDartBinary:
|
||||||
|
-- final String path = _fileSystem.path.join(_dartSdkPath(_cache), 'bin', _hostArtifactToFileName(artifact, _platform.isWindows));
|
||||||
|
-+ final String path = _fileSystem.path.join(_dartSdkPath(_fileSystem), 'bin', _hostArtifactToFileName(artifact, _platform.isWindows));
|
||||||
|
+- final String path = _fileSystem.path.join(_dartSdkPath(_cache), 'bin', _hostArtifactToFileName(artifact, _platform));
|
||||||
|
++ final String path = _fileSystem.path.join(_dartSdkPath(_fileSystem), 'bin', _hostArtifactToFileName(artifact, _platform));
|
||||||
|
return _fileSystem.file(path);
|
||||||
|
case HostArtifact.flutterWebSdk:
|
||||||
|
final String path = _getFlutterWebSdkPath();
|
||||||
|
@@ -91,12 +87,12 @@ index 2aac9686e8..32c4b98b88 100644
|
||||||
|
case HostArtifact.dart2jsSnapshot:
|
||||||
|
case HostArtifact.dartdevcSnapshot:
|
||||||
|
case HostArtifact.kernelWorkerSnapshot:
|
||||||
|
-- final String path = _fileSystem.path.join(_dartSdkPath(_cache), 'bin', 'snapshots', _hostArtifactToFileName(artifact, _platform.isWindows));
|
||||||
|
-+ final String path = _fileSystem.path.join(_dartSdkPath(_fileSystem), 'bin', 'snapshots', _hostArtifactToFileName(artifact, _platform.isWindows));
|
||||||
|
+- final String path = _fileSystem.path.join(_dartSdkPath(_cache), 'bin', 'snapshots', _hostArtifactToFileName(artifact, _platform));
|
||||||
|
++ final String path = _fileSystem.path.join(_dartSdkPath(_fileSystem), 'bin', 'snapshots', _hostArtifactToFileName(artifact, _platform));
|
||||||
|
return _fileSystem.file(path);
|
||||||
|
case HostArtifact.iosDeploy:
|
||||||
|
- final String artifactFileName = _hostArtifactToFileName(artifact, _platform.isWindows);
|
||||||
|
-@@ -461,11 +461,13 @@ class CachedArtifacts implements Artifacts {
|
||||||
|
+ final String artifactFileName = _hostArtifactToFileName(artifact, _platform);
|
||||||
|
+@@ -465,11 +465,13 @@ class CachedArtifacts implements Artifacts {
|
||||||
|
String _getAndroidArtifactPath(Artifact artifact, TargetPlatform platform, BuildMode mode) {
|
||||||
|
final String engineDir = _getEngineArtifactsPath(platform, mode)!;
|
||||||
|
switch (artifact) {
|
||||||
|
@@ -125,8 +121,8 @@ index 2aac9686e8..32c4b98b88 100644
|
||||||
|
- case Artifact.frontendServerSnapshotForEngineDartSdk:
|
||||||
|
case Artifact.constFinder:
|
||||||
|
case Artifact.flutterMacOSFramework:
|
||||||
|
- case Artifact.flutterMacOSPodspec:
|
||||||
|
-@@ -594,14 +596,10 @@ class CachedArtifacts implements Artifacts {
|
||||||
|
+ case Artifact.flutterPatchedSdkPath:
|
||||||
|
+@@ -586,14 +588,10 @@ class CachedArtifacts implements Artifacts {
|
||||||
|
// For script snapshots any gen_snapshot binary will do. Returning gen_snapshot for
|
||||||
|
// android_arm in profile mode because it is available on all supported host platforms.
|
||||||
|
return _getAndroidArtifactPath(artifact, TargetPlatform.android_arm, BuildMode.profile);
|
||||||
|
@@ -142,27 +138,27 @@ index 2aac9686e8..32c4b98b88 100644
|
||||||
|
case Artifact.icuData:
|
||||||
|
final String engineArtifactsPath = _cache.getArtifactDirectory('engine').path;
|
||||||
|
final String platformDirName = _enginePlatformDirectoryName(platform);
|
||||||
|
-@@ -797,7 +795,7 @@ class CachedLocalEngineArtifacts implements LocalEngineArtifacts {
|
||||||
|
- final String path = _fileSystem.path.join(_hostEngineOutPath, 'dart-sdk', 'bin', 'snapshots', _hostArtifactToFileName(artifact, _platform.isWindows));
|
||||||
|
+@@ -776,7 +774,7 @@ class CachedLocalEngineArtifacts implements LocalEngineArtifacts {
|
||||||
|
+ final String path = _fileSystem.path.join(_hostEngineOutPath, 'dart-sdk', 'bin', 'snapshots', _hostArtifactToFileName(artifact, _platform));
|
||||||
|
return _fileSystem.file(path);
|
||||||
|
case HostArtifact.dartdevcSnapshot:
|
||||||
|
-- final String path = _fileSystem.path.join(_dartSdkPath(_cache), 'bin', 'snapshots', _hostArtifactToFileName(artifact, _platform.isWindows));
|
||||||
|
-+ final String path = _fileSystem.path.join(_dartSdkPath(_fileSystem), 'bin', 'snapshots', _hostArtifactToFileName(artifact, _platform.isWindows));
|
||||||
|
+- final String path = _fileSystem.path.join(_dartSdkPath(_cache), 'bin', 'snapshots', _hostArtifactToFileName(artifact, _platform));
|
||||||
|
++ final String path = _fileSystem.path.join(_dartSdkPath(_fileSystem), 'bin', 'snapshots', _hostArtifactToFileName(artifact, _platform));
|
||||||
|
return _fileSystem.file(path);
|
||||||
|
case HostArtifact.kernelWorkerSnapshot:
|
||||||
|
- final String path = _fileSystem.path.join(_hostEngineOutPath, 'dart-sdk', 'bin', 'snapshots', _hostArtifactToFileName(artifact, _platform.isWindows));
|
||||||
|
-@@ -922,9 +920,7 @@ class CachedLocalEngineArtifacts implements LocalEngineArtifacts {
|
||||||
|
- case Artifact.windowsUwpCppClientWrapper:
|
||||||
|
+ final String path = _fileSystem.path.join(_hostEngineOutPath, 'dart-sdk', 'bin', 'snapshots', _hostArtifactToFileName(artifact, _platform));
|
||||||
|
+@@ -901,9 +899,7 @@ class CachedLocalEngineArtifacts implements LocalEngineArtifacts {
|
||||||
|
+ case Artifact.windowsCppClientWrapper:
|
||||||
|
return _fileSystem.path.join(_hostEngineOutPath, artifactFileName);
|
||||||
|
case Artifact.frontendServerSnapshotForEngineDartSdk:
|
||||||
|
- return _fileSystem.path.join(
|
||||||
|
- _hostEngineOutPath, 'dart-sdk', 'bin', 'snapshots', artifactFileName,
|
||||||
|
- );
|
||||||
|
+ return _fileSystem.path.join(_hostEngineOutPath, 'gen', artifactFileName);
|
||||||
|
- case Artifact.uwptool:
|
||||||
|
- return _fileSystem.path.join(_hostEngineOutPath, artifactFileName);
|
||||||
|
}
|
||||||
|
-@@ -1034,8 +1030,8 @@ class OverrideArtifacts implements Artifacts {
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+@@ -1011,8 +1007,8 @@ class OverrideArtifacts implements Artifacts {
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Locate the Dart SDK.
|
||||||
|
@@ -174,12 +170,12 @@ index 2aac9686e8..32c4b98b88 100644
|
||||||
|
|
||||||
|
class _TestArtifacts implements Artifacts {
|
||||||
|
diff --git a/packages/flutter_tools/test/general.shard/artifacts_test.dart b/packages/flutter_tools/test/general.shard/artifacts_test.dart
|
||||||
|
-index d906511a15..adfdd4bb42 100644
|
||||||
|
+index aed3eb9285..81b8362648 100644
|
||||||
|
--- a/packages/flutter_tools/test/general.shard/artifacts_test.dart
|
||||||
|
+++ b/packages/flutter_tools/test/general.shard/artifacts_test.dart
|
||||||
|
-@@ -153,10 +153,6 @@ void main() {
|
||||||
|
- artifacts.getArtifactPath(Artifact.windowsUwpDesktopPath, platform: TargetPlatform.windows_uwp_x64, mode: BuildMode.release),
|
||||||
|
- fileSystem.path.join('root', 'bin', 'cache', 'artifacts', 'engine', 'windows-uwp-x64-release'),
|
||||||
|
+@@ -141,10 +141,6 @@ void main() {
|
||||||
|
+ artifacts.getArtifactPath(Artifact.flutterTester, platform: TargetPlatform.linux_arm64),
|
||||||
|
+ fileSystem.path.join('root', 'bin', 'cache', 'artifacts', 'engine', 'linux-arm64', 'flutter_tester'),
|
||||||
|
);
|
||||||
|
- expect(
|
||||||
|
- artifacts.getArtifactPath(Artifact.frontendServerSnapshotForEngineDartSdk),
|
||||||
|
@@ -188,7 +184,7 @@ index d906511a15..adfdd4bb42 100644
|
||||||
|
});
|
||||||
|
|
||||||
|
testWithoutContext('precompiled web artifact paths are correct', () {
|
||||||
|
-@@ -322,11 +318,6 @@ void main() {
|
||||||
|
+@@ -310,11 +306,6 @@ void main() {
|
||||||
|
artifacts.getHostArtifact(HostArtifact.engineDartSdkPath).path,
|
||||||
|
fileSystem.path.join('/out', 'host_debug_unopt', 'dart-sdk'),
|
||||||
|
);
|
||||||
|
@@ -197,6 +193,6 @@ index d906511a15..adfdd4bb42 100644
|
||||||
|
- fileSystem.path.join('/out', 'host_debug_unopt', 'dart-sdk', 'bin',
|
||||||
|
- 'snapshots', 'frontend_server.dart.snapshot')
|
||||||
|
- );
|
||||||
|
- });
|
||||||
|
-
|
||||||
|
- testWithoutContext('getEngineType', () {
|
||||||
|
+ expect(
|
||||||
|
+ artifacts.getHostArtifact(HostArtifact.impellerc).path,
|
||||||
|
+ fileSystem.path.join('/out', 'host_debug_unopt', 'impellerc'),
|
||||||
|
diff --git a/pkgs/os-specific/linux/firmware/firmware-updater/default.nix b/pkgs/os-specific/linux/firmware/firmware-updater/default.nix
|
||||||
|
index fb9d3a9a36c..cc906b763e8 100644
|
||||||
|
--- a/pkgs/os-specific/linux/firmware/firmware-updater/default.nix
|
||||||
|
+++ b/pkgs/os-specific/linux/firmware/firmware-updater/default.nix
|
||||||
|
@@ -1,13 +1,13 @@
|
||||||
|
{ lib
|
||||||
|
-, flutter
|
||||||
|
+, flutter2
|
||||||
|
, fetchFromGitHub
|
||||||
|
}:
|
||||||
|
|
||||||
|
-flutter.mkFlutterApp {
|
||||||
|
+flutter2.mkFlutterApp {
|
||||||
|
pname = "firmware-updater";
|
||||||
|
version = "unstable";
|
||||||
|
|
||||||
|
- vendorHash = "sha256-3wVA9BLCnMijC0gOmskz+Hv7NQIGu/jhBDbWjmoq1Tc=";
|
||||||
|
+ vendorHash = "sha256-7uOiebGBcX61oUyNCi1h9KldTRTrCfYaHUQSH4J5OoQ=";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "canonical";
|
||||||
|
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
|
||||||
|
index 4f25d9b20d8..c282471c464 100644
|
||||||
|
--- a/pkgs/top-level/all-packages.nix
|
||||||
|
+++ b/pkgs/top-level/all-packages.nix
|
||||||
|
@@ -13448,6 +13448,7 @@ with pkgs;
|
||||||
|
flutterPackages =
|
||||||
|
recurseIntoAttrs (callPackage ../development/compilers/flutter { });
|
||||||
|
flutter = flutterPackages.stable;
|
||||||
|
+ flutter2 = flutterPackages.v2;
|
||||||
|
|
||||||
|
fnm = callPackage ../development/tools/fnm {
|
||||||
|
inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation Security;
|
||||||
66
nixpatches/12-flutter-arm64-2.patch
Normal file
66
nixpatches/12-flutter-arm64-2.patch
Normal file
@@ -0,0 +1,66 @@
|
|||||||
|
diff --git a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix
|
||||||
|
index 22bbeb212f0..c07bd8e9fd4 100644
|
||||||
|
--- a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix
|
||||||
|
+++ b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix
|
||||||
|
@@ -4,13 +4,19 @@
|
||||||
|
, olm
|
||||||
|
, imagemagick
|
||||||
|
, makeDesktopItem
|
||||||
|
+, stdenv
|
||||||
|
}:
|
||||||
|
|
||||||
|
+let vendorHashes = {
|
||||||
|
+ x86_64-linux = "sha256-Gi0mfxaMtPI/TxrxnvzQvH9M8CtLADKJfYO2JnzAz+Y=";
|
||||||
|
+ aarch64-linux = "sha256-iq8bMSJoYbDNtR82QunrpQdPUv0nceUKXRqAwDvxCpE=";
|
||||||
|
+};
|
||||||
|
+in
|
||||||
|
flutter2.mkFlutterApp rec {
|
||||||
|
pname = "fluffychat";
|
||||||
|
version = "1.2.0";
|
||||||
|
|
||||||
|
- vendorHash = "sha256-1PDX023WXRmRe/b1L+6Du91BvGwYNp3YATqYSQdPrRY=";
|
||||||
|
+ vendorHash = vendorHashes."${stdenv.hostPlatform.system}" or (throw "unsupported system: ${stdenv.hostPlatform.system}");
|
||||||
|
|
||||||
|
src = fetchFromGitLab {
|
||||||
|
owner = "famedly";
|
||||||
|
diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix
|
||||||
|
index 02188335129..c264565e50a 100644
|
||||||
|
--- a/pkgs/development/compilers/flutter/default.nix
|
||||||
|
+++ b/pkgs/development/compilers/flutter/default.nix
|
||||||
|
@@ -11,7 +11,11 @@ let
|
||||||
|
sources = {
|
||||||
|
"${dartVersion}-x86_64-linux" = fetchurl {
|
||||||
|
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-linux-x64-release.zip";
|
||||||
|
- sha256 = dartHash;
|
||||||
|
+ sha256 = dartHash.x86_64-linux;
|
||||||
|
+ };
|
||||||
|
+ "${dartVersion}-aarch64-linux" = fetchurl {
|
||||||
|
+ url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-linux-arm64-release.zip";
|
||||||
|
+ sha256 = dartHash.aarch64-linux;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
@@ -28,7 +32,10 @@ in
|
||||||
|
version = "3.3.3";
|
||||||
|
dartVersion = "2.18.2";
|
||||||
|
hash = "sha256-MTZeWQUp4/TcPzYIT6eqIKSPUPvn2Mp/thOQzNgpTXg=";
|
||||||
|
- dartHash = "sha256-C3+YjecXLvSmJrLwi9H7TgD9Np0AArRWx3EdBrfQpTU";
|
||||||
|
+ dartHash = {
|
||||||
|
+ x86_64-linux = "sha256-C3+YjecXLvSmJrLwi9H7TgD9Np0AArRWx3EdBrfQpTU";
|
||||||
|
+ aarch64-linux = "sha256-zyIK1i5/9P2C+sjzdArhFwpVO4P+It+/X50l+n9gekI=";
|
||||||
|
+ };
|
||||||
|
patches = getPatches ./patches/flutter3;
|
||||||
|
};
|
||||||
|
|
||||||
|
@@ -37,7 +44,10 @@ in
|
||||||
|
version = "2.10.5";
|
||||||
|
dartVersion = "2.16.2";
|
||||||
|
hash = "sha256-DTZwxlMUYk8NS1SaWUJolXjD+JnRW73Ps5CdRHDGnt0=";
|
||||||
|
- dartHash = "sha256-egrYd7B4XhkBiHPIFE2zopxKtQ58GqlogAKA/UeiXnI=";
|
||||||
|
+ dartHash = {
|
||||||
|
+ x86_64-linux = "sha256-egrYd7B4XhkBiHPIFE2zopxKtQ58GqlogAKA/UeiXnI=";
|
||||||
|
+ aarch64-linux = "sha256-vmerjXkUAUnI8FjK+62qLqgETmA+BLPEZXFxwYpI+KY=";
|
||||||
|
+ };
|
||||||
|
patches = getPatches ./patches/flutter2;
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -1,4 +1,17 @@
|
|||||||
fetchpatch: [
|
fetchpatch: [
|
||||||
|
# Flutter: 3.0.4 -> 3.3.3, flutter.dart: 2.17.5 -> 2.18.2
|
||||||
|
# merged 2022/10/07
|
||||||
|
# (fetchpatch {
|
||||||
|
# url = "https://github.com/NixOS/nixpkgs/pull/189338.diff";
|
||||||
|
# sha256 = "sha256-HRkOIBcOnSXyTKkYxnMgZou8MHU/5eNhxxARdUq9UWg=";
|
||||||
|
# # url = "https://git.uninsane.org/colin/nixpkgs/commit/889c3a8cbc91c0d10b34ab7825fa1f6d1d31668a.diff";
|
||||||
|
# # sha256 = "sha256-qVWLpNoW3HVSWRtXS1BcSusKOq0CAMfY0BVU9MxPm98=";
|
||||||
|
# })
|
||||||
|
#
|
||||||
|
# XXX this is a cherry-pick of all the commits in PR 189338 (as appears in tree).
|
||||||
|
# the diff yielded by Github is apparently not the same somehow (maybe because the branches being merged had diverged too much?)
|
||||||
|
./11-flutter-3.3.3-189338.patch
|
||||||
|
|
||||||
# phosh-mobile-settings: init at 0.21.1
|
# phosh-mobile-settings: init at 0.21.1
|
||||||
(fetchpatch {
|
(fetchpatch {
|
||||||
url = "http://git.uninsane.org/colin/nixpkgs/commit/0c1a7e8504291eb0076bbee3f8ebf693f4641112.diff";
|
url = "http://git.uninsane.org/colin/nixpkgs/commit/0c1a7e8504291eb0076bbee3f8ebf693f4641112.diff";
|
||||||
@@ -6,32 +19,11 @@ fetchpatch: [
|
|||||||
sha256 = "sha256-OczjlQcG7sTM/V9Y9VL/qdwaWPKfjAJsh3czqqhRQig=";
|
sha256 = "sha256-OczjlQcG7sTM/V9Y9VL/qdwaWPKfjAJsh3czqqhRQig=";
|
||||||
})
|
})
|
||||||
|
|
||||||
# # kaiteki: init at 2022-09-03
|
# kaiteki: init at 2022-09-03
|
||||||
# vendorHash changes too frequently (might not be reproducible).
|
|
||||||
# using local package defn until stabilized
|
|
||||||
# (fetchpatch {
|
|
||||||
# url = "https://git.uninsane.org/colin/nixpkgs/commit/e2c7f5f4870fcb0e5405e9001b39a64c516852d4.diff";
|
|
||||||
# # url = "https://github.com/NixOS/nixpkgs/pull/193169.diff";
|
|
||||||
# sha256 = "sha256-UWnfS+stVpUZ3Sfaym9XtVBlwvHWJVMaW7cYIcf3M5Q=";
|
|
||||||
# })
|
|
||||||
|
|
||||||
# freshrss: patchShebangs instead of specifying interpreter in the service
|
|
||||||
(fetchpatch {
|
(fetchpatch {
|
||||||
# url = "https://git.uninsane.org/colin/nixpkgs/commit/9443d83e6fee728c1926a783647b45011bd3b514.diff";
|
url = "https://git.uninsane.org/colin/nixpkgs/commit/e2c7f5f4870fcb0e5405e9001b39a64c516852d4.diff";
|
||||||
url = "https://github.com/NixOS/nixpkgs/pull/196140.diff";
|
# url = "https://github.com/NixOS/nixpkgs/pull/193169.diff";
|
||||||
sha256 = "sha256-Lngle5YTE7ymQyUarKbebMjiaTlY5cJBoaeZk7AgbXE=";
|
sha256 = "sha256-UWnfS+stVpUZ3Sfaym9XtVBlwvHWJVMaW7cYIcf3M5Q=";
|
||||||
})
|
|
||||||
|
|
||||||
# nautilus: look for the gtk4 FileChooser settings instead of the gtk4 one
|
|
||||||
(fetchpatch {
|
|
||||||
# original version (include the patch in nixpkgs)
|
|
||||||
# url = "https://git.uninsane.org/colin/nixpkgs/commit/4636a04c1c4982a0e71ae77d3aa6f52d1a3170f1.diff";
|
|
||||||
# sha256 = "sha256-XKfXStdcveYuk58rlORVJOv0a9Q5aRj1bYT5k79rL0g=";
|
|
||||||
|
|
||||||
# v2 (fetchpatch from upstream PR)
|
|
||||||
# url = "https://git.uninsane.org/colin/nixpkgs/commit/730a802808c549220144e4e62aa419bb07c5ae29.diff";
|
|
||||||
url = "https://github.com/NixOS/nixpkgs/pull/195985.diff";
|
|
||||||
sha256 = "sha256-zd7WGOTm3ygh0Wk3uiA+1S+RqD9yWDSXvo7veHs0K00=";
|
|
||||||
})
|
})
|
||||||
|
|
||||||
# Fix mk flutter app
|
# Fix mk flutter app
|
||||||
@@ -51,4 +43,5 @@ fetchpatch: [
|
|||||||
|
|
||||||
# enable aarch64 support for flutter's dart package
|
# enable aarch64 support for flutter's dart package
|
||||||
# ./10-flutter-arm64.patch
|
# ./10-flutter-arm64.patch
|
||||||
|
./12-flutter-arm64-2.patch
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -1,15 +0,0 @@
|
|||||||
{ pkgs, lib, ... }:
|
|
||||||
|
|
||||||
(pkgs.gocryptfs.overrideAttrs (upstream: {
|
|
||||||
# XXX `su colin` hangs when pam_mount tries to mount a gocryptfs system
|
|
||||||
# unless `logger` (util-linux) is accessible from gocryptfs.
|
|
||||||
# this is surprising: the code LOOKS like it's meant to handle logging failures.
|
|
||||||
# propagating util-linux through either `environment.systemPackages` or `security.pam.mount.additionalSearchPaths` DOES NOT WORK.
|
|
||||||
#
|
|
||||||
# TODO: see about upstreaming this
|
|
||||||
postInstall = ''
|
|
||||||
wrapProgram $out/bin/gocryptfs \
|
|
||||||
--suffix PATH : ${lib.makeBinPath [ pkgs.fuse pkgs.util-linux ]}
|
|
||||||
ln -s $out/bin/gocryptfs $out/bin/mount.fuse.gocryptfs
|
|
||||||
'';
|
|
||||||
}))
|
|
||||||
@@ -10,7 +10,7 @@ flutter.mkFlutterApp rec {
|
|||||||
pname = "kaiteki";
|
pname = "kaiteki";
|
||||||
version = "unstable-2022-09-03";
|
version = "unstable-2022-09-03";
|
||||||
|
|
||||||
vendorHash = "sha256-CXEaQeXEY5PYpcoqmPcRfcyaFsEDZ8bq1pgApmjyp0c=";
|
vendorHash = "sha256-Y0BXQ7xt9w+J896ar6o+FiVGcDJw7dPHo7tgij+p6R0=";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "Kaiteki-Fedi";
|
owner = "Kaiteki-Fedi";
|
||||||
|
|||||||
@@ -1,53 +0,0 @@
|
|||||||
{ lib
|
|
||||||
, fetchFromGitea
|
|
||||||
, gtk3
|
|
||||||
, libhandy_0
|
|
||||||
, lightdm
|
|
||||||
, pkgs
|
|
||||||
, linkFarm
|
|
||||||
, pkg-config
|
|
||||||
, rustPlatform
|
|
||||||
}:
|
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
|
||||||
pname = "lightdm-mobile-greeter";
|
|
||||||
version = "0.1.2";
|
|
||||||
|
|
||||||
src = fetchFromGitea {
|
|
||||||
domain = "git.uninsane.org";
|
|
||||||
owner = "colin";
|
|
||||||
repo = "lightdm-mobile-greeter";
|
|
||||||
rev = "v${version}";
|
|
||||||
hash = "sha256-x7tpaHYDg6BPIc3k3zzPvZma0RYuGAMQ/z6vAP0wbWs=";
|
|
||||||
};
|
|
||||||
cargoHash = "sha256-5WJGnLdZd4acKPEkkTS71n4gfxhlujHWnwiMsomTYck=";
|
|
||||||
|
|
||||||
buildInputs = [
|
|
||||||
gtk3
|
|
||||||
libhandy_0
|
|
||||||
lightdm
|
|
||||||
];
|
|
||||||
nativeBuildInputs = [
|
|
||||||
pkg-config
|
|
||||||
];
|
|
||||||
|
|
||||||
postInstall = ''
|
|
||||||
mkdir -p $out/share/applications
|
|
||||||
substitute lightdm-mobile-greeter.desktop \
|
|
||||||
$out/share/applications/lightdm-mobile-greeter.desktop \
|
|
||||||
--replace lightdm-mobile-greeter $out/bin/lightdm-mobile-greeter
|
|
||||||
'';
|
|
||||||
|
|
||||||
passthru.xgreeters = linkFarm "lightdm-mobile-greeter-xgreeters" [{
|
|
||||||
path = "${pkgs.lightdm-mobile-greeter}/share/applications/lightdm-mobile-greeter.desktop";
|
|
||||||
name = "lightdm-mobile-greeter.desktop";
|
|
||||||
}];
|
|
||||||
|
|
||||||
meta = with lib; {
|
|
||||||
description = "A simple log in screen for use on touch screens.";
|
|
||||||
homepage = "https://git.uninsane.org/colin/lightdm-mobile-greeter";
|
|
||||||
maintainers = with maintainers; [ colinsane ];
|
|
||||||
platforms = platforms.linux;
|
|
||||||
license = licenses.mit;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
13
pkgs/matrix-appservice-discord/01-puppet.patch
Normal file
13
pkgs/matrix-appservice-discord/01-puppet.patch
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
diff --git a/src/clientfactory.ts b/src/clientfactory.ts
|
||||||
|
index b7fea47..587acfd 100644
|
||||||
|
--- a/src/clientfactory.ts
|
||||||
|
+++ b/src/clientfactory.ts
|
||||||
|
@@ -53,7 +53,7 @@ export class DiscordClientFactory {
|
||||||
|
});
|
||||||
|
|
||||||
|
try {
|
||||||
|
- await this.botClient.login(this.config.botToken, true);
|
||||||
|
+ await this.botClient.login(this.config.botToken, false);
|
||||||
|
log.info("Waiting for shardReady signal");
|
||||||
|
await waitPromise;
|
||||||
|
log.info("Got shardReady signal");
|
||||||
16
pkgs/matrix-appservice-discord/02-auto-approve.patch
Normal file
16
pkgs/matrix-appservice-discord/02-auto-approve.patch
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
diff --git a/src/provisioner.ts b/src/provisioner.ts
|
||||||
|
index c1568af..28a44c5 100644
|
||||||
|
--- a/src/provisioner.ts
|
||||||
|
+++ b/src/provisioner.ts
|
||||||
|
@@ -99,8 +99,9 @@
|
||||||
|
this.pendingRequests.set(channelId, approveFn);
|
||||||
|
setTimeout(() => approveFn(false, true), timeout);
|
||||||
|
|
||||||
|
- await channel.send(`${requestor} on matrix would like to bridge this channel. Someone with permission` +
|
||||||
|
- " to manage webhooks please reply with `!matrix approve` or `!matrix deny` in the next 5 minutes");
|
||||||
|
+ // await channel.send(`${requestor} on matrix would like to bridge this channel. Someone with permission` +
|
||||||
|
+ // " to manage webhooks please reply with `!matrix approve` or `!matrix deny` in the next 5 minutes");
|
||||||
|
+ approveFn(true);
|
||||||
|
return await deferP;
|
||||||
|
|
||||||
|
}
|
||||||
14
pkgs/matrix-appservice-discord/03-no-edits.patch
Normal file
14
pkgs/matrix-appservice-discord/03-no-edits.patch
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
diff --git a/src/bot.ts b/src/bot.ts
|
||||||
|
index 8bc73d4..1e6ea67 100644
|
||||||
|
--- a/src/bot.ts
|
||||||
|
+++ b/src/bot.ts
|
||||||
|
@@ -568,7 +568,8 @@ export class DiscordBot {
|
||||||
|
}
|
||||||
|
const link = `https://discord.com/channels/${chan.guild.id}/${chan.id}/${editEventId}`;
|
||||||
|
embedSet.messageEmbed.description = `[Edit](${link}): ${embedSet.messageEmbed.description}`;
|
||||||
|
- await this.send(embedSet, opts, roomLookup, event);
|
||||||
|
+ log.warn("not editing sent Matrix -> Discord message");
|
||||||
|
+ // await this.send(embedSet, opts, roomLookup, event);
|
||||||
|
} catch (err) {
|
||||||
|
// throw wrapError(err, Unstable.ForeignNetworkError, "Couldn't edit message");
|
||||||
|
log.warn(`Failed to edit message ${event.event_id}`);
|
||||||
88
pkgs/matrix-appservice-discord/04-no-kickbans.patch
Normal file
88
pkgs/matrix-appservice-discord/04-no-kickbans.patch
Normal file
@@ -0,0 +1,88 @@
|
|||||||
|
diff --git a/src/bot.ts b/src/bot.ts
|
||||||
|
index 8bc73d4..1e6ea67 100644
|
||||||
|
--- a/src/bot.ts
|
||||||
|
+++ b/src/bot.ts
|
||||||
|
@@ -795,82 +796,7 @@ export class DiscordBot {
|
||||||
|
roomId: string, kickeeUserId: string, kicker: string, kickban: "leave"|"ban",
|
||||||
|
previousState: string, reason?: string,
|
||||||
|
) {
|
||||||
|
- const restore = kickban === "leave" && previousState === "ban";
|
||||||
|
- const client = await this.clientFactory.getClient(kicker);
|
||||||
|
- let channel: Discord.Channel;
|
||||||
|
- try {
|
||||||
|
- channel = await this.GetChannelFromRoomId(roomId, client);
|
||||||
|
- } catch (ex) {
|
||||||
|
- log.error("Failed to get channel for ", roomId, ex);
|
||||||
|
- return;
|
||||||
|
- }
|
||||||
|
- if (channel.type !== "text") {
|
||||||
|
- log.warn("Channel was not a text channel");
|
||||||
|
- return;
|
||||||
|
- }
|
||||||
|
- const tchan = (channel as Discord.TextChannel);
|
||||||
|
- const kickeeUser = await this.GetDiscordUserOrMember(
|
||||||
|
- kickeeUserId.substring("@_discord_".length, kickeeUserId.indexOf(":") - 1),
|
||||||
|
- tchan.guild.id,
|
||||||
|
- );
|
||||||
|
- if (!kickeeUser) {
|
||||||
|
- log.error("Could not find discord user for", kickeeUserId);
|
||||||
|
- return;
|
||||||
|
- }
|
||||||
|
- const kickee = kickeeUser as Discord.GuildMember;
|
||||||
|
- let res: Discord.Message;
|
||||||
|
- const botChannel = await this.GetChannelFromRoomId(roomId) as Discord.TextChannel;
|
||||||
|
- if (restore) {
|
||||||
|
- await tchan.overwritePermissions([
|
||||||
|
- {
|
||||||
|
- allow: ["SEND_MESSAGES", "VIEW_CHANNEL"],
|
||||||
|
- id: kickee.id,
|
||||||
|
- }],
|
||||||
|
- `Unbanned.`,
|
||||||
|
- );
|
||||||
|
- this.channelLock.set(botChannel.id);
|
||||||
|
- res = await botChannel.send(
|
||||||
|
- `${kickee} was unbanned from this channel by ${kicker}.`,
|
||||||
|
- ) as Discord.Message;
|
||||||
|
- this.sentMessages.push(res.id);
|
||||||
|
- this.channelLock.release(botChannel.id);
|
||||||
|
- return;
|
||||||
|
- }
|
||||||
|
- const existingPerms = tchan.permissionsFor(kickee);
|
||||||
|
- if (existingPerms && existingPerms.has(Discord.Permissions.FLAGS.VIEW_CHANNEL as number) === false ) {
|
||||||
|
- log.warn("User isn't allowed to read anyway.");
|
||||||
|
- return;
|
||||||
|
- }
|
||||||
|
- const word = `${kickban === "ban" ? "banned" : "kicked"}`;
|
||||||
|
- this.channelLock.set(botChannel.id);
|
||||||
|
- res = await botChannel.send(
|
||||||
|
- `${kickee} was ${word} from this channel by ${kicker}.`
|
||||||
|
- + (reason ? ` Reason: ${reason}` : ""),
|
||||||
|
- ) as Discord.Message;
|
||||||
|
- this.sentMessages.push(res.id);
|
||||||
|
- this.channelLock.release(botChannel.id);
|
||||||
|
- log.info(`${word} ${kickee}`);
|
||||||
|
-
|
||||||
|
- await tchan.overwritePermissions([
|
||||||
|
- {
|
||||||
|
- deny: ["SEND_MESSAGES", "VIEW_CHANNEL"],
|
||||||
|
- id: kickee.id,
|
||||||
|
- }],
|
||||||
|
- `Matrix user was ${word} by ${kicker}.`,
|
||||||
|
- );
|
||||||
|
- if (kickban === "leave") {
|
||||||
|
- // Kicks will let the user back in after ~30 seconds.
|
||||||
|
- setTimeout(async () => {
|
||||||
|
- log.info(`Kick was lifted for ${kickee.displayName}`);
|
||||||
|
- await tchan.overwritePermissions([
|
||||||
|
- {
|
||||||
|
- allow: ["SEND_MESSAGES", "VIEW_CHANNEL"],
|
||||||
|
- id: kickee.id,
|
||||||
|
- }],
|
||||||
|
- `Lifting kick since duration expired.`,
|
||||||
|
- );
|
||||||
|
- }, this.config.room.kickFor);
|
||||||
|
- }
|
||||||
|
+ return; // this is about letting Discord users know when Matrix users are kicked/banned
|
||||||
|
}
|
||||||
|
|
||||||
|
public async GetEmojiByMxc(mxc: string): Promise<DbEmoji> {
|
||||||
13
pkgs/matrix-appservice-discord/05-no-meta.patch
Normal file
13
pkgs/matrix-appservice-discord/05-no-meta.patch
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
diff --git a/src/matrixeventprocessor.ts b/src/matrixeventprocessor.ts
|
||||||
|
index f1f4611..7b57ff3 100644
|
||||||
|
--- a/src/matrixeventprocessor.ts
|
||||||
|
+++ b/src/matrixeventprocessor.ts
|
||||||
|
@@ -278,6 +278,8 @@ export class MatrixEventProcessor {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ return; // disable all meta notifications
|
||||||
|
+
|
||||||
|
msg += " on Matrix.";
|
||||||
|
const channel = await this.discord.GetChannelFromRoomId(event.room_id) as Discord.TextChannel;
|
||||||
|
await this.discord.sendAsBot(msg, channel, event);
|
||||||
19
pkgs/matrix-appservice-discord/default.nix
Normal file
19
pkgs/matrix-appservice-discord/default.nix
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
{ pkgs }:
|
||||||
|
|
||||||
|
(pkgs.matrix-appservice-discord.overrideAttrs (upstream: {
|
||||||
|
# 2022-10-05: the service can't login as an ordinary user unless i change the source
|
||||||
|
doCheck = false;
|
||||||
|
patches = (upstream.patches or []) ++ [
|
||||||
|
# don't register with better-discord as a bot
|
||||||
|
./01-puppet.patch
|
||||||
|
# don't ask Discord admin for approval before bridging
|
||||||
|
./02-auto-approve.patch
|
||||||
|
# disable Matrix -> Discord edits because they do not fit Discord semantics
|
||||||
|
./03-no-edits.patch
|
||||||
|
# we don't want to notify Discord users that a Matrix user was kicked/banned
|
||||||
|
./04-no-kickbans.patch
|
||||||
|
# don't notify Discord users when the Matrix room changes (name, topic, membership)
|
||||||
|
./05-no-meta.patch
|
||||||
|
];
|
||||||
|
}))
|
||||||
|
|
||||||
@@ -27,6 +27,8 @@
|
|||||||
pleroma = prev.callPackage ./pleroma { };
|
pleroma = prev.callPackage ./pleroma { };
|
||||||
# jackett doesn't allow customization of the bind address: this will probably always be here.
|
# jackett doesn't allow customization of the bind address: this will probably always be here.
|
||||||
jackett = prev.callPackage ./jackett { pkgs = prev; };
|
jackett = prev.callPackage ./jackett { pkgs = prev; };
|
||||||
|
# TODO: delete matrix-appservice-discord
|
||||||
|
matrix-appservice-discord = prev.callPackage ./matrix-appservice-discord { pkgs = prev; };
|
||||||
# mozilla keeps nerfing itself and removing configuration options
|
# mozilla keeps nerfing itself and removing configuration options
|
||||||
firefox-unwrapped = prev.callPackage ./firefox-unwrapped { pkgs = prev; };
|
firefox-unwrapped = prev.callPackage ./firefox-unwrapped { pkgs = prev; };
|
||||||
# fix abrupt HDD poweroffs as during reboot. patching systemd requires rebuilding nearly every package.
|
# fix abrupt HDD poweroffs as during reboot. patching systemd requires rebuilding nearly every package.
|
||||||
@@ -35,11 +37,8 @@
|
|||||||
# patch rpi uboot with something that fixes USB HDD boot
|
# patch rpi uboot with something that fixes USB HDD boot
|
||||||
ubootRaspberryPi4_64bit = prev.callPackage ./ubootRaspberryPi4_64bit { pkgs = prev; };
|
ubootRaspberryPi4_64bit = prev.callPackage ./ubootRaspberryPi4_64bit { pkgs = prev; };
|
||||||
|
|
||||||
gocryptfs = prev.callPackage ./gocryptfs { pkgs = prev; };
|
|
||||||
|
|
||||||
#### TEMPORARY: PACKAGES WAITING TO BE UPSTREAMED
|
#### TEMPORARY: PACKAGES WAITING TO BE UPSTREAMED
|
||||||
kaiteki = prev.callPackage ./kaiteki { };
|
kaiteki = prev.callPackage ./kaiteki { };
|
||||||
lightdm-mobile-greeter = prev.callPackage ./lightdm-mobile-greeter { pkgs = next; };
|
|
||||||
# kaiteki = prev.kaiteki;
|
# kaiteki = prev.kaiteki;
|
||||||
# TODO: upstream, or delete nabla
|
# TODO: upstream, or delete nabla
|
||||||
nabla = prev.callPackage ./nabla { };
|
nabla = prev.callPackage ./nabla { };
|
||||||
|
|||||||
@@ -23,7 +23,6 @@ resholve.mkDerivation {
|
|||||||
file
|
file
|
||||||
findutils
|
findutils
|
||||||
gnugrep
|
gnugrep
|
||||||
gocryptfs
|
|
||||||
ifuse
|
ifuse
|
||||||
inotify-tools
|
inotify-tools
|
||||||
ncurses
|
ncurses
|
||||||
@@ -55,15 +54,14 @@ resholve.mkDerivation {
|
|||||||
};
|
};
|
||||||
|
|
||||||
# list of programs which *can* or *cannot* exec their arguments
|
# list of programs which *can* or *cannot* exec their arguments
|
||||||
execer = with pkgs; [
|
execer = [
|
||||||
"cannot:${gocryptfs}/bin/gocryptfs"
|
"cannot:${pkgs.ifuse}/bin/ifuse"
|
||||||
"cannot:${ifuse}/bin/ifuse"
|
"cannot:${pkgs.oath-toolkit}/bin/oathtool"
|
||||||
"cannot:${oath-toolkit}/bin/oathtool"
|
"cannot:${pkgs.openssh}/bin/ssh-keygen"
|
||||||
"cannot:${openssh}/bin/ssh-keygen"
|
"cannot:${pkgs.rmlint}/bin/rmlint"
|
||||||
"cannot:${rmlint}/bin/rmlint"
|
"cannot:${pkgs.rsync}/bin/rsync"
|
||||||
"cannot:${rsync}/bin/rsync"
|
"cannot:${pkgs.ssh-to-age}/bin/ssh-to-age"
|
||||||
"cannot:${sops}/bin/sops"
|
"cannot:${pkgs.sops}/bin/sops"
|
||||||
"cannot:${ssh-to-age}/bin/ssh-to-age"
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,10 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
|
|
||||||
set -ex
|
|
||||||
|
|
||||||
# configure persistent, encrypted storage that is auto-mounted on login.
|
|
||||||
# this is a one-time setup and user should log out/back in after running it.
|
|
||||||
|
|
||||||
p=/nix/persist/home/colin/private
|
|
||||||
mkdir -p $p
|
|
||||||
gocryptfs -init $p
|
|
||||||
16
readme.md
16
readme.md
@@ -1,11 +1,9 @@
|
|||||||
to deploy:
|
to deploy:
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
nixos-rebuild --flake "./#servo" {build,switch}
|
nixos-rebuild --flake "./#servo" {build,switch}
|
||||||
```
|
```
|
||||||
|
|
||||||
more options (like building packages defined in this repo):
|
more options (like building packages defined in this repo):
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
nix flake show
|
nix flake show
|
||||||
```
|
```
|
||||||
@@ -30,18 +28,6 @@ refer to flake.nix for more details.
|
|||||||
|
|
||||||
to build one of the custom sane packages, just name it:
|
to build one of the custom sane packages, just name it:
|
||||||
|
|
||||||
```sh
|
```
|
||||||
nix build ./#fluffychat-moby
|
nix build ./#fluffychat-moby
|
||||||
```
|
```
|
||||||
|
|
||||||
to build a nixpkg:
|
|
||||||
|
|
||||||
```sh
|
|
||||||
nix build ./#nixpkgs.curl
|
|
||||||
```
|
|
||||||
|
|
||||||
to build a package for another platform:
|
|
||||||
|
|
||||||
```sh
|
|
||||||
nix build ./#packages.aarch64-linux.nixpkgs.ubootRaspberryPi4_64bit
|
|
||||||
```
|
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ wg_ovpns_privkey: ENC[AES256_GCM,data:+SdnhsPyg6Vbl0itNLq4fBPONLBknkjFCr/4shTr2H
|
|||||||
#ENC[AES256_GCM,data:857w7AqbAbVTOKFLxKcMkcQjJ7EkHZFwBRwtCJFspOk8do2f,iv:bIrXzdrhRYk79ZV+JCdIw4UVxq11/tTZUDL6Bwf+NoE=,tag:igMRz5UPX//JrF9NGCOwHQ==,type:comment]
|
#ENC[AES256_GCM,data:857w7AqbAbVTOKFLxKcMkcQjJ7EkHZFwBRwtCJFspOk8do2f,iv:bIrXzdrhRYk79ZV+JCdIw4UVxq11/tTZUDL6Bwf+NoE=,tag:igMRz5UPX//JrF9NGCOwHQ==,type:comment]
|
||||||
#ENC[AES256_GCM,data:KzCOrdCiXHrVx+oGj2mz/+zkZ8eRRnFhHadx6FlXj8OXQDMvDkSPi6G2f6j5FE//G2F321mZCiMJ1Mf32tItGb0SxoEhyO9wxTesNn45hmA7M0z5HqTxACU=,iv:ksdz8j2fq1W/xnzu0y1JaIgbKzjiqj2KHCEYhkEKsrM=,tag:dbH/vy4JgL1eUeNpv7afSQ==,type:comment]
|
#ENC[AES256_GCM,data:KzCOrdCiXHrVx+oGj2mz/+zkZ8eRRnFhHadx6FlXj8OXQDMvDkSPi6G2f6j5FE//G2F321mZCiMJ1Mf32tItGb0SxoEhyO9wxTesNn45hmA7M0z5HqTxACU=,iv:ksdz8j2fq1W/xnzu0y1JaIgbKzjiqj2KHCEYhkEKsrM=,tag:dbH/vy4JgL1eUeNpv7afSQ==,type:comment]
|
||||||
dovecot_passwd: ENC[AES256_GCM,data:GsXT6PQjCibzyr5G4W3IOIRL4xBuYqFYHpRJOjS2TvXIlTSwVrHbx5Vw5wLHI0zN14rvYy5sycJvEMiCC1YPVphAYNm7VHdo97sUGLpjZ1BpUaJ2KBx77jErxbPrJUSpAroojQFtXFYA2t2bTpOSjZGH7UeyZoLckZtdDqXmnBDvirwVDPNaPv04RrhnqehGyh8EN+b2b5KAm99U9H1oyxIL6mAMJo6FtduVejiVqJB2sl/myI5fJ+bvwkW1CLRmVi0JdVHs4BlTQpi5Q8Kx2SMOH02TP+QDSHv/O8ROpbZ8m0oTk2YbgAG7U8K0t55j8jjWX/7OD4nMv485PgzAMINdzI46g9l9afzo,iv:8MqpUkRPpGJiuWtrdTJAIDXrKZMI73LcwzOiqVMWR88=,tag:+zXmEPV90loAMJtL/+v3vA==,type:str]
|
dovecot_passwd: ENC[AES256_GCM,data:GsXT6PQjCibzyr5G4W3IOIRL4xBuYqFYHpRJOjS2TvXIlTSwVrHbx5Vw5wLHI0zN14rvYy5sycJvEMiCC1YPVphAYNm7VHdo97sUGLpjZ1BpUaJ2KBx77jErxbPrJUSpAroojQFtXFYA2t2bTpOSjZGH7UeyZoLckZtdDqXmnBDvirwVDPNaPv04RrhnqehGyh8EN+b2b5KAm99U9H1oyxIL6mAMJo6FtduVejiVqJB2sl/myI5fJ+bvwkW1CLRmVi0JdVHs4BlTQpi5Q8Kx2SMOH02TP+QDSHv/O8ROpbZ8m0oTk2YbgAG7U8K0t55j8jjWX/7OD4nMv485PgzAMINdzI46g9l9afzo,iv:8MqpUkRPpGJiuWtrdTJAIDXrKZMI73LcwzOiqVMWR88=,tag:+zXmEPV90loAMJtL/+v3vA==,type:str]
|
||||||
freshrss_passwd: ENC[AES256_GCM,data:MilteAOk+MZjta+E7Zhxq80y,iv:VigZk0nNHvQNlm36jVN5YXY7bhxmx2CFBizbVFCA8O0=,tag:DKsxGsv53SsJsp3J7UIsgg==,type:str]
|
|
||||||
#ENC[AES256_GCM,data:1zQ8X9W4ZGquYEjEsN8YNLhwBt6kaRCKYMjM8GiZbKzsaqwt/cFk+4cC85+QKWF0FNlX38Uba7bI2FvC8fTIO8eoZ5VymJ9Du3NcExE1976FSIze44FhtkSKQkm/vQw5cb2sPNKBGFLSNV/IpdPu,iv:xwv2+Fns0k2STkS760v9p1XZ5s2HAz3wLb8xyIOGTGA=,tag:OGtHxQgyWxGKtg5I9nJAag==,type:comment]
|
#ENC[AES256_GCM,data:1zQ8X9W4ZGquYEjEsN8YNLhwBt6kaRCKYMjM8GiZbKzsaqwt/cFk+4cC85+QKWF0FNlX38Uba7bI2FvC8fTIO8eoZ5VymJ9Du3NcExE1976FSIze44FhtkSKQkm/vQw5cb2sPNKBGFLSNV/IpdPu,iv:xwv2+Fns0k2STkS760v9p1XZ5s2HAz3wLb8xyIOGTGA=,tag:OGtHxQgyWxGKtg5I9nJAag==,type:comment]
|
||||||
nix_serve_privkey: ENC[AES256_GCM,data:JlLuslwyjKARo3Mo36SeRz6ctVuV+jzDMXACekaGs/UjP+Jm8PoxZsWjMcN+qq0tJB9xGMfi7TKHDi+XnK2k60h+7+yDyeqJQfjID6axMYmgxYUivq4CugutFVB27FmDPljUs2M7CRqe1IHrdjc=,iv:1iQVr9rP80hHCRSVD95KW7bpOWj3oZReJAvqa9TllJ8=,tag:6DDGtHF4suOyy2kcnqSDsQ==,type:str]
|
nix_serve_privkey: ENC[AES256_GCM,data:JlLuslwyjKARo3Mo36SeRz6ctVuV+jzDMXACekaGs/UjP+Jm8PoxZsWjMcN+qq0tJB9xGMfi7TKHDi+XnK2k60h+7+yDyeqJQfjID6axMYmgxYUivq4CugutFVB27FmDPljUs2M7CRqe1IHrdjc=,iv:1iQVr9rP80hHCRSVD95KW7bpOWj3oZReJAvqa9TllJ8=,tag:6DDGtHF4suOyy2kcnqSDsQ==,type:str]
|
||||||
#ENC[AES256_GCM,data:cyptbs4VfXY4P4+W5e2LRZOHkpqvWzn2JEpV80w8cIaQ0lTZa/Hg7IwDNQcsYobmBFO2yLrKawHDKlDos2fMy0KgIhUrw4f8WksxdC06oMqS0mDtgA==,iv:StB34bvA8GWR+7nwOOpsiJ3yqGgeSg5frAgRMhff8nw=,tag:b1LYFzII2Ik1nmGXxgMZuw==,type:comment]
|
#ENC[AES256_GCM,data:cyptbs4VfXY4P4+W5e2LRZOHkpqvWzn2JEpV80w8cIaQ0lTZa/Hg7IwDNQcsYobmBFO2yLrKawHDKlDos2fMy0KgIhUrw4f8WksxdC06oMqS0mDtgA==,iv:StB34bvA8GWR+7nwOOpsiJ3yqGgeSg5frAgRMhff8nw=,tag:b1LYFzII2Ik1nmGXxgMZuw==,type:comment]
|
||||||
@@ -47,8 +46,8 @@ sops:
|
|||||||
U0ZlOUljcE9BL1lhcmIrVVl6eFdTUmMKBHmv96FmkL/oQw9//ATfem6HtORRjcce
|
U0ZlOUljcE9BL1lhcmIrVVl6eFdTUmMKBHmv96FmkL/oQw9//ATfem6HtORRjcce
|
||||||
xJNwnsdrEqrBS3sG6xDkmJYOjaFrg1pwxYZRG87zeLShgkXkMNvz2A==
|
xJNwnsdrEqrBS3sG6xDkmJYOjaFrg1pwxYZRG87zeLShgkXkMNvz2A==
|
||||||
-----END AGE ENCRYPTED FILE-----
|
-----END AGE ENCRYPTED FILE-----
|
||||||
lastmodified: "2022-10-14T00:37:52Z"
|
lastmodified: "2022-06-10T08:38:03Z"
|
||||||
mac: ENC[AES256_GCM,data:qKr1aKWxuJWwjUYX+JWAdwHFAwApHm9hOYBgZxAIXbXHhOo04K1MFBDTsAvtvN1a11QtCJYDNuVNpuRu3bf/5Ji5ROTaKfQCgPk+ZScJuWpLsxchYV+TnlREwQI+qgvogyMKMlPInozgd7RNnsePdg7DtYFfGMAvUtX9OidxAXI=,iv:EAkNQkIqoXtRy+uSb7ccl9T5b6hiyRll/m76nhir9AI=,tag:kCDEBJDW34VgLQPd4V+uYA==,type:str]
|
mac: ENC[AES256_GCM,data:DroE9KGyV6hba0aPVYmwxpL8yXDa+AFsjyF5ttImW5bKzE9EM2I76APoGOyvOnnnbBRrOditWXA2HQzhf4M/7hq0CmLLph1J3I8xgEsaiJiExaKZQpQTBS/ZAHeygR/fvRcMmAY9VZRubv1iQ94rDkZ3C3UJ+8SMuwpdmdlaPYc=,iv:KkY0Kmd02QYx0Ds0LUY9tXz+AayKj6Y5p/rUO8sLYCc=,tag:gZDe+GOw2ULJ1yHONlt7bw==,type:str]
|
||||||
pgp: []
|
pgp: []
|
||||||
unencrypted_suffix: _unencrypted
|
unencrypted_suffix: _unencrypted
|
||||||
version: 3.7.3
|
version: 3.7.3
|
||||||
|
|||||||
28
secrets/servo/matrix_appservice_discord_env.bin
Normal file
28
secrets/servo/matrix_appservice_discord_env.bin
Normal file
@@ -0,0 +1,28 @@
|
|||||||
|
{
|
||||||
|
"data": "ENC[AES256_GCM,data:7j1l4XJ8cp8MVuSmOedOZwGDWV11hmwFyLW43ixUBaZLWbUZ6Z4P4Gt+o7bj8gc/X8aiPV8sxAR/jY28Sc5DIaAnkKnXjesPVlG0c3oRAsXemKGX8fANkoNX5iEPbWAkFiJdLS6Fgdv2g4z6DQ4odvZQKrMchx8MPYq8icBvvbhKiGs5xo+MGrMBVRCZOERM2FJSy/q9zLv6hU5SfnnYDTMt,iv:poHHiCs0YOCv74dQ2kyXogdgTUqmKRgGq2r7lcxe4bQ=,tag:rz1/FLC5Q8S13TTWNKcYyQ==,type:str]",
|
||||||
|
"sops": {
|
||||||
|
"kms": null,
|
||||||
|
"gcp_kms": null,
|
||||||
|
"azure_kv": null,
|
||||||
|
"hc_vault": null,
|
||||||
|
"age": [
|
||||||
|
{
|
||||||
|
"recipient": "age1tnl4jfgacwkargzeqnhzernw29xx8mkv73xh6ufdyde6q7859slsnzf24x",
|
||||||
|
"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB2TjVWenJkYVdjeExzYjVj\nUVdFeUdMRUtwOWJNYUx6dFRWRXdEUWJhdkVFClM1UnhtWndYbE91RCtVRnl4TGp4\nZHNJNUliOWhqcUorZVBEQWR0eXZaMVEKLS0tIDdsVFJ2bmdNeVk5b3FJVDQ3T1BG\nU0taQlA1QVEvYVJweDQ5L2YwTmo2ek0K+nbzpIpjAhRgJ5Lw+mx/doGMjw0aMNkZ\n5sAnPJo88Sa/TW3qBN48xFBMLWMp/SKs2JTaMu0xW0u2SkQX38TLlw==\n-----END AGE ENCRYPTED FILE-----\n"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"recipient": "age1z8fauff34cdecr6sjkre260luzxcca05kpcwvhx988d306tpcejsp63znu",
|
||||||
|
"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAyUFBSYVJZUmRBcGJXclNP\nRDRUZnRKMmYwdFhQcE1oWUhrZGxNTk5YOFIwCldUMW92NGl0VVBsS0JtYjJOTW9E\nK2ZZdm9GK3FOMitUdEU3QStsR2svQWMKLS0tIE9SWXAzVndsdGY3Uzh2eHpBRjdO\nTVc4cWNDUWRuSWRmZC8rK1ZFS2l4WEkKQR9mApDjb0k14W3jK+CEz3Dez6wSBpg+\nZ7uUfSbPXFxRxvNEascRn/+EHPcd/A7MZjViDUyWVcP6fSMPsQvxhw==\n-----END AGE ENCRYPTED FILE-----\n"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"recipient": "age1tzlyex2z6t88tg9h82943e39shxhmqeyr7ywhlwpdjmyqsndv3qq27x0rf",
|
||||||
|
"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBkWHlteTRDcHRneW9hbzlh\nMHBjZ2RHeDBIbDM2QXVxK09mcERVSUliVWw0Ckg1dGFkUUxPQW1HcDFXcEEyejFD\nWW5qUkNwRkdIdjRiTFJNd0Q5NWpLUUEKLS0tIG1wTnk1aEhudm9VZjZRVGRWWnR0\nVHlFbUJHaitadDVOSG1FMTBqeHJGV0kKAjuuw3j4dx3QfNcjyl8XCP9Q6oOkLZBN\nsW7uCqbVgBCG+uIggwefLWAy8g6PYlLj0aumgLPYVsXShbQYi32m/g==\n-----END AGE ENCRYPTED FILE-----\n"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"lastmodified": "2022-10-06T05:07:20Z",
|
||||||
|
"mac": "ENC[AES256_GCM,data:9WR8xfs5XIkWxDlJVX1EiSJBLBgWMR99PJJXCK9RcbuChK7QvjWjEflwq419qeNbMWdHLkUwSQrBsoHomaiGWFOPZ0C8bqcqDl0zzXMk7nBxM4UgTjRLmML2tdI2bCS0DC0AtytThYPvkW+JHgKB6bOAEw/bVWVP4YJQKWEf6FY=,iv:nG+J7jCdqZHp6x6Vlvye7BbK7YSl0Y9cjTWbW/BZLxo=,tag:OWqXktZE52Q3j7D2KG+vHw==,type:str]",
|
||||||
|
"pgp": null,
|
||||||
|
"unencrypted_suffix": "_unencrypted",
|
||||||
|
"version": "3.7.3"
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"data": "ENC[AES256_GCM,data:eB7lM7gzQVRrs31/vb4D19N0xvmau5mp77scLaj6h9HHI/6sJ9LTu+gfSGQIOID7xJA4m1T77aYLC6wC9tXBOAVwcdFcXrFsoYuVU2COtRPWTjeMWiK3t5eQ6TLrgru6OUcC0bpeCtZhQbXYkBTBViMNOfXdah0t9NxGPrSn0pNwMs22Ndcc1zRJFPqvjcaVWCxRsfWWBZfDx+AK0PWwxCbHaDMx9Vw5vJltmF1NVc37dTqIVRY/n4xNbqA1pEs4Ese8rjojU9VZFObpJb0k,iv:JAJIuOzPM3/jw/3APWPCCwuhXaFlKABFqch8GUDFX9E=,tag:S7Tk3T+/8H7pIWMKkrfGSg==,type:str]",
|
"data": "ENC[AES256_GCM,data:ZYCyNfJdnYij3ZPNftCq+shfLs1Du/WjRyXMnphEltKr1MRr+f5RY++na3VVtREHYq/NMFNHMjlkcsBREt8KrPOlk5CUh4oNfwrFLsvDN9mJmW7mw0h0Nl0kxwPMI+SRHh1cKsmSjDYWBQ7pLKXbDfv46wyrFKT1v2mI5OiFjWNtL/Gtq8xeA9XQPN9plkqKc1oaazT4TsBgV0kqBlsH7cWuI2l8A7dLpKGqf+fhQ0xvdCo76WcvYuphgE2Wru8xWALPx+OttRTLc2nLHX0=,iv:A7+QdWvSRVRIWf+yW9QgVXQjVY47F2Jj2FqcYbqkz+I=,tag:cU+6Kc2LC/30c2hNv2GVgw==,type:str]",
|
||||||
"sops": {
|
"sops": {
|
||||||
"kms": null,
|
"kms": null,
|
||||||
"gcp_kms": null,
|
"gcp_kms": null,
|
||||||
@@ -39,8 +39,8 @@
|
|||||||
"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBHVTQyV0o3eWtQTEsxTXNZ\ndGJjcjQwWjA2QXFubmJSdGwyRHliRmtQSW1VCmh1K2l0NnVmNUlMUjdmd09IeG5a\nTVgvOWh1RWZZZnB1RkNHMjVSMG1pVG8KLS0tIElNbk53dnJxRE90WHZSbFVYRVAr\nNjcraVhhWVdpTDZJOG9uaUVmWFF2T00KGyNISTg/g7v1+VFlCg0MjDTjbcahdSQk\nQpxdjvqQ3qtcfOS/+OO5CZYEJIVp6YybXyHJ4SSbaED22YtTJGmRNw==\n-----END AGE ENCRYPTED FILE-----\n"
|
"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBHVTQyV0o3eWtQTEsxTXNZ\ndGJjcjQwWjA2QXFubmJSdGwyRHliRmtQSW1VCmh1K2l0NnVmNUlMUjdmd09IeG5a\nTVgvOWh1RWZZZnB1RkNHMjVSMG1pVG8KLS0tIElNbk53dnJxRE90WHZSbFVYRVAr\nNjcraVhhWVdpTDZJOG9uaUVmWFF2T00KGyNISTg/g7v1+VFlCg0MjDTjbcahdSQk\nQpxdjvqQ3qtcfOS/+OO5CZYEJIVp6YybXyHJ4SSbaED22YtTJGmRNw==\n-----END AGE ENCRYPTED FILE-----\n"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"lastmodified": "2022-10-10T06:28:09Z",
|
"lastmodified": "2022-10-08T03:30:39Z",
|
||||||
"mac": "ENC[AES256_GCM,data:GnYn/2ZxpiaNiS/nXITkyETliL8HLnhP7iIlagna7xEnng5ttWTRvrzvF2P2ehUcCb7t7c0M7DPhA4rqLZlqvNNP+qi9UKkZ+Skn9e7d67hPmIrp6bOPpY+UGFmIA71xWjGUehtT7AfbHqYo26VjaYzP/OPrVT3uuAMkw8xsRo8=,iv:ISQUmG3speflSfQoU9eefYmfPw3Sq0cJPzIirk7W9rA=,tag:LkSnOJfBca/8KQggXmvYdA==,type:str]",
|
"mac": "ENC[AES256_GCM,data:0qrOFciOrb0Q0ZaaYbjKMOJwaZxsOiodPJomWVliVt7OFmxIdBorE/SGgtgQGQz6twJqeSCJi9NiEFWTfnitO0NH//jaMFiAZVGBbk3r8YrZ4UyzhQsEYCED036y0cIU31qxX2DbwNBA2R69mJqzCcTgpZORVsKOoyANp+HDhzc=,iv:B7Uopjj6jS4rIYZ0uHU6nfBMBvHUJkg6CCBZIQZNaYU=,tag:Qdi1bHKpp80XhniokLHLJw==,type:str]",
|
||||||
"pgp": null,
|
"pgp": null,
|
||||||
"unencrypted_suffix": "_unencrypted",
|
"unencrypted_suffix": "_unencrypted",
|
||||||
"version": "3.7.3"
|
"version": "3.7.3"
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"data": "ENC[AES256_GCM,data:fFb8QudY/dQNjrEtPMs7fnJxywLrSN1A4mgpZRw0Bicz5kFlr70qSSAd3jOg1YJm/x7nRLWLcEAv9Nn99bLywkLiiWaVhWmVGp6jTI3Mj0SX5lET7Xt0slcrJm6qUt6rTkH2dGueOm37m0rU7iR44bs/rWStNBbmuQRurRGo3zaxRSC0djyQ1wwbALJ1zhHQhf4=,iv:58ZLkQra5PJ6u4Xc1aztZ1ywlAmbudRSrk23MEbNv64=,tag:Nr4SNsqUytUMlM3i/nf0LA==,type:str]",
|
"data": "ENC[AES256_GCM,data:XGhxqtkmLOKQqcdmJvQ9rKdUW0qassF2glLvUpAs6uyO6WHVKvXKhAIJIsZZbd1RRlJ5PuwBvu7lKIrcVIswKvwF/MhXTCqfoB0fpmysaCpKdkLYojiSvsHQAXB9gIAnL0dVIEvZ+s7MRG5wp8s2+y18JsgS8jBM0vMFoLxVF41isocMcxO0a1wnCjAWy2s0845OOjhVSNCuVSjI5Oc1dTO9vycDHV4Y6MulFoBSlwfJdUf2nVR/FNuCxyxFX//wgRuN3cg1zkmoBblnvkccMGIzkmuByUAlqdaaug/Q,iv:9HIUqe5dTjVrHM5a9IrpYLtsDpg3Ts3mX9H8M8M572o=,tag:2EK0Zj6DTM/QmbVL+lG8wg==,type:str]",
|
||||||
"sops": {
|
"sops": {
|
||||||
"kms": null,
|
"kms": null,
|
||||||
"gcp_kms": null,
|
"gcp_kms": null,
|
||||||
@@ -39,8 +39,8 @@
|
|||||||
"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBtYlJWZ2t6WDlRdUJqU2pG\nYkE3T005bUhCcUJ0TEw0MEdDY1JFUzJjcVMwCkhCckRzcldLWTJPSEVjbHk3VE1p\nY21rRWR3cUVscmNiL29NL3M1QjZsYlUKLS0tIDJ4M3JtdGFRbUhFR2FtSGVuZk9n\nL1VjS1hnbzZwT1lQalJBbFU0SjFOWkUKUkGyPmpilSZdupNlR+cD4+HUOwyNm8WF\nu3vS7Ec4FJcjnx2t185yXEStZSVGptw/wKTxJiJ5P9by75XkAJZFmg==\n-----END AGE ENCRYPTED FILE-----\n"
|
"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBtYlJWZ2t6WDlRdUJqU2pG\nYkE3T005bUhCcUJ0TEw0MEdDY1JFUzJjcVMwCkhCckRzcldLWTJPSEVjbHk3VE1p\nY21rRWR3cUVscmNiL29NL3M1QjZsYlUKLS0tIDJ4M3JtdGFRbUhFR2FtSGVuZk9n\nL1VjS1hnbzZwT1lQalJBbFU0SjFOWkUKUkGyPmpilSZdupNlR+cD4+HUOwyNm8WF\nu3vS7Ec4FJcjnx2t185yXEStZSVGptw/wKTxJiJ5P9by75XkAJZFmg==\n-----END AGE ENCRYPTED FILE-----\n"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"lastmodified": "2022-10-10T11:53:54Z",
|
"lastmodified": "2022-10-09T02:24:20Z",
|
||||||
"mac": "ENC[AES256_GCM,data:CnF1ePN5hPJU37H0Qx7R1K9qvLDJuTv0hppv+sIjYyetVUjxVduS6e8szGPmZz4uBgglmtSIEOSc+j2MCrQ2AIkJmS9LoGH2FX1lzId4h8KdBs+aJZmngNPiO6apcVsNDKBmcQnw1gweJefpTKgJnhVbo9cw/bwRqs9hJMrQDDU=,iv:G5Hwonp9AB12xOxPFFVK1+xo5JSYOGacSbAZ2RFy5wo=,tag:p5zHaSzjZcVaIgTsBb0Ohw==,type:str]",
|
"mac": "ENC[AES256_GCM,data:AIRI5vLpVvWuxjvPerwzsBnwsSPrtazgCMPjP2be5aUcglT9e+98Dlg+jX60XjiO/1DvEepoCLd5Xnr6GHOkgRRR90YPsZT9eRttwhBavXaOF2Da7zwP5ZOg3cO0JGQsegTxJYFMmROCZppybL6EOsT2n18pc2M2HdEBt5oKP2k=,iv:ive5dqvbBQ3Ef5ycZP+l1Vuc38ylFTJhGh5+ksMCyAc=,tag:OP9EgZN2q2OKPRpOv2x7Tg==,type:str]",
|
||||||
"pgp": null,
|
"pgp": null,
|
||||||
"unencrypted_suffix": "_unencrypted",
|
"unencrypted_suffix": "_unencrypted",
|
||||||
"version": "3.7.3"
|
"version": "3.7.3"
|
||||||
|
|||||||
Reference in New Issue
Block a user