Committed after system build
diff --git a/system/configuration.nix b/system/configuration.nix
index 6873f1b..ef00888 100644
--- a/system/configuration.nix
+++ b/system/configuration.nix
@@ -10,7 +10,7 @@
./hardware-configuration.nix
../secrets/networking-configuration.nix
./packaging-configuration.nix
-# ./eduroam.nix
+ ./containerd.nix
];
# Prepare nix flakes
@@ -136,7 +136,6 @@
keybase-gui
kbfs
bluez
- polkit_gnome
];
# environment.systemPackages = [
@@ -173,7 +172,6 @@
services.gnome.gnome-keyring.enable = true;
services.i2p.enable = true;
virtualisation.docker.enable = true;
- virtualisation.containerd.enable = true;
# This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions
diff --git a/system/containerd.nix b/system/containerd.nix
new file mode 100644
index 0000000..a06aba4
--- /dev/null
+++ b/system/containerd.nix
@@ -0,0 +1,10 @@
+{ config, pkgs, lib, ... }: {
+ virtualisation.containerd.enable = true;
+
+ virtualisation.containerd.settings = {
+ version = 2;
+ grpc = {
+ uid = 1000;
+ };
+ };
+}
diff --git a/users/minion/home.nix b/users/minion/home.nix
index 89a4936..6e214e3 100644
--- a/users/minion/home.nix
+++ b/users/minion/home.nix
@@ -2,7 +2,6 @@
let
username = "minion";
homedir = "/home/${username}";
- confdir = "${homedir}/Nix/home";
in {
# Home Manager needs a bit of information about you and the
# paths it should manage.
@@ -22,7 +21,7 @@
pinentryFlavor = "qt";
};
- nixpkgs.overlays = [ (import "${confdir}/overlays/anytype.nix") ];
+ nixpkgs.overlays = [ (import ./overlays/anytype.nix) ];
nixpkgs.config.packageOverrides = pkgs: {
nur = import (builtins.fetchTarball {
diff --git a/users/minion/overlays/anytype.nix b/users/minion/overlays/anytype.nix
new file mode 100644
index 0000000..06e4db2
--- /dev/null
+++ b/users/minion/overlays/anytype.nix
@@ -0,0 +1,29 @@
+final: prev: let
+ build = "53899467";
+ sha = "sha256-53DyT8tunk0s1VGrlj6qQLOKNPN4Haqdyd8ozPi5z8w=";
+
+ pname = "anytype";
+ name = "${pname}-${build}";
+
+ src = final.fetchurl {
+ url = "https://download.anytype.io/?action=download&key=desktop&id=${build}";
+ sha256 = sha;
+ name = "AnyType-${build}.AppImage";
+ };
+
+ appimageContents = final.appimageTools.extractType2 { inherit name src; };
+in {
+ anytype = prev.anytype.overrideAttrs (old: rec {
+ version = build;
+ inherit name src;
+
+ extraInstallCommands = ''
+ mv $out/bin/${name} $out/bin/${pname}
+ install -m 444 -D ${appimageContents}/anytype2.desktop -t $out/share/applications
+ substituteInPlace $out/share/applications/anytype2.desktop \
+ --replace 'Exec=AppRun' 'Exec=${pname}'
+ install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/0x0/apps/anytype2.png \
+ $out/share/icons/hicolor/512x512/apps/anytype2.png
+ '';
+ });
+}