{ [ u, U, udiaeresis, Udiaeresis ] };
};
'';
-in
-{
- environment.systemPackages = [ pkgs.xorg.xkbcomp ];
- services.xserver.xkb.extraLayouts.dashie = {
+in {
+ environment.systemPackages = mkDashDefault [pkgs.xorg.xkbcomp];
+ services.xserver.xkb.extraLayouts.enIntUmlaut = {
description = "US layout with 'umlaut'";
- languages = [ "eng" ];
+ languages = ["eng"];
symbolsFile = "${layout}";
};
}
diff --git a/docs/default.nix b/docs/default.nix
index a5a5f8d..1fd8a1e 100644
--- a/docs/default.nix
+++ b/docs/default.nix
@@ -1,12 +1,11 @@
# with friendly help by stylix: https://github.com/danth/stylix/blob/master/docs/default.nix
{
pkgs,
- build_systems,
+ buildSystems,
lib,
...
-}:
-let
- makeOptionsDoc = configuration: pkgs.nixosOptionsDoc { options = configuration; };
+}: let
+ makeOptionsDoc = configuration: pkgs.nixosOptionsDoc {options = configuration;};
generateDocs = obj: ''
touch src/${obj.fst}.md
sed '/*Declared by:*/,/^$/d' <${obj.snd.optionsCommonMark} >> src/${obj.fst}.md
@@ -14,29 +13,49 @@ let
summaryAppend = name: ''
echo "- [${name}](${name}.md)" >> src/SUMMARY.md
'';
- system = (build_systems ../example/.)."example".options;
- makeOptionsDocPrograms = name: pkgs.nixosOptionsDoc { options = system.mods.${name}; };
+ system = (buildSystems {root = ../example/.;})."example".options;
+ makeOptionsDocPrograms = names: pkgs.nixosOptionsDoc {options = lib.attrByPath (lib.splitString "." names) null system.mods;};
conf = makeOptionsDoc system.conf;
- paths = builtins.readDir ../modules/programs;
- names = lib.lists.remove "default" (
- map (name: lib.strings.removeSuffix ".nix" name) (lib.attrsets.mapAttrsToList (name: _: name) paths)
+ basePath = ../modules/programs;
+ pathToAttrs = path:
+ lib.attrsets.mapAttrsToList (
+ name: meta: {
+ inherit name;
+ inherit meta;
+ }
+ )
+ (builtins.readDir path);
+ pathToStrings = path: prefix: let
+ mapFn = attrs:
+ if attrs.meta == "directory"
+ then pathToStrings "${basePath}/${attrs.name}" attrs.name
+ else if prefix != ""
+ then "${prefix}.${attrs.name}"
+ else attrs.name;
+ in
+ map
+ mapFn
+ (pathToAttrs path);
+ filteredNames = builtins.filter (names: !(lib.strings.hasInfix "default" names)) (
+ map (name: lib.strings.removeSuffix ".nix" name) (lib.lists.flatten (pathToStrings basePath ""))
);
- mods = map makeOptionsDocPrograms names;
- docs = lib.strings.concatLines (map generateDocs (lib.lists.zipLists names mods));
- summary = lib.strings.concatStringsSep " " (map summaryAppend names);
+ deduplicatedNames = map (name: lib.strings.splitString "." name |> lib.lists.unique |> lib.strings.concatStringsSep ".") filteredNames;
+ mods = map makeOptionsDocPrograms deduplicatedNames;
+ docs = lib.strings.concatLines (map generateDocs (lib.lists.zipLists deduplicatedNames mods));
+ summary = lib.strings.concatStringsSep " " (map summaryAppend deduplicatedNames);
in
-pkgs.stdenvNoCC.mkDerivation {
- name = "dashNix-book";
- src = ./.;
+ pkgs.stdenvNoCC.mkDerivation {
+ name = "dashNix-book";
+ src = ./.;
- patchPhase = ''
- sed '/*Declared by:*/,/^$/d' <${conf.optionsCommonMark} >> src/conf.md
- ${docs}
- echo "[README](README.md)\n # Options\n - [Base Config](conf.md)" >> src/SUMMARY.md
- ${summary}
- '';
+ patchPhase = ''
+ sed '/*Declared by:*/,/^$/d' <${conf.optionsCommonMark} >> src/conf.md
+ ${docs}
+ echo "[README](README.md)\n # Options\n - [Base Config](conf.md)" >> src/SUMMARY.md
+ ${summary}
+ '';
- buildPhase = ''
- ${pkgs.mdbook}/bin/mdbook build --dest-dir $out
- '';
-}
+ buildPhase = ''
+ ${pkgs.mdbook}/bin/mdbook build --dest-dir $out
+ '';
+ }
diff --git a/docs/src/README.md b/docs/src/README.md
index 2caf918..3658e00 100644
--- a/docs/src/README.md
+++ b/docs/src/README.md
@@ -1,180 +1,329 @@
-```
-██████ █████ ███████ ██ ██ ███ ██ ██ ██ ██
-██ ██ ██ ██ ██ ██ ██ ████ ██ ██ ██ ██
-██ ██ ███████ ███████ ███████ ██ ██ ██ ██ ███
-██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██
-██████ ██ ██ ███████ ██ ██ ██ ████ ██ ██ ██
-```
-
-A very opinionated (technically only for me) configuration that allows easy adding and removing of systems alongside custom configurations for each system.
-
-# Usage
-
-This flake is intended to be used as an input to your own NixOS configuration:
-
-```nix
-dashNix = {
- url = "github:DashieTM/DashNix";
- inputs = {
- # ensure these are here to update the packages on your own
- nixpkgs.follows = "nixpkgs";
- stable.follows = "stable";
- };
-};
-```
-
-You can then configure your systems in your flake outputs with a provided library command:
-
-```nix
-nixosConfigurations = (inputs.dashNix.dashNixLib.build_systems ./.);
-```
-
-The paremeter specifies where your hosts directory will be placed, in said directory you can then create a directory for each system.
-Note, the name of the systems directory is also its hostname.
-
-In order for your configuration to work, you are required to at least provide a single config file with a further config file being optional for custom configuration.
-The hardware.nix specifies additional NixOS configuration, while home.nix specifies additional home-manager configuration. (both optional)
-
-|- flake.nix\
-|- flake.lock\
-|- hosts/\
-|--- system1/\
-|------ configuration.nix (required)\
-|------ hardware.nix (optional)\
-|------ home.nix (optional)\
-|--- system2/\
-|------ configuration.nix (required)\
-|------ hardware.nix (optional)\
-|------ home.nix (optional)\
-|--- system3/\
-|------ configuration.nix (required)\
-|------ hardware.nix (optional)\
-|------ home.nix (optional)
-
-Here is a minimal required configuration.nix (the TODOs mention a required change):
-
-```nix
-{config, ...}: {
- # variables for system
- # TODO important changes
- conf = {
- # change this to your monitor and your pc name
- # should be something like DP-1
- monitor = "YOURMONITOR";
- # your username
- username = "YOURNAME";
- # TODO only needed when you use intel -> amd is default
- # cpu = "intel";
- locale = "something.UTF-8";
- timezone = "CONTINENT/CITY";
- };
- # modules
- mods = {
- # default disk config has root home boot and swap partition, overwrite if you want something different
- drives = {
- defaultDrives.enable = false;
- extraDrives = [
- {
- name = "boot";
- drive = {
- device = "/dev/disk/by-label/BOOT";
- fsType = "vfat";
- options = [ "rw" "fmask=0022" "dmask=0022" "noatime" ];
- };
- }
- {
- name = "";
- drive = {
- device = "/dev/disk/by-label/ROOT";
- fsType = "ext4";
- options = [ "noatime" "nodiratime" "discard" ];
- };
- }
- ];
- };
- sops.enable = false;
- nextcloud.enable = false;
- hyprland.monitor = [
- # default
- # TODO change this to your resolution
- "${config.conf.monitor},1920x1080@144,0x0,1"
- # all others
- ",highrr,auto,1"
- ];
- # or amd, whatever you have
- gpu.nvidia.enable = true;
- kde_connect.enable = true;
- # TODO change this to your main resolution
- # -> this will be your login manager
- greetd = { resolution = "3440x1440@180"; };
- };
-}
-```
-
-## First Login
-
-After logging in the first time, your password will be set to "firstlogin", please change this to whatever you like.
-
-## Nixos and Home-manager Modules
-
-You can add additional modules or remove all of them by overriding parameters to the build_systems command:
-
-```nix
-nixosConfigurations =
- let
- additionalMods = {
- nixos = [
- # your modules
- ]; home = [
- # your modules
- ];
- }
- # passing this parameter will override the existing modules
- mods = {
- nixos = [];
- home = [];
- }
- in
- (inputs.dashNix.dashNixLib.build_systems [
- "system1"
- ] ./. mods additionalMods);
-```
-
-# Modules
-
-This configuration features several modules that can be used as preconfigured "recipies".
-These modules attempt to combine the home-manager and nixos packages/options to one single configuration file for each new system.
-For package lists, please check the individual modules, as the lists can be long.
-
-- base packages : A list of system packages to be installed by default
-- home packages : A list of home packages to be installed by default
-- media packages : A list of media packages to be installed by default
-- coding packages : A list of coding packages to be installed by default
-- acpid : Enables the acpid daemon
-- bluetooth : Configures/enables bluetooth and installs tools for bluetooth
-- drives : A drive configuration module
-- flatpak : Installs and enables declarative flatpak
-- gnome_services : Gnome services for minimal enviroments -> Window managers etc
-- gpu : GPU settings (AMD)
-- greetd : Enables and configures the greetd/regreet login manager with Hyprland
-- kde_connect : Enables KDE connect and opens its ports
-- layout : Modules to configure keyboard layout system wide
-- piper : Installs and enables piper alongside its daemon
-- printing : Enables and configures printing services
-- virtualbox : Enables and configures virtualbox
-- xone : Installs the xone driver
-- starship : Configures the starship prompt
-- keepassxc : Configures keepassxc
-- gaming : Configures gaming related features (launchers, gamemode)
-- stylix : Configures system themes, can also be applied to dashvim if used.
-- git : Git key and config module
-- nextcloud : Handles synchronization via nextcloud cmd. (requires config.sops.secrets.nextcloud)
-- firefox: Enables and configures firefox (extensions and settings)
-- Hyprland: Installs and configures Hyprland with various additional packages
-- yazi: Installs yazi and sets custom keybinds
-- teams: For the poor souls that have to use this....
-- sops: Enables sops-nix
-- fish: Enables and configures fish shell
-- kitty: Enables and configures kitty terminal
-- oxi: My own programs, can be selectively disabled, or as a whole
-- scripts: Various preconfigured scripts with the ability to add more
+
+
+
+
+
+
+An opinionated flake to bootstrap NixOS systems with default configurations for various programs and services from both NixOS and HomeManager which can be enabled, disabled, configured or replaced at will.
+
+# Usage
+
+This flake is intended to be used as an input to your own NixOS configuration:
+
+```nix
+dashNix = {
+ url = "github:Xetibo/DashNix";
+ inputs = {
+ # ensure these are here to update the packages on your own
+ nixpkgs.follows = "nixpkgs";
+ stable.follows = "stable";
+ };
+};
+```
+
+You can then configure your systems in your flake outputs with a provided library command:
+
+Please note that overriding inputs will invalidate the cache configuration, this means you will have to add this manually:
+
+```nix
+ builders-use-substitutes = true;
+
+ extra-substituters = [
+ "https://hyprland.cachix.org"
+ "https://anyrun.cachix.org"
+ "https://cache.garnix.io"
+ "https://oxipaste.cachix.org"
+ "https://oxinoti.cachix.org"
+ "https://oxishut.cachix.org"
+ "https://oxidash.cachix.org"
+ "https://oxicalc.cachix.org"
+ "https://hyprdock.cachix.org"
+ "https://reset.cachix.org"
+ "https://dashvim.cachix.org"
+ ];
+
+ extra-trusted-public-keys = [
+ "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
+ "anyrun.cachix.org-1:pqBobmOjI7nKlsUMV25u9QHa9btJK65/C8vnO3p346s="
+ "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
+ "oxipaste.cachix.org-1:n/oA3N3Z+LJP7eIWOwuoLd9QnPyZXqFjLgkahjsdDGc="
+ "oxinoti.cachix.org-1:dvSoJl2Pjo5HMaNngdBbSaixK9BSf2N8gzjP2MdGvfc="
+ "oxishut.cachix.org-1:axyAGF3XMh1IyMAW4UMbQCdMNovDH0KH6hqLLRJH8jU="
+ "oxidash.cachix.org-1:5K2FNHp7AS8VF7LmQkJAUG/dm6UHCz4ngshBVbjFX30="
+ "oxicalc.cachix.org-1:qF3krFc20tgSmtR/kt6Ku/T5QiG824z79qU5eRCSBTQ="
+ "hyprdock.cachix.org-1:HaROK3fBvFWIMHZau3Vq1TLwUoJE8yRbGLk0lEGzv3Y="
+ "reset.cachix.org-1:LfpnUUdG7QM/eOkN7NtA+3+4Ar/UBeYB+3WH+GjP9Xo="
+ "dashvim.cachix.org-1:uLRdxp1WOWHnsZZtu3SwUWZRsvC7SXo0Gyk3tIefuL0="
+ ];
+```
+
+```nix
+nixosConfigurations = inputs.dashNix.dashNixLib.buildSystems { root = ./.; };
+```
+
+This command will build each system that is placed within the hosts/ directory.
+In this directory create one directory for each system you want to configure with DashNix.
+This will automatically pick up the hostname for the system and look for 3 different files that are explained below.
+(Optionally, you can also change the parameter root (./.) to define a different starting directory than hosts/)
+
+In order for your configuration to work, you are required to at least provide a single config file with a further config file being optional for custom configuration.
+The hardware.nix specifies additional NixOS configuration, while home.nix specifies additional home-manager configuration. (both optional)
+
+|- flake.nix\
+|- flake.lock\
+|- hosts/\
+|--- system1/\
+|------ configuration.nix (required)\
+|------ hardware.nix (optional)\
+|------ home.nix (optional)\
+|--- system2/\
+|------ configuration.nix (required)\
+|------ hardware.nix (optional)\
+|------ home.nix (optional)\
+|--- system3/\
+|------ configuration.nix (required)\
+|------ hardware.nix (optional)\
+|------ home.nix (optional)
+
+Here is a minimal required configuration.nix (the TODOs mention a required change):
+
+```nix
+{config, ...}: {
+ # TODO denote important changes
+
+ # variables for system
+ conf = {
+ # TODO your username
+ username = "YOURNAME";
+ # TODO only needed when you use intel -> amd is default
+ # cpu = "intel";
+ # TODO your xkb layout
+ locale = "something.UTF-8";
+ # TODO your timezone
+ timezone = "CONTINENT/CITY";
+ };
+
+ # modules
+ mods = {
+ # default disk config has root home boot and swap partition, overwrite if you want something different
+ sops.enable = false;
+ nextcloud.enable = false;
+ wm.monitors = [
+ # Example
+ # {
+ # name = "DP-1";
+ # resolutionX = 3440;
+ # resolutionY = 1440;
+ # refreshrate = 180;
+ # positionX = 2560;
+ # positionY = 0;
+ # scale = 1;
+ # transform = "0";
+ # vrr = false;
+ # }
+ ];
+ gpu.nvidia.enable = true;
+ kdeConnect.enable = true;
+ # login manager:
+ # default is greetd
+ # greetd = { };
+ # sddm = { };
+ # gdm = { };
+ drives = {
+ # default assumes ROOT, BOOT, HOME and SWAP labaled drives exist
+ # for an example without HOME see below
+ # defaultDrives.enable = false;
+ # extraDrives = [
+ # {
+ # name = "boot";
+ # drive = {
+ # device = "/dev/disk/by-label/BOOT";
+ # fsType = "vfat";
+ # options = [ "rw" "fmask=0022" "dmask=0022" "noatime" ];
+ # };
+ # }
+ # {
+ # name = "";
+ # drive = {
+ # device = "/dev/disk/by-label/ROOT";
+ # fsType = "ext4";
+ # options = [ "noatime" "nodiratime" "discard" ];
+ # };
+ # }
+ # ];
+ # You can also use disko to format your disks on installation.
+ # Please refer to the Documentation about the drives module for an example.
+ };
+ };
+}
+```
+
+## First Login
+
+After logging in the first time, your password will be set to "firstlogin", please change this to whatever you like.
+
+## Configuring pkgs
+
+While DashNix offers a default pkgs config, you may want to permit an unsecure packages,
+add additional modules/inputs, or add an overlay to them.
+You can configure both stable and unstable pkgs the following way:
+
+Please note that modules and inputs are merged together to ensure functionality.
+
+```nix
+currentSystem = "x86_64-linux";
+permittedPackages = [
+ "some package"
+];
+config = {
+ system = currentSystem;
+ config = {
+ allowUnfree = true;
+ permittedInsecurePackages = permittedPackages;
+ };
+ inputs = {
+ # Some inputs
+ }
+ mods = {
+ home = [
+ # Some home manager module
+ ];
+ nixos = [
+ # Some nixos module
+ ];
+}
+};
+unstableBundle = {
+ pkgs = inputs.unstable;
+ inherit config mods;
+};
+inputs.dashNix.dashNixLib.buildSystems {
+ root = ./.;
+ inherit unstableBundle;
+}
+```
+
+With this you could also change your input to something different should you wish to do so.
+Note that overriding inputs via the flake still works,
+this way however ensures you can also configure the inputs.
+
+## Stable/Unstable
+
+Sometimes you want to differentiate between systems that are stable and unstable, e.g. for servers and desktops/laptops.
+This can be done with the overridePkgs flag for the lib function:
+
+(overridePkgs simply inverts the default bundle that is used for the nix standard library as well as NixOS itself)
+
+```nix
+nixosConfigurations =
+ inputs.dashNix.dashNixLib.buildSystems {
+ root = ./stable;
+ inherit stableBundle;
+ overridePkgs = true;
+ }
+ // inputs.dashNix.dashNixLib.buildSystems {
+ inherit unstableBundle;
+ root = ./unstable;
+ };
+```
+
+You can now place your systems in the respective directories.
+Keep in mind that the hosts directory will still need to exist in each variant.
+E.g. stable/hosts/yourserver and unstable/hosts/yourdesktop
+
+# Installation via ISO
+
+You can find a custom ISO in the releases: [Link](https://github.com/Xetibo/DashNix/releases).
+With this, you will receive the example config in /iso/example alongside the gnome desktop environment,
+as well as a few tools like gnome-disks, Neovim, Vscodium, a browser etc.
+
+Alternatively, you can use whatever NixOS installer and just install your config from there, just make sure to set the drive configuration before.
+
+## Commands
+
+First, copy the read-only config from /iso/example-config to a location of your choice.
+
+```sh
+cp /iso/example-config ~/config -r
+```
+
+Then configure as you please and choose a command below depending on your disk installation variant.
+
+Installation via manual configuration:
+
+```sh
+sudo nixos-install --flake # --root --option experimental-features "nix-command flakes pipe-operators"
+#example
+#nixos-install --flake ~/config#globi --root /mnt --option experimental-features "nix-command flakes pipe-operators"
+```
+
+Installation via disko:
+
+```sh
+sudo disko-install --flake # --disk --option experimental-features "nix-command flakes pipe-operators"
+#example
+#disko-install -- --flake ~/config#globi --disk main /dev/nvme0n1 --option experimental-features "nix-command flakes pipe-operators"
+```
+
+# Installation via flake
+
+If you already have nix installed, you can instead just copy the default config onto your system and install DashNix with it.
+To create the example config for a base to start with, you can just run this flake with the mkFlake command:
+
+```sh
+nix run github:Xetibo/DashNix#mkFlake
+```
+
+This command will put the default configuration into $HOME/gits/nixos
+
+# Modules
+
+This configuration features several modules that can be used as preconfigured "recipies".
+These modules attempt to combine the home-manager and nixos packages/options to one single configuration file for each new system.
+For package lists, please check the individual modules, as the lists can be long.
+
+- Hyprland: Installs and configures Hyprland with various additional packages
+- Niri: Installs and configures Niri with various additional packages
+- acpid : Enables the acpid daemon
+- base packages : A list of system packages to be installed by default
+- bluetooth : Configures/enables bluetooth and installs tools for bluetooth
+- coding packages : A list of coding packages to be installed by default
+- drives : A drive configuration module
+- firefox: Enables and configures firefox (extensions and settings)
+- fish: Enables and configures fish shell
+- gaming : Configures gaming related features (launchers, gamemode)
+- git : Git key and config module
+- gnome_services : Gnome services for minimal enviroments -> Window managers etc
+- gpu : GPU settings (AMD)
+- greetd : Enables and configures the greetd/regreet login manager with Hyprland
+- home packages : A list of home packages to be installed by default
+- kde_connect : Enables KDE connect and opens its ports
+- keepassxc : Configures keepassxc
+- kitty: Enables and configures kitty terminal
+- layout : Modules to configure keyboard layout system wide
+- media packages : A list of media packages to be installed by default
+- mime: Mime type configuration
+- nextcloud : Handles synchronization via nextcloud cmd. (requires config.sops.secrets.nextcloud)
+- oxi: My own programs, can be selectively disabled, or as a whole
+- piper : Installs and enables piper alongside its daemon
+- plymouth: enable or disable plymouth
+- printing : Enables and configures printing services
+- scripts: Various preconfigured scripts with the ability to add more
+- sops: Enables sops-nix
+- starship : Configures the starship prompt
+- stylix : Configures system themes, can also be applied to dashvim if used.
+- teams: For the poor souls that have to use this....
+- virtualbox : Enables and configures virtualbox
+- xkb: Keyboard layout configuration
+- xone : Installs the xone driver
+- yazi: Installs yazi and sets custom keybinds
+
+# Credits
+
+- [Fufexan](https://github.com/fufexan) for the xdg-mime config:
+- [Catppuccin](https://github.com/catppuccin) for base16 colors and zen-browser css
+- [Danth](https://github.com/danth) for providing a base for the nix docs
+- [chermnyx](https://github.com/chermnyx) for providing a base for zen configuration
+- [voronind-com](https://github.com/voronind-com) for providing the darkreader configuration
+- [Nix-Artwork](https://github.com/NixOS/nixos-artwork/tree/master/logo) for the Nix/NixOS logo (Tim Cuthbertson (@timbertson))
+- [xddxdd](https://github.com/xddxdd) for the CachyOS-Kernel flake
diff --git a/docs/src/logo.svg b/docs/src/logo.svg
new file mode 100644
index 0000000..08baa43
--- /dev/null
+++ b/docs/src/logo.svg
@@ -0,0 +1,238 @@
+
+
+
+DashNix DashNix DashNix DashNix " ];
+ on = "";
+ run = "backspace";
+ desc = "Delete the character before the cursor";
+ }
+ {
+ on = [""];
run = "escape";
desc = "Exit visual mode clear selected or cancel search";
}
{
- on = [ "q" ];
+ on = ["q"];
run = "quit";
desc = "Exit the process";
}
{
- on = [ "Q" ];
+ on = ["Q"];
run = "quit --no-cwd-file";
desc = "Exit the process without writing cwd-file";
}
{
- on = [ "" ];
+ on = [""];
run = "close";
desc = "Close the current tab or quit if it is last tab";
}
{
- on = [ "" ];
+ on = [""];
run = "suspend";
desc = "Suspend the process";
}
# Navigation
{
- on = [ "l" ];
+ on = ["l"];
run = "arrow -1";
desc = "Move cursor up";
}
{
- on = [ "k" ];
+ on = ["k"];
run = "arrow 1";
desc = "Move cursor down";
}
{
- on = [ "L" ];
+ on = ["L"];
run = "arrow -5";
desc = "Move cursor up 5 lines";
}
{
- on = [ "K" ];
+ on = ["K"];
run = "arrow 5";
desc = "Move cursor down 5 lines";
}
{
- on = [ "" ];
+ on = [""];
run = "arrow -50%";
desc = "Move cursor up half page";
}
{
- on = [ "" ];
+ on = [""];
run = "arrow 50%";
desc = "Move cursor down half page";
}
{
- on = [ "" ];
+ on = [""];
run = "arrow -100%";
desc = "Move cursor up one page";
}
{
- on = [ "" ];
+ on = [""];
run = "arrow 100%";
desc = "Move cursor down one page";
}
{
- on = [ "j" ];
+ on = ["j"];
run = "leave";
desc = "Go back to the parent directory";
}
{
- on = [ ";" ];
+ on = [";"];
run = "enter";
desc = "Enter the child directory";
}
{
- on = [ "J" ];
+ on = ["J"];
run = "back";
desc = "Go back to the previous directory";
}
{
- on = [ "P" ];
+ on = ["P"];
run = "forward";
desc = "Go forward to the next directory";
}
{
- on = [ "" ];
+ on = [""];
run = "peek -5";
desc = "Peek up 5 units in the preview";
}
{
- on = [ "" ];
+ on = [""];
run = "peek 5";
desc = "Peek down 5 units in the preview";
}
{
- on = [ "" ];
+ on = [""];
run = "arrow -1";
desc = "Move cursor up";
}
{
- on = [ "" ];
+ on = [""];
run = "arrow 1";
desc = "Move cursor down";
}
{
- on = [ "" ];
+ on = [""];
run = "leave";
desc = "Go back to the parent directory";
}
{
- on = [ "" ];
+ on = [""];
run = "enter";
desc = "Enter the child directory";
}
@@ -232,116 +240,116 @@
desc = "Move cursor to the top";
}
{
- on = [ "G" ];
+ on = ["G"];
run = "arrow 99999999";
desc = "Move cursor to the bottom";
}
# Selection
{
- on = [ "v" ];
+ on = ["v"];
run = "visual_mode";
desc = "Enter visual mode (selection mode)";
}
{
- on = [ "V" ];
+ on = ["V"];
run = "visual_mode --unset";
desc = "Enter visual mode (unset mode)";
}
{
- on = [ "" ];
+ on = [""];
run = "select_all --state=true";
desc = "Select all files";
}
{
- on = [ "" ];
+ on = [""];
run = "select_all --state=none";
desc = "Inverse selection of all files";
}
# Operation
{
- on = [ "o" ];
+ on = ["o"];
run = "open";
desc = "Open the selected files";
}
{
- on = [ "O" ];
+ on = ["O"];
run = "open --interactive";
desc = "Open the selected files interactively";
}
{
- on = [ "" ];
+ on = [""];
run = "open";
desc = "Open the selected files";
}
{
- on = [ "" ];
+ on = [""];
run = "open --interactive";
desc = "Open the selected files interactively";
} # It's cool if you're using a terminal that supports CSI u
{
- on = [ "y" ];
+ on = ["y"];
run = "yank";
desc = "Copy the selected files";
}
{
- on = [ "x" ];
+ on = ["x"];
run = "yank --cut";
desc = "Cut the selected files";
}
{
- on = [ "p" ];
+ on = ["p"];
run = "paste";
desc = "Paste the files";
}
{
- on = [ "P" ];
+ on = ["P"];
run = "paste --force";
desc = "Paste the files (overwrite if the destination exists)";
}
{
- on = [ "-" ];
+ on = ["-"];
run = "link";
desc = "Symlink the absolute path of files";
}
{
- on = [ "_" ];
+ on = ["_"];
run = "link --relative";
desc = "Symlink the relative path of files";
}
{
- on = [ "d" ];
+ on = ["d"];
run = "remove";
desc = "Move the files to the trash";
}
{
- on = [ "D" ];
+ on = ["D"];
run = "remove --permanently";
desc = "Permanently delete the files";
}
{
- on = [ "a" ];
+ on = ["a"];
run = "create";
desc = "Create a file or directory (ends with / for directories)";
}
{
- on = [ "r" ];
+ on = ["r"];
run = "rename";
desc = "Rename a file or directory";
}
{
- on = [ ";" ];
+ on = [";"];
run = "shell";
desc = "Run a shell command";
}
{
- on = [ ":" ];
+ on = [":"];
run = "shell --block";
desc = "Run a shell command (block the UI until the command finishes)";
}
{
- on = [ "." ];
+ on = ["."];
run = "hidden toggle";
desc = "Toggle the visibility of hidden files";
}
@@ -364,18 +372,18 @@
desc = "Search files by content using ripgrep";
}
{
- on = [ "" ];
+ on = [""];
run = "search none";
desc = "Cancel the ongoing search";
}
{
- on = [ "z" ];
- run = "jump zoxide";
+ on = ["Z"];
+ run = "plugin zoxide";
desc = "Jump to a directory using zoxide";
}
{
- on = [ "Z" ];
- run = "jump fzf";
+ on = ["z"];
+ run = "plugin fzf";
desc = "Jump to a directory or reveal a file using fzf";
}
@@ -415,19 +423,19 @@
# Find
{
- on = [ "/" ];
+ on = ["/"];
run = "find --smart";
}
{
- on = [ "?" ];
+ on = ["?"];
run = "find --previous --smart";
}
{
- on = [ "n" ];
+ on = ["n"];
run = "find_arrow";
}
{
- on = [ "N" ];
+ on = ["N"];
run = "find_arrow --previous";
}
@@ -515,82 +523,82 @@
# Tabs
{
- on = [ "t" ];
+ on = ["t"];
run = "tab_create --current";
desc = "Create a new tab using the current path";
}
{
- on = [ "1" ];
+ on = ["1"];
run = "tab_switch 0";
desc = "Switch to the first tab";
}
{
- on = [ "2" ];
+ on = ["2"];
run = "tab_switch 1";
desc = "Switch to the second tab";
}
{
- on = [ "3" ];
+ on = ["3"];
run = "tab_switch 2";
desc = "Switch to the third tab";
}
{
- on = [ "4" ];
+ on = ["4"];
run = "tab_switch 3";
desc = "Switch to the fourth tab";
}
{
- on = [ "5" ];
+ on = ["5"];
run = "tab_switch 4";
desc = "Switch to the fifth tab";
}
{
- on = [ "6" ];
+ on = ["6"];
run = "tab_switch 5";
desc = "Switch to the sixth tab";
}
{
- on = [ "7" ];
+ on = ["7"];
run = "tab_switch 6";
desc = "Switch to the seventh tab";
}
{
- on = [ "8" ];
+ on = ["8"];
run = "tab_switch 7";
desc = "Switch to the eighth tab";
}
{
- on = [ "9" ];
+ on = ["9"];
run = "tab_switch 8";
desc = "Switch to the ninth tab";
}
{
- on = [ "[" ];
+ on = ["["];
run = "tab_switch -1 --relative";
desc = "Switch to the previous tab";
}
{
- on = [ "]" ];
+ on = ["]"];
run = "tab_switch 1 --relative";
desc = "Switch to the next tab";
}
{
- on = [ "{" ];
+ on = ["{"];
run = "tab_swap -1";
desc = "Swap the current tab with the previous tab";
}
{
- on = [ "}" ];
+ on = ["}"];
run = "tab_swap 1";
desc = "Swap the current tab with the next tab";
}
# Tasks
{
- on = [ "w" ];
+ on = ["w"];
run = "tasks_show";
desc = "Show the tasks manager";
}
@@ -639,7 +647,7 @@
# Help
{
- on = [ "~" ];
+ on = ["~"];
run = "help";
desc = "Open help";
}
@@ -647,56 +655,56 @@
tasks.keymap = [
{
- on = [ "" ];
+ on = [""];
run = "close";
desc = "Hide the task manager";
}
{
- on = [ "" ];
+ on = [""];
run = "close";
desc = "Hide the task manager";
}
{
- on = [ "w" ];
+ on = ["w"];
run = "close";
desc = "Hide the task manager";
}
{
- on = [ "k" ];
+ on = ["k"];
run = "arrow -1";
desc = "Move cursor up";
}
{
- on = [ "j" ];
+ on = ["j"];
run = "arrow 1";
desc = "Move cursor down";
}
{
- on = [ "" ];
+ on = [""];
run = "arrow -1";
desc = "Move cursor up";
}
{
- on = [ "" ];
+ on = [""];
run = "arrow 1";
desc = "Move cursor down";
}
{
- on = [ "" ];
+ on = [""];
run = "inspect";
desc = "Inspect the task";
}
{
- on = [ "x" ];
+ on = ["x"];
run = "cancel";
desc = "Cancel the task";
}
{
- on = [ "~" ];
+ on = ["~"];
run = "help";
desc = "Open help";
}
@@ -704,56 +712,56 @@
select.keymap = [
{
- on = [ "" ];
+ on = [""];
run = "close";
desc = "Cancel selection";
}
{
- on = [ "" ];
+ on = [""];
run = "close";
desc = "Cancel selection";
}
{
- on = [ "" ];
+ on = [""];
run = "close --submit";
desc = "Submit the selection";
}
{
- on = [ "k" ];
+ on = ["k"];
run = "arrow -1";
desc = "Move cursor up";
}
{
- on = [ "j" ];
+ on = ["j"];
run = "arrow 1";
desc = "Move cursor down";
}
{
- on = [ "K" ];
+ on = ["K"];
run = "arrow -5";
desc = "Move cursor up 5 lines";
}
{
- on = [ "J" ];
+ on = ["J"];
run = "arrow 5";
desc = "Move cursor down 5 lines";
}
{
- on = [ "" ];
+ on = [""];
run = "arrow -1";
desc = "Move cursor up";
}
{
- on = [ "" ];
+ on = [""];
run = "arrow 1";
desc = "Move cursor down";
}
{
- on = [ "~" ];
+ on = ["~"];
run = "help";
desc = "Open help";
}
@@ -761,39 +769,44 @@
input.keymap = [
{
- on = [ "" ];
+ on = "";
+ run = "backspace";
+ desc = "Delete the character before the cursor";
+ }
+ {
+ on = [""];
run = "close";
desc = "Cancel input";
}
{
- on = [ "" ];
+ on = [""];
run = "close --submit";
desc = "Submit the input";
}
{
- on = [ "" ];
+ on = [""];
run = "escape";
desc = "Go back the normal mode or cancel input";
}
# Mode
{
- on = [ "i" ];
+ on = ["i"];
run = "insert";
desc = "Enter insert mode";
}
{
- on = [ "a" ];
+ on = ["a"];
run = "insert --append";
desc = "Enter append mode";
}
{
- on = [ "v" ];
+ on = ["v"];
run = "visual";
desc = "Enter visual mode";
}
{
- on = [ "V" ];
+ on = ["V"];
run = [
"move -999"
"visual"
@@ -804,28 +817,28 @@
# Navigation
{
- on = [ "h" ];
+ on = ["h"];
run = "move -1";
desc = "Move cursor left";
}
{
- on = [ "l" ];
+ on = ["l"];
run = "move 1";
desc = "Move cursor right";
}
{
- on = [ "0" ];
+ on = ["0"];
run = "move -999";
desc = "Move to the BOL";
}
{
- on = [ "$" ];
+ on = ["$"];
run = "move 999";
desc = "Move to the EOL";
}
{
- on = [ "I" ];
+ on = ["I"];
run = [
"move -999"
"insert"
@@ -833,7 +846,7 @@
desc = "Move to the BOL and enter insert mode";
}
{
- on = [ "A" ];
+ on = ["A"];
run = [
"move 999"
"insert --append"
@@ -842,40 +855,40 @@
}
{
- on = [ "" ];
+ on = [""];
run = "move -1";
desc = "Move cursor left";
}
{
- on = [ "" ];
+ on = [""];
run = "move 1";
desc = "Move cursor right";
}
{
- on = [ "b" ];
+ on = ["b"];
run = "backward";
desc = "Move to the beginning of the previous word";
}
{
- on = [ "w" ];
+ on = ["w"];
run = "forward";
desc = "Move to the beginning of the next word";
}
{
- on = [ "e" ];
+ on = ["e"];
run = "forward --end-of-word";
desc = "Move to the end of the next word";
}
# Deletion
{
- on = [ "d" ];
+ on = ["d"];
run = "delete --cut";
desc = "Cut the selected characters";
}
{
- on = [ "D" ];
+ on = ["D"];
run = [
"delete --cut"
"move 999"
@@ -883,12 +896,12 @@
desc = "Cut until the EOL";
}
{
- on = [ "c" ];
+ on = ["c"];
run = "delete --cut --insert";
desc = "Cut the selected characters and enter insert mode";
}
{
- on = [ "C" ];
+ on = ["C"];
run = [
"delete --cut --insert"
"move 999"
@@ -896,7 +909,7 @@
desc = "Cut until the EOL and enter insert mode";
}
{
- on = [ "x" ];
+ on = ["x"];
run = [
"delete --cut"
"move 1 --in-operating"
@@ -906,36 +919,36 @@
# Yank/Paste
{
- on = [ "y" ];
+ on = ["y"];
run = "yank";
desc = "Copy the selected characters";
}
{
- on = [ "p" ];
+ on = ["p"];
run = "paste";
desc = "Paste the copied characters after the cursor";
}
{
- on = [ "P" ];
+ on = ["P"];
run = "paste --before";
desc = "Paste the copied characters before the cursor";
}
# Undo/Redo
{
- on = [ "u" ];
+ on = ["u"];
run = "undo";
desc = "Undo the last operation";
}
{
- on = [ "" ];
+ on = [""];
run = "redo";
desc = "Redo the last operation";
}
# Help
{
- on = [ "~" ];
+ on = ["~"];
run = "help";
desc = "Open help";
}
@@ -943,58 +956,58 @@
help.keymap = [
{
- on = [ "" ];
+ on = [""];
run = "escape";
desc = "Clear the filter or hide the help";
}
{
- on = [ "q" ];
+ on = ["q"];
run = "close";
desc = "Exit the process";
}
{
- on = [ "" ];
+ on = [""];
run = "close";
desc = "Hide the help";
}
# Navigation
{
- on = [ "k" ];
+ on = ["k"];
run = "arrow -1";
desc = "Move cursor up";
}
{
- on = [ "j" ];
+ on = ["j"];
run = "arrow 1";
desc = "Move cursor down";
}
{
- on = [ "K" ];
+ on = ["K"];
run = "arrow -5";
desc = "Move cursor up 5 lines";
}
{
- on = [ "J" ];
+ on = ["J"];
run = "arrow 5";
desc = "Move cursor down 5 lines";
}
{
- on = [ "" ];
+ on = [""];
run = "arrow -1";
desc = "Move cursor up";
}
{
- on = [ "" ];
+ on = [""];
run = "arrow 1";
desc = "Move cursor down";
}
# Filtering
{
- on = [ "/" ];
+ on = ["/"];
run = "filter";
desc = "Apply a filter for the help items";
}
diff --git a/override/teams.nix b/override/teams.nix
index 4370d7a..7d4f454 100644
--- a/override/teams.nix
+++ b/override/teams.nix
@@ -9,7 +9,7 @@
stdenv.mkDerivation (final: {
pname = "teams-pwa";
name = final.pname;
- nativeBuildInputs = [ copyDesktopItems ];
+ nativeBuildInputs = [copyDesktopItems];
dontUnpack = true;
desktopItems = [
@@ -21,15 +21,15 @@ stdenv.mkDerivation (final: {
} --app=https://teams.microsoft.com";
desktopName = "Microsoft Teams PWA";
genericName = "Progressive Web App for Microsoft Teams";
- categories = [ "Network" ];
- mimeTypes = [ "x-scheme-handler/msteams" ];
+ categories = ["Network"];
+ mimeTypes = ["x-scheme-handler/msteams"];
})
];
meta = with lib; {
description = "Microsoft Teams PWA";
homepage = "https://teams.microsoft.com";
- maintainers = with maintainers; [ ners ];
+ maintainers = with maintainers; [ners];
platforms = chromium.meta.platforms;
};
})
diff --git a/patches/darkeader.patch b/patches/darkeader.patch
new file mode 100644
index 0000000..f1663df
--- /dev/null
+++ b/patches/darkeader.patch
@@ -0,0 +1,456 @@
+diff --git a/src/background/user-storage.ts b/src/background/user-storage.ts
+index 54612fb3b1f6..298e5032fc94 100644
+--- a/src/background/user-storage.ts
++++ b/src/background/user-storage.ts
+@@ -5,7 +5,7 @@ import {PromiseBarrier} from '../utils/promise-barrier';
+ import {isURLMatched} from '../utils/url';
+ import {validateSettings} from '../utils/validation';
+
+-import {readSyncStorage, readLocalStorage, writeSyncStorage, writeLocalStorage, removeSyncStorage, removeLocalStorage} from './utils/extension-api';
++import {readManagedStorage, readSyncStorage, readLocalStorage, writeSyncStorage, writeLocalStorage, removeSyncStorage, removeLocalStorage} from './utils/extension-api';
+ import {logWarn} from './utils/log';
+
+
+@@ -78,12 +78,7 @@ export default class UserStorage {
+ return settings;
+ }
+
+- private static async loadSettingsFromStorage(): Promise {
+- if (UserStorage.loadBarrier) {
+- return await UserStorage.loadBarrier.entry();
+- }
+- UserStorage.loadBarrier = new PromiseBarrier();
+-
++ private static async loadSettingsFromStorageWithoutManaged(): Promise {
+ let local = await readLocalStorage(DEFAULT_SETTINGS);
+
+ if (local.schemeVersion < 2) {
+@@ -113,10 +108,8 @@ export default class UserStorage {
+ if (local.syncSettings == null) {
+ local.syncSettings = DEFAULT_SETTINGS.syncSettings;
+ }
++
+ if (!local.syncSettings) {
+- UserStorage.migrateAutomationSettings(local);
+- UserStorage.fillDefaults(local);
+- UserStorage.loadBarrier.resolve(local);
+ return local;
+ }
+
+@@ -126,18 +119,34 @@ export default class UserStorage {
+ local.syncSettings = false;
+ UserStorage.set({syncSettings: false});
+ UserStorage.saveSyncSetting(false);
+- UserStorage.loadBarrier.resolve(local);
+ return local;
+ }
+
+ const {errors: syncCfgErrors} = validateSettings($sync);
+ syncCfgErrors.forEach((err) => logWarn(err));
++ return $sync;
++ }
++
++ private static async loadSettingsFromStorage(): Promise {
++ if (UserStorage.loadBarrier) {
++ return await UserStorage.loadBarrier.entry();
++ }
++ UserStorage.loadBarrier = new PromiseBarrier();
+
+- UserStorage.migrateAutomationSettings($sync);
+- UserStorage.fillDefaults($sync);
++ let settings = await UserStorage.loadSettingsFromStorageWithoutManaged();
+
+- UserStorage.loadBarrier.resolve($sync);
+- return $sync;
++ const managed = await readManagedStorage(settings);
++ const {errors: managedCfgErrors} = validateSettings(managed);
++ if (managedCfgErrors.length === 0) {
++ settings = managed;
++ } else {
++ managedCfgErrors.forEach((err) => logWarn(err));
++ }
++
++ UserStorage.migrateAutomationSettings(settings);
++ UserStorage.fillDefaults(settings);
++ UserStorage.loadBarrier.resolve(settings);
++ return settings;
+ }
+
+ static async saveSettings(): Promise {
+diff --git a/src/background/utils/extension-api.ts b/src/background/utils/extension-api.ts
+index 6d18fc0919df..6812ac2e4224 100644
+--- a/src/background/utils/extension-api.ts
++++ b/src/background/utils/extension-api.ts
+@@ -97,6 +97,19 @@ export async function readLocalStorage(defaults:
+ });
+ }
+
++export async function readManagedStorage(defaults: T): Promise {
++ return new Promise((resolve) => {
++ chrome.storage.managed.get(defaults, (managed: T) => {
++ if (chrome.runtime.lastError) {
++ console.error(chrome.runtime.lastError.message);
++ resolve(defaults);
++ return;
++ }
++ resolve(managed);
++ });
++ });
++}
++
+ function prepareSyncStorage(values: T): {[key: string]: any} {
+ for (const key in values) {
+ const value = values[key];
+diff --git a/src/managed-storage.json b/src/managed-storage.json
+new file mode 100644
+index 000000000000..e394d0f1ff60
+--- /dev/null
++++ b/src/managed-storage.json
+@@ -0,0 +1,304 @@
++{
++
++ "$schema": "http://json-schema.org/draft-07/schema#",
++ "type": "object",
++ "properties": {
++ "schemeVersion": {
++ "type": "integer"
++ },
++ "enabled": {
++ "type": "boolean"
++ },
++ "fetchNews": {
++ "type": "boolean"
++ },
++ "theme": {
++ "$ref": "Theme"
++ },
++ "presets": {
++ "type": "array",
++ "items": {
++ "$ref": "ThemePreset"
++ }
++ },
++ "customThemes": {
++ "type": "array",
++ "items": {
++ "$ref": "CustomSiteConfig"
++ }
++ },
++ "enabledByDefault": {
++ "type": "boolean"
++ },
++ "enabledFor": {
++ "type": "array",
++ "items": {
++ "type": "string",
++ "minLength": 1
++ }
++ },
++ "disabledFor": {
++ "type": "array",
++ "items": {
++ "type": "string",
++ "minLength": 1
++ }
++ },
++ "changeBrowserTheme": {
++ "type": "boolean"
++ },
++ "syncSettings": {
++ "type": "boolean"
++ },
++ "syncSitesFixes": {
++ "type": "boolean"
++ },
++ "automation": {
++ "$ref": "Automation"
++ },
++ "time": {
++ "$ref": "TimeSettings"
++ },
++ "location": {
++ "$ref": "LocationSettings"
++ },
++ "previewNewDesign": {
++ "type": "boolean"
++ },
++ "previewNewestDesign": {
++ "type": "boolean"
++ },
++ "enableForPDF": {
++ "type": "boolean"
++ },
++ "enableForProtectedPages": {
++ "type": "boolean"
++ },
++ "enableContextMenus": {
++ "type": "boolean"
++ },
++ "detectDarkTheme": {
++ "type": "boolean"
++ },
++ // Chrome's JSON schema format is weird and doesn't support `definitions` property and thus `#/definitions` references
++ // https://datatracker.ietf.org/doc/html/draft-zyp-json-schema-03
++ // This "property" mimics it
++ "definitions": {
++ "type": "object",
++ "properties": {
++ "Theme": {
++ "id": "Theme",
++ "type": "object",
++ "properties": {
++ "mode": {
++ "$ref": "FilterMode"
++ },
++ "brightness": {
++ "type": "integer",
++ "minimum": 0,
++ "maximum": 200
++ },
++ "contrast": {
++ "type": "integer",
++ "minimum": 0,
++ "maximum": 200
++ },
++ "grayscale": {
++ "type": "integer",
++ "minimum": 0,
++ "maximum": 100
++ },
++ "sepia": {
++ "type": "integer",
++ "minimum": 0,
++ "maximum": 100
++ },
++ "useFont": {
++ "type": "boolean"
++ },
++ "fontFamily": {
++ "type": "string",
++ "minLength": 1
++ },
++ "textStroke": {
++ "type": "number"
++ },
++ "engine": {
++ "type": "string",
++ "enum": [
++ "cssFilter",
++ "svgFilter",
++ "staticTheme",
++ "dynamicTheme"
++ ]
++ },
++ "stylesheet": {
++ "type": "string"
++ },
++ "darkSchemeBackgroundColor": {
++ "$ref": "HexColor"
++ },
++ "darkSchemeTextColor": {
++ "$ref": "HexColor"
++ },
++ "lightSchemeBackgroundColor": {
++ "$ref": "HexColor"
++ },
++ "lightSchemeTextColor": {
++ "$ref": "HexColor"
++ },
++ "scrollbarColor": {
++ "$ref": "HexColorOrAuto"
++ },
++ "selectionColor": {
++ "$ref": "HexColorOrAuto"
++ },
++ "styleSystemControls": {
++ "type": "boolean"
++ },
++ "lightColorScheme": {
++ "type": "string",
++ "minLength": 1
++ },
++ "darkColorScheme": {
++ "type": "string",
++ "minLength": 1
++ },
++ "immediateModify": {
++ "type": "boolean"
++ }
++ }
++ },
++ "HexColor": {
++ "id": "HexColor",
++ "type": "string",
++ "pattern": "^[0-9a-f]{6}$"
++ },
++ "HexColorOrAuto": {
++ "id": "HexColorOrAuto",
++ "type": "string",
++ "pattern": "^([0-9a-f]{6}|auto)$"
++ },
++ "FilterMode": {
++ "id": "FilterMode",
++ "type": "integer",
++ "enum": [
++ 0,
++ 1
++ ]
++ },
++ "ThemePreset": {
++ "id": "ThemePreset",
++ "type": "object",
++ "properties": {
++ "id": {
++ "type": "string",
++ "minLength": 1
++ },
++ "name": {
++ "type": "string",
++ "minLength": 1
++ },
++ "urls": {
++ "type": "array",
++ "items": {
++ "type": "string",
++ "minLength": 1
++ }
++ },
++ "theme": {
++ "$ref": "Theme"
++ }
++ },
++ "required": [
++ "id",
++ "name",
++ "urls",
++ "theme"
++ ]
++ },
++ "CustomSiteConfig": {
++ "id": "CustomSiteConfig",
++ "type": "object",
++ "properties": {
++ "url": {
++ "type": "array",
++ "items": {
++ "type": "string",
++ "minLength": 1
++ }
++ },
++ "theme": {
++ "$ref": "Theme"
++ },
++ "builtin": {
++ "type": "boolean"
++ }
++ },
++ "required": [
++ "url",
++ "theme"
++ ]
++ },
++ "Automation": {
++ "id": "Automation",
++ "type": "object",
++ "properties": {
++ "enabled": {
++ "type": "boolean"
++ },
++ "mode": {
++ "$ref": "AutomationMode"
++ },
++ "behavior": {
++ "type": "string",
++ "enum": [
++ "OnOff",
++ "Scheme"
++ ]
++ }
++ }
++ },
++ "AutomationMode": {
++ "id": "AutomationMode",
++ "type": "string",
++ "enum": [
++ "",
++ "time",
++ "system",
++ "location"
++ ]
++ },
++ "TimeSettings": {
++ "id": "TimeSettings",
++ "type": "object",
++ "properties": {
++ "activation": {
++ "$ref": "Time"
++ },
++ "deactivation": {
++ "$ref": "Time"
++ }
++ }
++ },
++ "Time": {
++ "id": "Time",
++ "type": "string",
++ "pattern": "^((0?[0-9])|(1[0-9])|(2[0-3])):([0-5][0-9])$"
++ },
++ "LocationSettings": {
++ "id": "LocationSettings",
++ "type": "object",
++ "properties": {
++ "latitude": {
++ "type": "number"
++ },
++ "longitude": {
++ "type": "number"
++ }
++ }
++ }
++ }
++ }
++ }
++}
+diff --git a/tasks/bundle-manifest.js b/tasks/bundle-manifest.js
+index ae29531e67b7..f4058a129f52 100644
+--- a/tasks/bundle-manifest.js
++++ b/tasks/bundle-manifest.js
+@@ -4,6 +4,7 @@ import {PLATFORM} from './platform.js';
+ import * as reload from './reload.js';
+ import {createTask} from './task.js';
+ import {readJSON, writeJSON} from './utils.js';
++import {copyFile} from 'node:fs/promises';
+
+ async function patchManifest(platform, debug, watch, test) {
+ const manifest = await readJSON(absolutePath('src/manifest.json'));
+@@ -16,6 +17,11 @@ async function patchManifest(platform, debug, watch, test) {
+ if (platform === PLATFORM.CHROMIUM_MV3) {
+ patched.browser_action = undefined;
+ }
++ if (platform === PLATFORM.CHROMIUM_MV2 || platform === PLATFORM.CHROMIUM_MV3) {
++ patched.storage = {
++ managed_schema: 'managed-storage.json',
++ };
++ }
+ if (debug) {
+ patched.version = '1';
+ patched.description = `Debug build, platform: ${platform}, watch: ${watch ? 'yes' : 'no'}.`;
+@@ -42,6 +48,9 @@ async function manifests({platforms, debug, watch, test}) {
+ const manifest = await patchManifest(platform, debug, watch, test);
+ const destDir = getDestDir({debug, platform});
+ await writeJSON(`${destDir}/manifest.json`, manifest);
++ if (platform === PLATFORM.CHROMIUM_MV2 || platform === PLATFORM.CHROMIUM_MV3) {
++ await copyFile(absolutePath('src/managed-storage.json'), `${destDir}/managed-storage.json`);
++ }
+ }
+ }
+
+@@ -49,7 +58,7 @@ const bundleManifestTask = createTask(
+ 'bundle-manifest',
+ manifests,
+ ).addWatcher(
+- ['src/manifest*.json'],
++ ['src/manifest*.json', 'src/managed-storage.json'],
+ async (changedFiles, _, buildPlatforms) => {
+ const chrome = changedFiles.some((file) => file.endsWith('manifest.json'));
+ const platforms = {};
diff --git a/patches/darkreader.nix b/patches/darkreader.nix
new file mode 100644
index 0000000..ef2c19f
--- /dev/null
+++ b/patches/darkreader.nix
@@ -0,0 +1,25 @@
+# credits to Voronind for darkreader config https://github.com/voronind-com/nix/blob/main/home/program/firefox/default.nix
+{
+ lib,
+ dashNixAdditionalProps,
+ ...
+}: let
+ stable = dashNixAdditionalProps.pkgsDarkreader;
+in
+ stable.buildNpmPackage rec {
+ version = "4.9.99";
+ pname = "dark-reader";
+ npmDepsHash = "sha256-m41HkwgbeRRmxJALQFJl/grYjjIqFOc47ltaesob1FA=";
+ env.ESBUILD_BINARY_PATH = lib.getExe stable.esbuild;
+ patches = [./darkeader.patch];
+ src = stable.fetchFromGitHub {
+ hash = "sha256-K375/4qOyE1Tp/T5V5uCGcNd1IVVbT1Pjdnq/8oRHj0=";
+ owner = "darkreader";
+ repo = "darkreader";
+ rev = "v${version}";
+ };
+ installPhase = ''
+ mkdir -p $out
+ cp build/release/darkreader-firefox.xpi $out/latest.xpi
+ '';
+ }
diff --git a/result b/result
deleted file mode 120000
index f3888e2..0000000
--- a/result
+++ /dev/null
@@ -1 +0,0 @@
-/nix/store/9snhsj18w6vyi4f25sq93az859yigcdp-DashNix.iso
\ No newline at end of file